You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/09/20 15:33:23 UTC
[01/59] [abbrv] Clean up of odata api
Updated Branches:
refs/heads/master bb055517c -> da0e0f682
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java
index 8bc20e8..41fbf14 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java
@@ -1,51 +1,49 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Represents a member expression in the expression tree returned by the methods:
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
+ * Represents a member expression in the expression tree
* <br>
* <br>
- * <p>A member expression node is inserted in the expression tree for any member operator ("/")
+ * <p>A member expression node is inserted in the expression tree for any member operator ("/")
* which is used to reference a property of an complex type or entity type.
* <br>
* <br>
* <p><b>For example:</b> The expression "address/city eq 'Heidelberg' will result in an expression tree
- * containing a member expression node for accessing property "city" which is part of the
+ * containing a member expression node for accessing property "city" which is part of the
* complex property "address". Method {@link #getPath()} will return a reference to the "address" property,
* method {@link #getProperty()} will return a refence to the "city" property.
- *
+ *
*/
public interface MemberExpression extends CommonExpression {
/**
- * @return
- * Returns the CommonExpression forming the path (the left side of '/') of the method operator.
- * For OData 2.0 the value returned by {@link #getPath()} is a {@link PropertyExpression}
+ * @return
+ * Returns the CommonExpression forming the path (the left side of '/') of the method operator.
+ * For OData 2.0 the value returned by {@link #getPath()} is a {@link PropertyExpression}
*/
public CommonExpression getPath();
/**
- * @return
- * Return the CommonExpression forming the property (the right side of '/') of the method operator.
- * For OData 2.0 the value returned by {@link #getProperty()} is a {@link PropertyExpression}
+ * @return
+ * Return the CommonExpression forming the property (the right side of '/') of the method operator.
+ * For OData 2.0 the value returned by {@link #getProperty()} is a {@link PropertyExpression}
*/
public CommonExpression getProperty();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java
index bb455d8..22e7c99 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,21 +21,19 @@ package org.apache.olingo.odata2.api.uri.expression;
import java.util.List;
/**
- * Represents a method expression in the expression tree returned by the methods:
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String) }</li>
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String) }</li>
+ * Represents a method expression in the expression tree
* <br>
* <br>
* <p>A method expression node is inserted in the expression tree for any valid
* OData method operator in {@link MethodOperator} (e.g. for "substringof", "concat", "year", ... )
* <br>
* <br>
- *
+ *
*/
public interface MethodExpression extends CommonExpression {
/**
- * @return Returns the method object that represents the used method
+ * @return Returns the method object that represents the used method
* @see MethodOperator
*/
public MethodOperator getMethod();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java
index 2b9266d..f0f9638 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java
@@ -1,30 +1,33 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Enumerations for all supported methods of the ODATA expression parser
- * for ODATA version 2.0 (with some restrictions).
- *
+ * Enumerations for all supported methods of the ODATA expression parser
+ * for ODATA version 2.0 (with some restrictions).
+ *
*/
public enum MethodOperator {
- ENDSWITH("endswith"), INDEXOF("indexof"), STARTSWITH("startswith"), TOLOWER("tolower"), TOUPPER("toupper"), TRIM("trim"), SUBSTRING("substring"), SUBSTRINGOF("substringof"), CONCAT("concat"), LENGTH("length"), YEAR("year"), MONTH("month"), DAY("day"), HOUR("hour"), MINUTE("minute"), SECOND("second"), ROUND("round"), FLOOR("floor"), CEILING("ceiling");
+ ENDSWITH("endswith"), INDEXOF("indexof"), STARTSWITH("startswith"), TOLOWER("tolower"), TOUPPER("toupper"), TRIM(
+ "trim"), SUBSTRING("substring"), SUBSTRINGOF("substringof"), CONCAT("concat"), LENGTH("length"), YEAR("year"),
+ MONTH("month"), DAY("day"), HOUR("hour"), MINUTE("minute"), SECOND("second"), ROUND("round"), FLOOR("floor"),
+ CEILING("ceiling");
private String syntax;
private String stringRespresentation;
@@ -34,7 +37,7 @@ public enum MethodOperator {
stringRespresentation = syntax;
}
- /**
+ /**
* @return Operators name for usage in in text
*/
@Override
@@ -43,7 +46,7 @@ public enum MethodOperator {
}
/**
- * @return URI literal of the unary operator as used in the URL.
+ * @return URI literal of the unary operator as used in the URL.
*/
public String toUriLiteral() {
return syntax;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java
index 76574bb..3f91523 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,11 +21,10 @@ package org.apache.olingo.odata2.api.uri.expression;
import java.util.List;
/**
- * Represents a $orderby expression in the expression tree returned by
- * {@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String) }
+ * Represents a $orderby expression
* Used to define the <b>root</b> expression node in an $filter expression tree.
*
- *
+ *
*/
public interface OrderByExpression extends CommonExpression {
/**
@@ -34,11 +33,11 @@ public interface OrderByExpression extends CommonExpression {
String getExpressionString();
/**
- * @return
- * Returns a ordered list of order expressions contained in the $orderby expression string
- * <p>
- * <b>For example</b>: The orderby expression build from "$orderby=name asc, age desc"
- * would contain to order expression.
+ * @return
+ * Returns a ordered list of order expressions contained in the $orderby expression string
+ * <p>
+ * <b>For example</b>: The orderby expression build from "$orderby=name asc, age desc"
+ * would contain to order expression.
*/
public List<OrderExpression> getOrders();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java
index 8a9ac15..b02bfcb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java
@@ -1,26 +1,25 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Represents a order expression in the expression tree returned by the method
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String) }</li>
+ * Represents a order expression in the expression tree
* <br>
* <br>
* <p>A order expression node is inserted in the expression tree for any valid
@@ -28,12 +27,12 @@ package org.apache.olingo.odata2.api.uri.expression;
* will be inserted into the expression tree
* <br>
* <br>
- *
+ *
*/
public interface OrderExpression extends CommonExpression {
/**
- * @return Returns the sort order (ascending or descending) of the order expression
+ * @return Returns the sort order (ascending or descending) of the order expression
*/
SortOrder getSortOrder();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java
index 23076d3..0b7d0f4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,17 +21,15 @@ package org.apache.olingo.odata2.api.uri.expression;
import org.apache.olingo.odata2.api.edm.EdmTyped;
/**
- * Represents a property expression in the expression tree returned by the methods:
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
+ * Represents a property expression in the expression tree
* <br>
* <br>
* <p>A property expression node is inserted in the expression tree for any property.
- * If an EDM is available during parsing the property is automatically verified
+ * If an EDM is available during parsing the property is automatically verified
* against the EDM.
* <br>
* <br>
- *
+ *
*/
public interface PropertyExpression extends CommonExpression {
/**
@@ -41,8 +39,8 @@ public interface PropertyExpression extends CommonExpression {
/**
* @return Returns the EDM property matching the property name used in the expression String.
- * This may be an instance of EdmProperty or EdmNavigationProperty
- * @see EdmTyped
+ * This may be an instance of EdmProperty or EdmNavigationProperty
+ * @see EdmTyped
*/
public EdmTyped getEdmProperty();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java
index 5b1bcdb..6ce0ef3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java
@@ -1,36 +1,36 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Enumeration describing all possible sort orders used in an $orderby expression
- *
+ * Enumeration describing all possible sort orders used in an $orderby expression
+ *
*/
public enum SortOrder {
/**
- * Sort order ascending
+ * Sort order ascending
*/
asc("asc"),
/**
- * Sort order descending
+ * Sort order descending
*/
desc("desc");
@@ -42,7 +42,7 @@ public enum SortOrder {
stringRespresentation = syntax;
}
- /**
+ /**
* @return Operators name for usage in in text
*/
@Override
@@ -51,7 +51,7 @@ public enum SortOrder {
}
/**
- * @return URI literal of the unary operator as used in the URL.
+ * @return URI literal of the unary operator as used in the URL.
*/
public String toUriLiteral() {
return syntax;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java
index 9cb2512..b92b507 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java
@@ -1,34 +1,32 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Represents a unary expression node in the expression tree returned by the methods:
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
+ * Represents a unary expression node in the expression tree
* <br>
* <br>
* <p>A unary expression node is inserted in the expression tree for any valid
* ODATA unary operator in {@link UnaryOperator} (e.g. for "not or "-" )
* <br>
* <br>
- *
+ *
*/
public interface UnaryExpression extends CommonExpression {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java
index 2a44bc6..759c478 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.uri.expression;
/**
* Enumerations for supported unary operators of the OData expression parser
* for OData version 2.0
- *
+ *
*/
public enum UnaryOperator {
MINUS("-", "negation"), NOT("not");
@@ -39,7 +39,7 @@ public enum UnaryOperator {
this.stringRespresentation = stringRespresentation;
}
- /**
+ /**
* @return Methods name for usage in in text
*/
@Override
@@ -48,7 +48,7 @@ public enum UnaryOperator {
}
/**
- * @return Syntax of the unary operator as used in the URL.
+ * @return Syntax of the unary operator as used in the URL.
*/
public String toUriLiteral() {
return syntax;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
index 5637b82..b14f0c4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,32 +21,35 @@ package org.apache.olingo.odata2.api.uri.expression;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
/**
- * The interface {@link Visitable} is part of the visitor pattern used to traverse
+ * The interface {@link Visitable} is part of the visitor pattern used to traverse
* the expression tree build from a $filter expression string or $orderby expression string.
* It is implemented by each class used as node in an expression tree.
- *
+ *
* @see ExpressionVisitor
- *
+ *
*/
public interface Visitable {
/**
- * Method {@link #accept(ExpressionVisitor)} is called when traversing the expression tree. This method is invoked on each
- * expression used as node in an expression tree. The implementations should
+ * Method {@link #accept(ExpressionVisitor)} is called when traversing the expression tree. This method is invoked on
+ * each
+ * expression used as node in an expression tree. The implementations should
* behave as follows:
* <li>Call accept on all sub nodes and store the returned Objects
- * <li>Call the appropriate method on the {@link ExpressionVisitor} instance and provide the stored objects to that instance
+ * <li>Call the appropriate method on the {@link ExpressionVisitor} instance and provide the stored objects to that
+ * instance
* <li>Return the object which should be passed to the processing algorithm of the parent expression node
* <br>
* <br>
- * @param visitor
- * Object ( implementing {@link ExpressionVisitor}) whose methods are called during traversing a expression node of the expression tree.
+ * @param visitor
+ * Object ( implementing {@link ExpressionVisitor}) whose methods are called during traversing a expression node of
+ * the expression tree.
* @return
- * Object which should be passed to the processing algorithm of the parent expression node
+ * Object which should be passed to the processing algorithm of the parent expression node
* @throws ExceptionVisitExpression
- * Exception occurred the OData library while traversing the tree
+ * Exception occurred the OData library while traversing the tree
* @throws ODataApplicationException
- * Exception thrown by the application who implemented the visitor
+ * Exception thrown by the application who implemented the visitor
*/
Object accept(ExpressionVisitor visitor) throws ExceptionVisitExpression, ODataApplicationException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java
index 2b1e1af..7df2cc7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,8 +20,10 @@
* Expression Parser
* <p>This package contains all classes necessary to decribe an expression tree(e.g. a filter or order by tree)
*
- * <p>Trees can be traversed by implementing the {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor} interface and calling the accept() method.
- * <br>Different types of expressions can be found in {@link org.apache.olingo.odata2.api.uri.expression.ExpressionKind}.
+ * <p>Trees can be traversed by implementing the {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor}
+ * interface and calling the accept() method.
+ * <br>Different types of expressions can be found in {@link org.apache.olingo.odata2.api.uri.expression.ExpressionKind}
+ * .
*/
package org.apache.olingo.odata2.api.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
index 9b172db..021ee65 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -33,8 +33,8 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
/**
* Access to the parts of the request URI that are relevant for DELETE requests.
* @org.apache.olingo.odata2.DoNotImplement
-*
-*/
+ *
+ */
public interface DeleteUriInfo {
/**
* Gets the target entity container.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
index bb88f2a..b450683 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
* Access to the parts of the request URI that are relevant for GET requests
* of complex properties.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetComplexPropertyUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
index e729ba3..17ec1a2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
* Access to the parts of the request URI that are relevant for GET requests
* of the count of a single entity (also known as existence check).
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetEntityCountUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
index b839a78..843e505 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
* Access to the parts of the request URI that are relevant for GET requests
* of the number of links to a single entity (also known as existence check).
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetEntityLinkCountUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
index b593c73..2c420e0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
* Access to the parts of the request URI that are relevant for GET requests
* of the URI of a single entity.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetEntityLinkUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
index e06e5f0..cd56d6f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
* Access to the parts of the request URI that are relevant for GET requests
* of the number of entities.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetEntitySetCountUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
index bf29b83..bdb3051 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
* Access to the parts of the request URI that are relevant for GET requests
* of the number of links to entities.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetEntitySetLinksCountUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
index 1a7eaad..33c12a0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
* Access to the parts of the request URI that are relevant for GET requests
* of the URIs of entities.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetEntitySetLinksUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
index f8cb7f9..f501e5b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
* Access to the parts of the request URI that are relevant for GET requests
* of entities.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetEntitySetUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
index 5b1afa9..be92069 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
* Access to the parts of the request URI that are relevant for GET requests
* of a single entity.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetEntityUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
index 5f50100..56ad943 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.EdmLiteral;
* Access to the parts of the request URI that are relevant for requests
* of function imports.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetFunctionImportUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
index 80ccfc4..a9d6313 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
* Access to the parts of the request URI that are relevant for GET requests
* of the media resource of a single entity.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetMediaResourceUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
index 9e9e9ee..ce8d421 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import java.util.Map;
* Access to the parts of the request URI that are relevant for GET requests
* of the metadata document.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetMetadataUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
index a12b75f..985bef5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import java.util.Map;
* Access to the parts of the request URI that are relevant for GET requests
* of the service document.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetServiceDocumentUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
index bcd20cc..5ba99ca 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
* Access to the parts of the request URI that are relevant for GET requests
* of simple properties.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface GetSimplePropertyUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
index d3356c6..066477a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
/**
* Access to the parts of the request URI that are relevant for POST requests.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface PostUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
index 7505c86..6bc0a93 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
/**
* Access to the parts of the request URI that are relevant for PUT, PATCH, or MERGE requests.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface PutMergePatchUriInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java
index f92781b..5f74efe 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/package-info.java
index 7643ff1..014fab7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/package-info.java
@@ -1,26 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* <p>URI Parser Facade</p>
- * <p>The URI package has one central class {@link org.apache.olingo.odata2.api.uri.UriParser} to parse a request URI
+ * <p>The URI package has one central class {@link org.apache.olingo.odata2.api.uri.UriParser} to parse a request URI
* as well as several interfaces that provide access to parsed parts of the URI.
- * <br>The {@link org.apache.olingo.odata2.api.uri.UriParser} class also provides the possibility to parse a filter or an orderBy Statement. Both are specified in the OData Protocol Specification.
+ * <br>The {@link org.apache.olingo.odata2.api.uri.UriParser} class also provides the possibility to parse a filter or
+ * an orderBy Statement. Both are specified in the OData Protocol Specification.
* <br>The URI syntax is specified in the OData Protocol Specification in the form of an ABNF. </p>
*/
package org.apache.olingo.odata2.api.uri;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/src/eclipse/eclipse-codestyle-formatter.xml
----------------------------------------------------------------------
diff --git a/src/eclipse/eclipse-codestyle-formatter.xml b/src/eclipse/eclipse-codestyle-formatter.xml
index 4cb61dd..49186e7 100644
--- a/src/eclipse/eclipse-codestyle-formatter.xml
+++ b/src/eclipse/eclipse-codestyle-formatter.xml
@@ -316,7 +316,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
@@ -375,7 +375,7 @@
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
@@ -383,7 +383,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
@@ -391,7 +391,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
@@ -537,13 +537,13 @@
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
[39/59] [abbrv] cleanup of odata fit tests
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
index 1576337..ca0db8e 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
@@ -1,37 +1,36 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
import static org.junit.Assert.assertEquals;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
+import org.junit.Test;
/**
* Tests employing the reference scenario that use neither XML nor JSON
* and that change data in some way
- *
+ *
*/
public class MiscChangeTest extends AbstractRefTest {
@@ -40,7 +39,8 @@ public class MiscChangeTest extends AbstractRefTest {
deleteUriOk("Employees('2')");
deleteUriOk("Managers('3')");
deleteUriOk("Teams('2')");
- callUri(ODataHttpMethod.DELETE, "Rooms('1')", HttpHeaders.IF_MATCH, "W/\"1\"", null, null, HttpStatusCodes.NO_CONTENT);
+ callUri(ODataHttpMethod.DELETE, "Rooms('1')", HttpHeaders.IF_MATCH, "W/\"1\"", null, null,
+ HttpStatusCodes.NO_CONTENT);
callUri(ODataHttpMethod.DELETE, "Container2.Photos(Id=1,Type='image%2Fpng')",
HttpHeaders.IF_MATCH, "W/\"1\"", null, null, HttpStatusCodes.NO_CONTENT);
@@ -87,7 +87,9 @@ public class MiscChangeTest extends AbstractRefTest {
checkMediaType(response, HttpContentType.APPLICATION_OCTET_STREAM);
assertEquals("00", getBody(response));
- response = callUri(ODataHttpMethod.PUT, "Container2.Photos(Id=2,Type='image%2Fbmp')/$value", null, null, "00", IMAGE_GIF, HttpStatusCodes.NO_CONTENT);
+ response =
+ callUri(ODataHttpMethod.PUT, "Container2.Photos(Id=2,Type='image%2Fbmp')/$value", null, null, "00", IMAGE_GIF,
+ HttpStatusCodes.NO_CONTENT);
checkEtag(response, "W/\"2\"");
}
@@ -96,11 +98,13 @@ public class MiscChangeTest extends AbstractRefTest {
putUri("Employees('2')/Age/$value", "42", HttpContentType.TEXT_PLAIN, HttpStatusCodes.NO_CONTENT);
String url = "Container2.Photos(Id=3,Type='image%2Fjpeg')/Image/$value";
- callUri(ODataHttpMethod.PUT, url, HttpHeaders.ETAG, "W/\"3\"", "4711", HttpContentType.APPLICATION_OCTET_STREAM, HttpStatusCodes.NO_CONTENT);
+ callUri(ODataHttpMethod.PUT, url, HttpHeaders.ETAG, "W/\"3\"", "4711", HttpContentType.APPLICATION_OCTET_STREAM,
+ HttpStatusCodes.NO_CONTENT);
assertEquals("4711", getBody(callUri(url)));
url = "Container2.Photos(Id=4,Type='foo')/BinaryData/$value";
- HttpResponse response = callUri(ODataHttpMethod.PUT, url, HttpHeaders.ETAG, "W/\"4\"", "4711", IMAGE_JPEG, HttpStatusCodes.NO_CONTENT);
+ HttpResponse response =
+ callUri(ODataHttpMethod.PUT, url, HttpHeaders.ETAG, "W/\"4\"", "4711", IMAGE_JPEG, HttpStatusCodes.NO_CONTENT);
checkEtag(response, "W/\"4\"");
assertEquals("4711", getBody(callUri(url)));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
index e99f13e..b34f747 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -28,7 +28,7 @@ import org.junit.Test;
/**
* Read-only tests employing the reference scenario that use neither XML nor JSON
- *
+ *
*/
public class MiscReadOnlyTest extends AbstractRefTest {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
index b76f18c..e4cc3bd 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* Tests employing the reference scenario changing properties in JSON format.
- *
+ *
*/
public class PropertyJsonChangeTest extends AbstractRefTest {
@@ -52,7 +52,8 @@ public class PropertyJsonChangeTest extends AbstractRefTest {
putUri(url, "{\"Age\":\"17\"}", HttpContentType.APPLICATION_JSON, HttpStatusCodes.BAD_REQUEST);
final String urlForName = "Employees('2')/EmployeeName";
- putUri(urlForName, HttpContentType.APPLICATION_JSON, "{\"EmployeeName\":\"NewName\"}", HttpContentType.APPLICATION_JSON, HttpStatusCodes.NO_CONTENT);
+ putUri(urlForName, HttpContentType.APPLICATION_JSON, "{\"EmployeeName\":\"NewName\"}",
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.NO_CONTENT);
assertEquals("{\"d\":{\"EmployeeName\":\"NewName\"}}", getBody(callUri(urlForName + "?$format=json")));
putUri(urlForName, "{\"EmployeeName\":NewName}", HttpContentType.APPLICATION_JSON, HttpStatusCodes.BAD_REQUEST);
}
@@ -62,13 +63,14 @@ public class PropertyJsonChangeTest extends AbstractRefTest {
final String url = "Employees('2')/Age";
putUri(url, "", "{\"Age\":17}", HttpContentType.APPLICATION_JSON, HttpStatusCodes.NOT_ACCEPTABLE);
putUri(url, null, "{\"Age\":17}", HttpContentType.APPLICATION_JSON, HttpStatusCodes.NOT_ACCEPTABLE);
-
+
final String urlForName = "Employees('2')/EmployeeName";
- putUri(urlForName, "", "{\"EmployeeName\":\"NewName\"}", HttpContentType.APPLICATION_JSON, HttpStatusCodes.NOT_ACCEPTABLE);
- putUri(urlForName, null, "{\"EmployeeName\":\"NewName\"}", HttpContentType.APPLICATION_JSON, HttpStatusCodes.NOT_ACCEPTABLE);
+ putUri(urlForName, "", "{\"EmployeeName\":\"NewName\"}", HttpContentType.APPLICATION_JSON,
+ HttpStatusCodes.NOT_ACCEPTABLE);
+ putUri(urlForName, null, "{\"EmployeeName\":\"NewName\"}", HttpContentType.APPLICATION_JSON,
+ HttpStatusCodes.NOT_ACCEPTABLE);
}
-
@Test
public void complexProperty() throws Exception {
final String url1 = "Employees('2')/Location";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
index 3d57223..d8f1710 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
@@ -1,33 +1,32 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
import static org.junit.Assert.assertEquals;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading properties in JSON format.
- *
+ *
*/
public class PropertyJsonReadOnlyTest extends AbstractRefTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
index b8bdca2..f14dbdd 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
@@ -1,36 +1,35 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
import static org.custommonkey.xmlunit.XMLAssert.assertXpathEvaluatesTo;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.junit.Test;
/**
* Tests employing the reference scenario changing properties in XML format
- *
+ *
*/
public class PropertyXmlChangeTest extends AbstractRefXmlTest {
@@ -53,7 +52,9 @@ public class PropertyXmlChangeTest extends AbstractRefXmlTest {
final String url4 = "Rooms('42')/Seats";
requestBody = "<Seats xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">42</Seats>";
- HttpResponse response = callUri(ODataHttpMethod.PUT, url4, null, null, requestBody, HttpContentType.APPLICATION_XML_UTF8, HttpStatusCodes.NO_CONTENT);
+ HttpResponse response =
+ callUri(ODataHttpMethod.PUT, url4, null, null, requestBody, HttpContentType.APPLICATION_XML_UTF8,
+ HttpStatusCodes.NO_CONTENT);
checkEtag(response, "W/\"1\"");
final String url5 = "Employees('2')/EmployeeId";
@@ -74,7 +75,8 @@ public class PropertyXmlChangeTest extends AbstractRefXmlTest {
assertXpathEvaluatesTo("YYY", "/d:City/d:CityName", getBody(callUri(url2)));
requestBody = "<City xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\"><PostalCode>00000</PostalCode></City>";
- callUri(ODataHttpMethod.PATCH, url2, null, null, requestBody, HttpContentType.APPLICATION_XML, HttpStatusCodes.NO_CONTENT);
+ callUri(ODataHttpMethod.PATCH, url2, null, null, requestBody, HttpContentType.APPLICATION_XML,
+ HttpStatusCodes.NO_CONTENT);
assertXpathEvaluatesTo("YYY", "/d:City/d:CityName", getBody(callUri(url2)));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
index 79fce6e..acc656e 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -24,15 +24,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading properties in XML format.
- *
+ *
*/
public class PropertyXmlReadOnlyTest extends AbstractRefXmlTest {
@Test
@@ -70,8 +69,8 @@ public class PropertyXmlReadOnlyTest extends AbstractRefXmlTest {
response = callUri("Container2.Photos(Id=3,Type='image%2Fjpeg')/BinaryData/$value", HttpStatusCodes.NO_CONTENT);
assertNull(response.getEntity());
- // checkMediaType(response, IMAGE_JPEG);
- // assertEquals("", getBody(response));
+ // checkMediaType(response, IMAGE_JPEG);
+ // assertEquals("", getBody(response));
response = callUri("Container2.Photos(Id=3,Type='image%2Fjpeg')/BinaryData");
checkMediaType(response, HttpContentType.APPLICATION_XML_UTF8);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
index d819c95..ab5bc07 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -25,18 +25,17 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.http.HttpResponse;
-import org.custommonkey.xmlunit.SimpleNamespaceContext;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.custommonkey.xmlunit.SimpleNamespaceContext;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading the service document in JSON format.
- *
+ *
*/
public class ServiceJsonTest extends AbstractRefTest {
@Test
@@ -60,7 +59,9 @@ public class ServiceJsonTest extends AbstractRefTest {
@Test
public void serviceDocumentAcceptHeaderInvalidCharset() throws Exception {
- final HttpResponse response = callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_XML + "; charset=iso-latin-1", HttpStatusCodes.NOT_ACCEPTABLE);
+ final HttpResponse response =
+ callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_XML + "; charset=iso-latin-1",
+ HttpStatusCodes.NOT_ACCEPTABLE);
final String body = getBody(response);
Map<String, String> prefixMap = new HashMap<String, String>();
prefixMap.put("a", Edm.NAMESPACE_M_2007_08);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
index 2a70fc0..15054d5 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -24,17 +24,16 @@ import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
import java.io.IOException;
import org.apache.http.HttpResponse;
-import org.custommonkey.xmlunit.exceptions.XpathException;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.custommonkey.xmlunit.exceptions.XpathException;
+import org.junit.Test;
+import org.xml.sax.SAXException;
/**
* Tests employing the reference scenario reading the service document in XML format
- *
+ *
*/
public class ServiceXmlTest extends AbstractRefXmlTest {
@@ -76,14 +75,16 @@ public class ServiceXmlTest extends AbstractRefXmlTest {
@Test
public void serviceDocumentAcceptHeaderAtom() throws Exception {
- final HttpResponse response = callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_ATOM_XML, HttpStatusCodes.NOT_ACCEPTABLE);
+ final HttpResponse response =
+ callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_ATOM_XML, HttpStatusCodes.NOT_ACCEPTABLE);
checkMediaType(response, HttpContentType.APPLICATION_XML);
validateXmlError(getBody(response));
}
@Test
public void serviceDocumentAcceptHeaderUtf8Atom() throws Exception {
- final HttpResponse response = callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_ATOM_XML_UTF8, HttpStatusCodes.NOT_ACCEPTABLE);
+ final HttpResponse response =
+ callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_ATOM_XML_UTF8, HttpStatusCodes.NOT_ACCEPTABLE);
checkMediaType(response, HttpContentType.APPLICATION_XML);
validateXmlError(getBody(response));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
index 5e55b81..9deb593 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref.contentnegotiation;
@@ -43,8 +43,6 @@ import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.log4j.Logger;
-import org.junit.Assert;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
@@ -61,6 +59,7 @@ import org.apache.olingo.odata2.ref.processor.ListsProcessor;
import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.junit.Assert;
/**
*
@@ -196,7 +195,8 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
}
public static FitTestSetBuilder create(final UriType uriType, final String path,
- final boolean defaultQueryOptions, final boolean defaultAcceptHeaders, final boolean defaultRequestContentTypeHeaders) {
+ final boolean defaultQueryOptions, final boolean defaultAcceptHeaders,
+ final boolean defaultRequestContentTypeHeaders) {
FitTestSetBuilder builder = new FitTestSetBuilder(new FitTestSet(uriType, path));
if (defaultQueryOptions) {
@@ -220,7 +220,8 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
testParameters.add(fitTest);
}
- public void modifyRequestContentTypes(final List<String> requestContentTypes, final HttpStatusCodes expectedStatusCode, final String expectedContentType) {
+ public void modifyRequestContentTypes(final List<String> requestContentTypes,
+ final HttpStatusCodes expectedStatusCode, final String expectedContentType) {
FitTestSet fts = new FitTestSetBuilder(this)
.requestContentTypes(requestContentTypes)
.expectedStatusCode(expectedStatusCode)
@@ -228,11 +229,13 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
replaceTestParameters(FitTest.create(fts));
}
- public void setTestParam(final List<String> acceptHeader, final HttpStatusCodes expectedStatusCode, final String expectedContentType) {
+ public void setTestParam(final List<String> acceptHeader, final HttpStatusCodes expectedStatusCode,
+ final String expectedContentType) {
setTestParam(queryOptions, acceptHeader, expectedStatusCode, expectedContentType);
}
- public void setTestParam(final List<String> queryOptions, final List<String> acceptHeader, final HttpStatusCodes expectedStatusCode, final String expectedContentType) {
+ public void setTestParam(final List<String> queryOptions, final List<String> acceptHeader,
+ final HttpStatusCodes expectedStatusCode, final String expectedContentType) {
List<FitTest> tp = FitTest.create(this, queryOptions, acceptHeader, expectedStatusCode, expectedContentType);
replaceTestParameters(tp);
}
@@ -243,9 +246,10 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
}
/**
- * Execute all {@link FitTest}s with a default wait time between the calls (of {@value #DEFAULT_WAIT_BETWEEN_TESTCALLS_IN_MS} ms).
+ * Execute all {@link FitTest}s with a default wait time between the calls (of
+ * {@value #DEFAULT_WAIT_BETWEEN_TESTCALLS_IN_MS} ms).
*
- * For more information see @see #execute(URI, long)
+ * For more information see @see #execute(URI, long)
*
* @param serviceEndpoint
* @throws Exception
@@ -271,10 +275,10 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
}
}
- // System.out.println("#########################################");
- // System.out.println("# Success: '" + successTests.size() + "', failed '" + test2Failure.size() +
- // "', total '" + testParameters.size() + "'.");
- // System.out.println("#########################################");
+ // System.out.println("#########################################");
+ // System.out.println("# Success: '" + successTests.size() + "', failed '" + test2Failure.size() +
+ // "', total '" + testParameters.size() + "'.");
+ // System.out.println("#########################################");
if (!test2Failure.isEmpty()) {
Set<Entry<FitTest, AssertionError>> failedTests = test2Failure.entrySet();
@@ -294,7 +298,8 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
test = new FitTest(testSet);
}
- public FitTestBuilder(final UriType uriType, final String httpMethod, final String path, final HttpStatusCodes expectedStatusCode, final String expectedContentType) {
+ public FitTestBuilder(final UriType uriType, final String httpMethod, final String path,
+ final HttpStatusCodes expectedStatusCode, final String expectedContentType) {
test = new FitTest(uriType, httpMethod, path, expectedStatusCode, expectedContentType);
}
@@ -465,10 +470,12 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
assertEquals("Unexpected status code for " + toString(), expectedStatusCode.getStatusCode(), resultStatusCode);
final String contentType = response.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue();
- assertEquals("Unexpected content type for " + toString(), ContentType.create(expectedContentType), ContentType.create(contentType));
+ assertEquals("Unexpected content type for " + toString(), ContentType.create(expectedContentType), ContentType
+ .create(contentType));
if (isContentExpected) {
- assertNotNull("Unexpected content for " + toString(), StringHelper.inputStreamToString(response.getEntity().getContent()));
+ assertNotNull("Unexpected content for " + toString(), StringHelper.inputStreamToString(response.getEntity()
+ .getContent()));
}
LOG.trace("Test passed [" + toString() + "]");
} finally {
@@ -488,7 +495,8 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
return new FitTestBuilder(fitTestSet);
}
- public static FitTest create(final UriType uriType, final String httpMethod, final String path, final String queryOption, final String acceptHeader,
+ public static FitTest create(final UriType uriType, final String httpMethod, final String path,
+ final String queryOption, final String acceptHeader,
final String content, final String requestContentType,
final HttpStatusCodes expectedStatusCode, final String expectedContentType) {
@@ -526,7 +534,8 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
return create(fitTestSet, acceptHeader2ContentType);
}
- public static List<FitTest> create(final FitTestSet fitTestSet, final Map<String, ContentType> acceptHeader2ContentType) {
+ public static List<FitTest> create(final FitTestSet fitTestSet,
+ final Map<String, ContentType> acceptHeader2ContentType) {
UriType uriType = fitTestSet.uriType;
String httpMethod = fitTestSet.httpMethod;
String path = fitTestSet.path;
@@ -543,7 +552,8 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
/**
*
*/
- private static List<FitTest> create(final UriType uriType, final String httpMethod, final String path, final List<String> queryOptions,
+ private static List<FitTest> create(final UriType uriType, final String httpMethod, final String path,
+ final List<String> queryOptions,
final List<String> acceptHeaders, final Map<String, ContentType> acceptHeader2ContentType,
final String content, final List<String> requestContentTypeHeaders, final HttpStatusCodes expectedStatusCode) {
@@ -566,7 +576,8 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
return testParameters;
}
- private static String getExpectedResponseContentType(final Map<String, ContentType> acceptHeader2ContentType, final String acceptHeader) {
+ private static String getExpectedResponseContentType(final Map<String, ContentType> acceptHeader2ContentType,
+ final String acceptHeader) {
String expectedContentType = null;
if (acceptHeader != null) {
ContentType tmpContentType = acceptHeader2ContentType.get(acceptHeader);
@@ -594,7 +605,7 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
// first try read (GET)
if ("GET".equals(type)) {
request = new HttpGet(uri);
- } else { //then try write
+ } else { // then try write
HttpEntityEnclosingRequestBase writeRequest;
if ("POST".equals(type)) {
writeRequest = new HttpPost(uri);
@@ -683,7 +694,8 @@ public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
}
public String toFullString() {
- return "FitTestRequest [type=" + type + ", requestUrl=" + requestUrl + ", headers=" + headers + ", content=\n{" + content + "\n}]";
+ return "FitTestRequest [type=" + type + ", requestUrl=" + requestUrl + ", headers=" + headers + ", content=\n{"
+ + content + "\n}]";
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
index 460317d..16b8225 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref.contentnegotiation;
@@ -49,7 +49,7 @@ import org.junit.Test;
public class BasicContentNegotiationTest extends AbstractContentNegotiationTest {
private static final Logger LOG = Logger.getLogger(BasicContentNegotiationTest.class);
-
+
@Test
public void acceptHeaderAppAtomXml() throws Exception {
performRequestAndValidateResponseForAcceptHeader("Rooms('1')", APPLICATION_ATOM_XML, APPLICATION_ATOM_XML_UTF8);
@@ -70,58 +70,76 @@ public class BasicContentNegotiationTest extends AbstractContentNegotiationTest
@Test
public void acceptHeaderToContentTypeODataVerboseParameter() throws Exception {
final String parameter = ";odata=verbose";
- performRequestAndValidateResponseForAcceptHeader("Employees('1')", APPLICATION_JSON + parameter, APPLICATION_JSON + parameter);
- performRequestAndValidateResponseForAcceptHeader("Employees('1')", APPLICATION_JSON_UTF8 + parameter, APPLICATION_JSON_UTF8 + parameter);
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_XML_UTF8 + parameter, TEXT_PLAIN_UTF8);
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8 );
- performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_XML_UTF8 + parameter, TEXT_PLAIN_UTF8);
- performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8);
-
- performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_XML_UTF8 + parameter, TEXT_PLAIN_UTF8);
- performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8 );
- performRequestAndValidateResponseForAcceptHeader("Buildings/$count", APPLICATION_XML_UTF8 + parameter, TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')", APPLICATION_JSON + parameter, APPLICATION_JSON
+ + parameter);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')", APPLICATION_JSON_UTF8 + parameter,
+ APPLICATION_JSON_UTF8 + parameter);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_XML_UTF8 + parameter,
+ TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_JSON + parameter,
+ TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_XML_UTF8 + parameter,
+ TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_JSON + parameter,
+ TEXT_PLAIN_UTF8);
+
+ performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_XML_UTF8 + parameter,
+ TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Buildings/$count", APPLICATION_XML_UTF8 + parameter,
+ TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8);
}
@Test
public void acceptHeaderToContentTypeIgnoredAcceptHeaders() throws Exception {
performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_XML_UTF8, TEXT_PLAIN_UTF8);
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_JSON, TEXT_PLAIN_UTF8 );
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_JSON, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_XML_UTF8, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_JSON, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", TEXT_PLAIN_UTF8, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", TEXT_PLAIN, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_XML_UTF8, TEXT_PLAIN_UTF8);
- performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_JSON, TEXT_PLAIN_UTF8 );
+ performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_JSON, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings/$count", APPLICATION_XML_UTF8, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings/$count", APPLICATION_JSON, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings/$count", TEXT_PLAIN_UTF8, TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings/$count", TEXT_PLAIN, TEXT_PLAIN_UTF8);
final String parameter = ";someUnknownParameter=withAValue";
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_XML_UTF8 + parameter, TEXT_PLAIN_UTF8);
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8 );
- performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_XML_UTF8 + parameter, TEXT_PLAIN_UTF8);
- performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8);
-
- performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_XML_UTF8 + parameter, TEXT_PLAIN_UTF8);
- performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8 );
- performRequestAndValidateResponseForAcceptHeader("Buildings/$count", APPLICATION_XML_UTF8 + parameter, TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_XML_UTF8 + parameter,
+ TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/$count", APPLICATION_JSON + parameter,
+ TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_XML_UTF8 + parameter,
+ TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Buildings('1')/$count", APPLICATION_JSON + parameter,
+ TEXT_PLAIN_UTF8);
+
+ performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_XML_UTF8 + parameter,
+ TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Employees/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8);
+ performRequestAndValidateResponseForAcceptHeader("Buildings/$count", APPLICATION_XML_UTF8 + parameter,
+ TEXT_PLAIN_UTF8);
performRequestAndValidateResponseForAcceptHeader("Buildings/$count", APPLICATION_JSON + parameter, TEXT_PLAIN_UTF8);
}
@Test
public void acceptHeaderToContentTypeIgnoredAcceptHeadersValue() throws Exception {
final String expectedImageContentType = "image/jpeg";
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/$value", APPLICATION_XML_UTF8, expectedImageContentType);
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/$value", APPLICATION_JSON, expectedImageContentType);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/$value", APPLICATION_XML_UTF8,
+ expectedImageContentType);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/$value", APPLICATION_JSON,
+ expectedImageContentType);
final String expectedTextContentType = "text/plain;charset=utf-8";
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/Age/$value", APPLICATION_XML_UTF8, expectedTextContentType);
- performRequestAndValidateResponseForAcceptHeader("Employees('1')/Age/$value", APPLICATION_JSON, expectedTextContentType);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/Age/$value", APPLICATION_XML_UTF8,
+ expectedTextContentType);
+ performRequestAndValidateResponseForAcceptHeader("Employees('1')/Age/$value", APPLICATION_JSON,
+ expectedTextContentType);
}
-
+
@Test
public void acceptHeaderToContentTypeNotAcceptable() throws Exception {
final String parameterUnknown = ";someUnknownParameter=withAValue";
@@ -139,7 +157,9 @@ public class BasicContentNegotiationTest extends AbstractContentNegotiationTest
* @throws IOException
* @throws ClientProtocolException
*/
- private void performRequestAndValidateResponseForAcceptHeader(String endPointPostfix, String requestAcceptHeader, String expectedResponseContentType) throws IOException, ClientProtocolException {
+ private void performRequestAndValidateResponseForAcceptHeader(final String endPointPostfix,
+ final String requestAcceptHeader, final String expectedResponseContentType) throws IOException,
+ ClientProtocolException {
HttpGet get = new HttpGet(URI.create(getEndpoint() + endPointPostfix));
get.setHeader(HttpHeaders.ACCEPT, requestAcceptHeader);
final HttpResponse response = new DefaultHttpClient().execute(get);
@@ -150,12 +170,12 @@ public class BasicContentNegotiationTest extends AbstractContentNegotiationTest
assertEquals(ContentType.create(expectedResponseContentType), ContentType.create(contentType));
assertNotNull(StringHelper.inputStreamToString(response.getEntity().getContent()));
} catch (AssertionError e) {
- LOG.debug("Response: \n#############\n#\n\n" +
- StringHelper.inputStreamToString(response.getEntity().getContent()) + "\n\n#\n####################");
+ LOG.debug("Response: \n#############\n#\n\n" +
+ StringHelper.inputStreamToString(response.getEntity().getContent()) + "\n\n#\n####################");
throw e;
}
}
-
+
/**
*
* @param endPointPostfix
@@ -164,7 +184,8 @@ public class BasicContentNegotiationTest extends AbstractContentNegotiationTest
* @throws IOException
* @throws ClientProtocolException
*/
- private void performRequestAndValidateResponseForNotAcceptable(String endPointPostfix, String requestAcceptHeader) throws IOException, ClientProtocolException {
+ private void performRequestAndValidateResponseForNotAcceptable(final String endPointPostfix,
+ final String requestAcceptHeader) throws IOException, ClientProtocolException {
HttpGet get = new HttpGet(URI.create(getEndpoint() + endPointPostfix));
get.setHeader(HttpHeaders.ACCEPT, requestAcceptHeader);
final HttpResponse response = new DefaultHttpClient().execute(get);
@@ -172,12 +193,12 @@ public class BasicContentNegotiationTest extends AbstractContentNegotiationTest
final String contentType = response.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue();
// assertEquals(expectedResponseContentType, contentType);
try {
-
+
assertEquals(ContentType.APPLICATION_XML, ContentType.create(contentType));
assertNotNull(StringHelper.inputStreamToString(response.getEntity().getContent()));
} catch (AssertionError e) {
- LOG.debug("Response: \n#############\n#\n\n" +
- StringHelper.inputStreamToString(response.getEntity().getContent()) + "\n\n#\n####################");
+ LOG.debug("Response: \n#############\n#\n\n" +
+ StringHelper.inputStreamToString(response.getEntity().getContent()) + "\n\n#\n####################");
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java
index 8c3c92e..43feebc 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref.contentnegotiation;
@@ -28,15 +28,14 @@ import java.util.List;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.junit.Ignore;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.core.commons.ContentType;
import org.apache.olingo.odata2.core.uri.UriType;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.junit.Ignore;
+import org.junit.Test;
/**
*
@@ -88,10 +87,14 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
FitTestSet testSet = FitTestSet.create(UriType.URI0, "/").init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/xml; charset=utf-8");
- testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/atomsvc+xml; charset=utf-8");
- testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, HttpContentType.APPLICATION_JSON_UTF8);
- testSet.setTestParam(Arrays.asList(""), Arrays.asList(""), HttpStatusCodes.OK, "application/atomsvc+xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/atomsvc+xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ HttpContentType.APPLICATION_JSON_UTF8);
+ testSet.setTestParam(Arrays.asList(""), Arrays.asList(""), HttpStatusCodes.OK,
+ "application/atomsvc+xml; charset=utf-8");
// set all 'NOT ACCEPTED' requests
final List<String> notAcceptedHeaderValues = Arrays.asList(
@@ -103,7 +106,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
testSet.setTestParam(Arrays.asList(""), notAcceptedHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
final List<String> notAcceptedJsonHeaderValues = Arrays.asList("application/json; charset=utf-8");
- testSet.setTestParam(Arrays.asList("", "?$format=json"), notAcceptedJsonHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
+ testSet.setTestParam(Arrays.asList("", "?$format=json"), notAcceptedJsonHeaderValues,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -115,10 +119,14 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
FitTestSet testSet = FitTestSet.create(UriType.URI1, "/Employees").init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/xml; charset=utf-8");
- testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/atom+xml; type=feed; charset=utf-8");
- testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, HttpContentType.APPLICATION_JSON);
- testSet.setTestParam(Arrays.asList(""), Arrays.asList("", "application/atom+xml", "application/atom+xml; charset=utf-8"),
+ testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/atom+xml; type=feed; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ HttpContentType.APPLICATION_JSON);
+ testSet.setTestParam(Arrays.asList(""), Arrays.asList("", "application/atom+xml",
+ "application/atom+xml; charset=utf-8"),
HttpStatusCodes.OK, "application/atom+xml; type=feed; charset=utf-8");
// set all 'NOT ACCEPTED' requests
@@ -132,7 +140,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
final List<String> notAcceptedJsonHeaderValues = Arrays.asList("application/json; charset=utf-8");
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("", "?$format=json"), notAcceptedJsonHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
+ testSet.setTestParam(Arrays.asList("", "?$format=json"), notAcceptedJsonHeaderValues,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -144,9 +153,12 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
FitTestSet testSet = FitTestSet.create(UriType.URI2, "/Employees('1')").init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/xml; charset=utf-8");
- testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/atom+xml; type=entry; charset=utf-8");
- testSet.setTestParam(Arrays.asList(""), Arrays.asList("", "application/atom+xml", "application/atom+xml; charset=utf-8"),
+ testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/atom+xml; type=entry; charset=utf-8");
+ testSet.setTestParam(Arrays.asList(""), Arrays.asList("", "application/atom+xml",
+ "application/atom+xml; charset=utf-8"),
HttpStatusCodes.OK, "application/atom+xml; type=entry; charset=utf-8");
// set all 'NOT ACCEPTED' requests
@@ -164,8 +176,10 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
- testSet.setTestParam(Arrays.asList("", "?$format=json"), notAcceptedJsonHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
+ testSet.setTestParam(Arrays.asList("", "?$format=json"), notAcceptedJsonHeaderValues,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -177,7 +191,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
FitTestSet testSet = FitTestSet.create(UriType.URI3, "/Employees('1')/Location").init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
testSet.setTestParam(Arrays.asList(""), Arrays.asList(""), HttpStatusCodes.OK, "application/xml; charset=utf-8");
// set all 'NOT ACCEPTED' requests
@@ -191,7 +206,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
);
testSet.setTestParam(Arrays.asList(""), notAcceptedHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
// '$format=atom' it not allowed
- testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
+ testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
// JSON is not supported
final List<String> notAcceptedJsonHeaderValues = Arrays.asList(
@@ -199,8 +215,10 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
- testSet.setTestParam(Arrays.asList("", "?$format=json", "?$format=atom"), notAcceptedJsonHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
+ testSet.setTestParam(Arrays.asList("", "?$format=json", "?$format=atom"), notAcceptedJsonHeaderValues,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -212,7 +230,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
FitTestSet testSet = FitTestSet.create(UriType.URI4, "/Employees('1')/Location/Country").init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
testSet.setTestParam(Arrays.asList(""), Arrays.asList(""), HttpStatusCodes.OK, "application/xml; charset=utf-8");
// set all 'NOT ACCEPTED' requests
@@ -226,7 +245,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
);
testSet.setTestParam(Arrays.asList(""), notAcceptedHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
// '$format=atom' it not allowed
- testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
+ testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
// JSON is not supported
final List<String> notAcceptedJsonHeaderValues = Arrays.asList(
@@ -234,8 +254,10 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
- testSet.setTestParam(Arrays.asList("", "?$format=json", "?$format=atom"), notAcceptedJsonHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
+ testSet.setTestParam(Arrays.asList("", "?$format=json", "?$format=atom"), notAcceptedJsonHeaderValues,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -247,7 +269,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
FitTestSet testSet = FitTestSet.create(UriType.URI4, "/Employees('1')/Age").init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
testSet.setTestParam(Arrays.asList(""), Arrays.asList(""), HttpStatusCodes.OK, "application/xml; charset=utf-8");
// set all 'NOT ACCEPTED' requests
@@ -261,7 +284,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
);
testSet.setTestParam(Arrays.asList(""), notAcceptedHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
// '$format=atom' it not allowed
- testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
+ testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
// JSON is not supported
final List<String> notAcceptedJsonHeaderValues = Arrays.asList(
@@ -269,8 +293,10 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
- testSet.setTestParam(Arrays.asList("", "?$format=json", "?$format=atom"), notAcceptedJsonHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
+ testSet.setTestParam(Arrays.asList("", "?$format=json", "?$format=atom"), notAcceptedJsonHeaderValues,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -282,9 +308,12 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
FitTestSet testSet = FitTestSet.create(UriType.URI6A, "/Employees('1')/ne_Room").init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/xml; charset=utf-8");
- testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/atom+xml; type=entry; charset=utf-8");
- testSet.setTestParam(Arrays.asList(""), Arrays.asList("", "application/atom+xml", "application/atom+xml; charset=utf-8"),
+ testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/atom+xml; type=entry; charset=utf-8");
+ testSet.setTestParam(Arrays.asList(""), Arrays.asList("", "application/atom+xml",
+ "application/atom+xml; charset=utf-8"),
HttpStatusCodes.OK, "application/atom+xml; type=entry; charset=utf-8");
// set all 'NOT ACCEPTED' requests
@@ -302,8 +331,10 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
- testSet.setTestParam(Arrays.asList("", "?$format=json"), notAcceptedJsonHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
+ testSet.setTestParam(Arrays.asList("", "?$format=json"), notAcceptedJsonHeaderValues,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -315,7 +346,8 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
FitTestSet testSet = FitTestSet.create(UriType.URI7A, "/Employees('1')/$links/ne_Room").init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK, "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("?$format=xml"), ACCEPT_HEADER_VALUES, HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
testSet.setTestParam(Arrays.asList(""), Arrays.asList(""), HttpStatusCodes.OK, "application/xml; charset=utf-8");
// set all 'NOT ACCEPTED' requests
@@ -335,8 +367,10 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json", "?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
- testSet.setTestParam(Arrays.asList("", "?$format=json", "?$format=atom"), notAcceptedJsonHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json", "?$format=atom"), ACCEPT_HEADER_VALUES,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
+ testSet.setTestParam(Arrays.asList("", "?$format=json", "?$format=atom"), notAcceptedJsonHeaderValues,
+ HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -363,14 +397,16 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
testSet.setTestParam(Arrays.asList(""), notAcceptedHeaderValues, HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
// every combination of $format and $metadata is a 'BAD REQUEST'
- testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.BAD_REQUEST, "application/xml");
+ testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), ACCEPT_HEADER_VALUES,
+ HttpStatusCodes.BAD_REQUEST, "application/xml");
//
final List<String> jsonAcceptHeaders = Arrays.asList(
"application/json",
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), jsonAcceptHeaders, HttpStatusCodes.BAD_REQUEST, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), jsonAcceptHeaders,
+ HttpStatusCodes.BAD_REQUEST, "application/json");
testSet.setTestParam(Arrays.asList(""), jsonAcceptHeaders, HttpStatusCodes.NOT_ACCEPTABLE, "application/json");
// execute all defined tests
@@ -381,17 +417,21 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
@Ignore("Currently ignored because of a BUG")
public void testURI_17_EntityMediaResourceDollarValue() throws Exception {
// create test set
- FitTestSet testSet = FitTestSet.create(UriType.URI17, "/Employees('1')/$value").expectedStatusCode(HttpStatusCodes.OK).expectedContentType("image/jpeg").init();
+ FitTestSet testSet =
+ FitTestSet.create(UriType.URI17, "/Employees('1')/$value").expectedStatusCode(HttpStatusCodes.OK)
+ .expectedContentType("image/jpeg").init();
// every combination of $format and $value is a 'BAD REQUEST'
- testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.BAD_REQUEST, "application/xml");
+ testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), ACCEPT_HEADER_VALUES,
+ HttpStatusCodes.BAD_REQUEST, "application/xml");
//
final List<String> jsonAcceptHeaders = Arrays.asList(
"application/json",
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), jsonAcceptHeaders, HttpStatusCodes.BAD_REQUEST, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), jsonAcceptHeaders,
+ HttpStatusCodes.BAD_REQUEST, "application/json");
testSet.execute(getEndpoint());
}
@@ -403,14 +443,16 @@ public class ContentNegotiationGetRequestTest extends AbstractContentNegotiation
.expectedStatusCode(HttpStatusCodes.OK).expectedContentType("text/plain; charset=utf-8").init();
// every combination of $format and $value is a 'BAD REQUEST'
- testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), ACCEPT_HEADER_VALUES, HttpStatusCodes.BAD_REQUEST, "application/xml");
+ testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), ACCEPT_HEADER_VALUES,
+ HttpStatusCodes.BAD_REQUEST, "application/xml");
//
final List<String> jsonAcceptHeaders = Arrays.asList(
"application/json",
"application/json; charset=utf-8"
);
// TODO: check which behavior is currently wanted
- testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), jsonAcceptHeaders, HttpStatusCodes.BAD_REQUEST, "application/json");
+ testSet.setTestParam(Arrays.asList("?$format=json", "?$format=xml", "?$format=atom"), jsonAcceptHeaders,
+ HttpStatusCodes.BAD_REQUEST, "application/json");
testSet.execute(getEndpoint());
}
[43/59] [abbrv] cleanup of odata ref
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
index 95679fa..686f63e 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.processor;
@@ -120,7 +120,7 @@ import org.apache.olingo.odata2.ref.processor.ListsDataSource.BinaryData;
* Implementation of the centralized parts of OData processing,
* allowing to use the simplified {@link ListsDataSource} for the
* actual data handling.
- *
+ *
*/
public class ListsProcessor extends ODataSingleProcessor {
@@ -134,7 +134,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType)
+ throws ODataException {
ArrayList<Object> data = new ArrayList<Object>();
try {
data.addAll((List<?>) retrieveData(
@@ -179,7 +180,8 @@ public class ListsProcessor extends ODataSingleProcessor {
nextLink = context.getPathInfo().getServiceRoot().relativize(context.getPathInfo().getRequestUri()).toString()
.replaceAll("\\$skiptoken=.+?&?", "")
.replaceAll("\\$skip=.+?&?", "")
- .replaceFirst("(?:\\?|&)$", ""); // Remove potentially trailing "?" or "&" left over from remove actions above.
+ .replaceFirst("(?:\\?|&)$", ""); // Remove potentially trailing "?" or "&" left over from remove actions
+ // above.
nextLink += (nextLink.contains("?") ? "&" : "?")
+ "$skiptoken=" + getSkipToken(entitySet, data.get(SERVER_PAGING_SIZE));
@@ -212,7 +214,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
ArrayList<Object> data = new ArrayList<Object>();
try {
data.addAll((List<?>) retrieveData(
@@ -239,7 +242,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriInfo, final String contentType)
+ throws ODataException {
ArrayList<Object> data = new ArrayList<Object>();
try {
data.addAll((List<?>) retrieveData(
@@ -290,7 +294,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse countEntityLinks(final GetEntitySetLinksCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse countEntityLinks(final GetEntitySetLinksCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
return countEntitySet((GetEntitySetCountUriInfo) uriInfo, contentType);
}
@@ -307,14 +312,18 @@ public class ListsProcessor extends ODataSingleProcessor {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
}
- final ExpandSelectTreeNode expandSelectTreeNode = UriParser.createExpandSelectTree(uriInfo.getSelect(), uriInfo.getExpand());
- ODataResponse odr = ODataResponse.fromResponse(writeEntry(uriInfo.getTargetEntitySet(), expandSelectTreeNode, data, contentType)).build();
+ final ExpandSelectTreeNode expandSelectTreeNode =
+ UriParser.createExpandSelectTree(uriInfo.getSelect(), uriInfo.getExpand());
+ ODataResponse odr =
+ ODataResponse.fromResponse(writeEntry(uriInfo.getTargetEntitySet(), expandSelectTreeNode, data, contentType))
+ .build();
return odr;
}
@Override
- public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
final Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -322,7 +331,8 @@ public class ListsProcessor extends ODataSingleProcessor {
mapFunctionParameters(uriInfo.getFunctionImportParameters()),
uriInfo.getNavigationSegments());
- return ODataResponse.fromResponse(EntityProvider.writeText(appliesFilter(data, uriInfo.getFilter()) ? "1" : "0")).build();
+ return ODataResponse.fromResponse(EntityProvider.writeText(appliesFilter(data, uriInfo.getFilter()) ? "1" : "0"))
+ .build();
}
@Override
@@ -334,7 +344,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse createEntity(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse createEntity(final PostUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
final EdmEntitySet entitySet = uriInfo.getTargetEntitySet();
final EdmEntityType entityType = entitySet.getEntityType();
@@ -377,11 +388,13 @@ public class ListsProcessor extends ODataSingleProcessor {
dataSource.writeRelation(previousEntitySet, sourceData, entitySet, getStructuralTypeValueMap(data, entityType));
}
- return ODataResponse.fromResponse(writeEntry(uriInfo.getTargetEntitySet(), expandSelectTree, data, contentType)).eTag(constructETag(entitySet, data)).build();
+ return ODataResponse.fromResponse(writeEntry(uriInfo.getTargetEntitySet(), expandSelectTree, data, contentType))
+ .eTag(constructETag(entitySet, data)).build();
}
@Override
- public ODataResponse updateEntity(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final boolean merge, final String contentType) throws ODataException {
+ public ODataResponse updateEntity(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final boolean merge, final String contentType) throws ODataException {
Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -407,7 +420,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriInfo, final String contentType)
+ throws ODataException {
final Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -442,7 +456,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse existsEntityLink(final GetEntityLinkCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse existsEntityLink(final GetEntityLinkCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
return existsEntity((GetEntityCountUriInfo) uriInfo, contentType);
}
@@ -476,7 +491,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse createEntityLink(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse createEntityLink(final PostUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
final List<NavigationSegment> navigationSegments = uriInfo.getNavigationSegments();
final List<NavigationSegment> previousSegments = navigationSegments.subList(0, navigationSegments.size() - 1);
@@ -499,7 +515,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
final List<NavigationSegment> navigationSegments = uriInfo.getNavigationSegments();
final List<NavigationSegment> previousSegments = navigationSegments.subList(0, navigationSegments.size() - 1);
@@ -531,7 +548,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse readEntityComplexProperty(final GetComplexPropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityComplexProperty(final GetComplexPropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -562,12 +580,14 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse readEntitySimpleProperty(final GetSimplePropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySimpleProperty(final GetSimplePropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
return readEntityComplexProperty((GetComplexPropertyUriInfo) uriInfo, contentType);
}
@Override
- public ODataResponse readEntitySimplePropertyValue(final GetSimplePropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySimplePropertyValue(final GetSimplePropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -585,11 +605,13 @@ public class ListsProcessor extends ODataSingleProcessor {
final Object value = property.getMapping() == null || property.getMapping().getMimeType() == null ?
getPropertyValue(data, propertyPath) : getSimpleTypeValueMap(data, propertyPath);
- return ODataResponse.fromResponse(EntityProvider.writePropertyValue(property, value)).eTag(constructETag(uriInfo.getTargetEntitySet(), data)).build();
+ return ODataResponse.fromResponse(EntityProvider.writePropertyValue(property, value)).eTag(
+ constructETag(uriInfo.getTargetEntitySet(), data)).build();
}
@Override
- public ODataResponse deleteEntitySimplePropertyValue(final DeleteUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse deleteEntitySimplePropertyValue(final DeleteUriInfo uriInfo, final String contentType)
+ throws ODataException {
Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -614,7 +636,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse updateEntityComplexProperty(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final boolean merge, final String contentType) throws ODataException {
+ public ODataResponse updateEntityComplexProperty(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final boolean merge, final String contentType) throws ODataException {
Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -636,7 +659,9 @@ public class ListsProcessor extends ODataSingleProcessor {
Map<String, Object> values;
try {
- values = EntityProvider.readProperty(requestContentType, property, content, EntityProviderReadProperties.init().mergeSemantic(merge).build());
+ values =
+ EntityProvider.readProperty(requestContentType, property, content, EntityProviderReadProperties.init()
+ .mergeSemantic(merge).build());
} catch (final EntityProviderException e) {
throw new ODataBadRequestException(ODataBadRequestException.BODY, e);
}
@@ -649,19 +674,22 @@ public class ListsProcessor extends ODataSingleProcessor {
} else {
@SuppressWarnings("unchecked")
final Map<String, Object> propertyValue = (Map<String, Object>) value;
- setStructuralTypeValuesFromMap(getPropertyValue(data, property), (EdmStructuralType) property.getType(), propertyValue, merge);
+ setStructuralTypeValuesFromMap(getPropertyValue(data, property), (EdmStructuralType) property.getType(),
+ propertyValue, merge);
}
return ODataResponse.newBuilder().eTag(constructETag(uriInfo.getTargetEntitySet(), data)).build();
}
@Override
- public ODataResponse updateEntitySimpleProperty(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntitySimpleProperty(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
return updateEntityComplexProperty(uriInfo, content, requestContentType, false, contentType);
}
@Override
- public ODataResponse updateEntitySimplePropertyValue(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntitySimplePropertyValue(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -699,7 +727,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse readEntityMedia(final GetMediaResourceUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityMedia(final GetMediaResourceUriInfo uriInfo, final String contentType)
+ throws ODataException {
final Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -720,7 +749,8 @@ public class ListsProcessor extends ODataSingleProcessor {
final String mimeType = binaryData.getMimeType() == null ?
HttpContentType.APPLICATION_OCTET_STREAM : binaryData.getMimeType();
- return ODataResponse.fromResponse(EntityProvider.writeBinary(mimeType, binaryData.getData())).eTag(constructETag(entitySet, data)).build();
+ return ODataResponse.fromResponse(EntityProvider.writeBinary(mimeType, binaryData.getData())).eTag(
+ constructETag(entitySet, data)).build();
}
@Override
@@ -742,7 +772,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse updateEntityMedia(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntityMedia(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
final Object data = retrieveData(
uriInfo.getStartEntitySet(),
uriInfo.getKeyPredicates(),
@@ -768,7 +799,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriInfo, final String contentType)
+ throws ODataException {
final EdmFunctionImport functionImport = uriInfo.getFunctionImport();
final EdmType type = functionImport.getReturnType().getType();
@@ -801,7 +833,8 @@ public class ListsProcessor extends ODataSingleProcessor {
final int timingHandle = context.startRuntimeMeasurement("EntityProvider", "writeFunctionImport");
- final ODataResponse response = EntityProvider.writeFunctionImport(contentType, functionImport, value, entryProperties);
+ final ODataResponse response =
+ EntityProvider.writeFunctionImport(contentType, functionImport, value, entryProperties);
context.stopRuntimeMeasurement(timingHandle);
@@ -809,7 +842,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriInfo, final String contentType)
+ throws ODataException {
final EdmFunctionImport functionImport = uriInfo.getFunctionImport();
final EdmSimpleType type = (EdmSimpleType) functionImport.getReturnType().getType();
@@ -837,12 +871,14 @@ public class ListsProcessor extends ODataSingleProcessor {
for (final KeyPredicate key : keys) {
final EdmProperty property = key.getProperty();
final EdmSimpleType type = (EdmSimpleType) property.getType();
- keyMap.put(property.getName(), type.valueOfString(key.getLiteral(), EdmLiteralKind.DEFAULT, property.getFacets(), type.getDefaultType()));
+ keyMap.put(property.getName(), type.valueOfString(key.getLiteral(), EdmLiteralKind.DEFAULT, property.getFacets(),
+ type.getDefaultType()));
}
return keyMap;
}
- private static Map<String, Object> mapFunctionParameters(final Map<String, EdmLiteral> functionImportParameters) throws EdmSimpleTypeException {
+ private static Map<String, Object> mapFunctionParameters(final Map<String, EdmLiteral> functionImportParameters)
+ throws EdmSimpleTypeException {
if (functionImportParameters == null) {
return Collections.emptyMap();
} else {
@@ -850,13 +886,16 @@ public class ListsProcessor extends ODataSingleProcessor {
for (final String parameterName : functionImportParameters.keySet()) {
final EdmLiteral literal = functionImportParameters.get(parameterName);
final EdmSimpleType type = literal.getType();
- parameterMap.put(parameterName, type.valueOfString(literal.getLiteral(), EdmLiteralKind.DEFAULT, null, type.getDefaultType()));
+ parameterMap.put(parameterName, type.valueOfString(literal.getLiteral(), EdmLiteralKind.DEFAULT, null, type
+ .getDefaultType()));
}
return parameterMap;
}
}
- private Object retrieveData(final EdmEntitySet startEntitySet, final List<KeyPredicate> keyPredicates, final EdmFunctionImport functionImport, final Map<String, Object> functionImportParameters, final List<NavigationSegment> navigationSegments) throws ODataException {
+ private Object retrieveData(final EdmEntitySet startEntitySet, final List<KeyPredicate> keyPredicates,
+ final EdmFunctionImport functionImport, final Map<String, Object> functionImportParameters,
+ final List<NavigationSegment> navigationSegments) throws ODataException {
Object data;
final Map<String, Object> keys = mapKey(keyPredicates);
@@ -891,14 +930,16 @@ public class ListsProcessor extends ODataSingleProcessor {
final EdmProperty property = (EdmProperty) entityType.getProperty(propertyName);
if (property.getFacets() != null && property.getFacets().getConcurrencyMode() == EdmConcurrencyMode.Fixed) {
final EdmSimpleType type = (EdmSimpleType) property.getType();
- final String component = type.valueToString(getPropertyValue(data, property), EdmLiteralKind.DEFAULT, property.getFacets());
+ final String component =
+ type.valueToString(getPropertyValue(data, property), EdmLiteralKind.DEFAULT, property.getFacets());
eTag = eTag == null ? component : eTag + Edm.DELIMITER + component;
}
}
return eTag == null ? null : "W/\"" + eTag + "\"";
}
- private <T> Map<String, ODataCallback> getCallbacks(final T data, final EdmEntityType entityType) throws EdmException {
+ private <T> Map<String, ODataCallback> getCallbacks(final T data, final EdmEntityType entityType)
+ throws EdmException {
final List<String> navigationPropertyNames = entityType.getNavigationPropertyNames();
if (navigationPropertyNames.isEmpty()) {
return null;
@@ -920,9 +961,11 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) throws ODataApplicationException {
+ public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
+ throws ODataApplicationException {
try {
- final EdmEntityType entityType = context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty()).getEntityType();
+ final EdmEntityType entityType =
+ context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty()).getEntityType();
List<Map<String, Object>> values = new ArrayList<Map<String, Object>>();
Object relatedData = null;
try {
@@ -935,7 +978,10 @@ public class ListsProcessor extends ODataSingleProcessor {
}
WriteFeedCallbackResult result = new WriteFeedCallbackResult();
result.setFeedData(values);
- EntityProviderWriteProperties inlineProperties = EntityProviderWriteProperties.serviceRoot(getContext().getPathInfo().getServiceRoot()).callbacks(getCallbacks(relatedData, entityType)).expandSelectTree(context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
+ EntityProviderWriteProperties inlineProperties =
+ EntityProviderWriteProperties.serviceRoot(getContext().getPathInfo().getServiceRoot()).callbacks(
+ getCallbacks(relatedData, entityType)).expandSelectTree(context.getCurrentExpandSelectTreeNode())
+ .selfLink(context.getSelfLink()).build();
result.setInlineProperties(inlineProperties);
return result;
} catch (final ODataException e) {
@@ -944,9 +990,11 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context) throws ODataApplicationException {
+ public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context)
+ throws ODataApplicationException {
try {
- final EdmEntityType entityType = context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty()).getEntityType();
+ final EdmEntityType entityType =
+ context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty()).getEntityType();
WriteEntryCallbackResult result = new WriteEntryCallbackResult();
Object relatedData;
try {
@@ -955,7 +1003,10 @@ public class ListsProcessor extends ODataSingleProcessor {
relatedData = null;
}
result.setEntryData(getStructuralTypeValueMap(relatedData, entityType));
- EntityProviderWriteProperties inlineProperties = EntityProviderWriteProperties.serviceRoot(getContext().getPathInfo().getServiceRoot()).callbacks(getCallbacks(relatedData, entityType)).expandSelectTree(context.getCurrentExpandSelectTreeNode()).build();
+ EntityProviderWriteProperties inlineProperties =
+ EntityProviderWriteProperties.serviceRoot(getContext().getPathInfo().getServiceRoot()).callbacks(
+ getCallbacks(relatedData, entityType)).expandSelectTree(context.getCurrentExpandSelectTreeNode())
+ .build();
result.setInlineProperties(inlineProperties);
return result;
} catch (final ODataException e) {
@@ -967,12 +1018,14 @@ public class ListsProcessor extends ODataSingleProcessor {
final EdmEntitySet entitySet = context.getSourceEntitySet();
return dataSource.readRelatedData(
entitySet,
- data instanceof List ? readEntryData((List<?>) data, entitySet.getEntityType(), context.extractKeyFromEntryData()) : data,
+ data instanceof List ? readEntryData((List<?>) data, entitySet.getEntityType(), context
+ .extractKeyFromEntryData()) : data,
entitySet.getRelatedEntitySet(context.getNavigationProperty()),
Collections.<String, Object> emptyMap());
}
- private <T> T readEntryData(final List<T> data, final EdmEntityType entityType, final Map<String, Object> key) throws ODataException {
+ private <T> T readEntryData(final List<T> data, final EdmEntityType entityType, final Map<String, Object> key)
+ throws ODataException {
for (final T entryData : data) {
boolean found = true;
for (final EdmProperty keyProperty : entityType.getKeyProperties()) {
@@ -989,7 +1042,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
}
- private <T> ODataResponse writeEntry(final EdmEntitySet entitySet, final ExpandSelectTreeNode expandSelectTree, final T data, final String contentType) throws ODataException, EntityProviderException {
+ private <T> ODataResponse writeEntry(final EdmEntitySet entitySet, final ExpandSelectTreeNode expandSelectTree,
+ final T data, final String contentType) throws ODataException, EntityProviderException {
final EdmEntityType entityType = entitySet.getEntityType();
final Map<String, Object> values = getStructuralTypeValueMap(data, entityType);
@@ -1009,7 +1063,8 @@ public class ListsProcessor extends ODataSingleProcessor {
return response;
}
- private ODataEntry parseEntry(final EdmEntitySet entitySet, final InputStream content, final String requestContentType, final EntityProviderReadProperties properties) throws ODataBadRequestException {
+ private ODataEntry parseEntry(final EdmEntitySet entitySet, final InputStream content,
+ final String requestContentType, final EntityProviderReadProperties properties) throws ODataBadRequestException {
ODataContext context = getContext();
final int timingHandle = context.startRuntimeMeasurement("EntityConsumer", "readEntry");
@@ -1025,7 +1080,8 @@ public class ListsProcessor extends ODataSingleProcessor {
return entryValues;
}
- private Map<String, Object> parseLink(final EdmEntitySet entitySet, final InputStream content, final String contentType) throws ODataException {
+ private Map<String, Object> parseLink(final EdmEntitySet entitySet, final InputStream content,
+ final String contentType) throws ODataException {
ODataContext context = getContext();
final int timingHandle = context.startRuntimeMeasurement("EntityProvider", "readLink");
@@ -1040,7 +1096,8 @@ public class ListsProcessor extends ODataSingleProcessor {
return targetKeys;
}
- private Map<String, Object> parseLinkUri(final EdmEntitySet targetEntitySet, final String uriString) throws ODataException {
+ private Map<String, Object> parseLinkUri(final EdmEntitySet targetEntitySet, final String uriString)
+ throws ODataException {
final String serviceRoot = getContext().getPathInfo().getServiceRoot().toString();
final String path = uriString.startsWith(serviceRoot.toString()) ?
uriString.substring(serviceRoot.length()) : uriString;
@@ -1064,7 +1121,7 @@ public class ListsProcessor extends ODataSingleProcessor {
try {
uri = UriParser.parse(edm, Arrays.asList(pathSegment), Collections.<String, String> emptyMap());
} catch (ODataException e) {
- // We don't understand the link target. This could also be seen as an error.
+ // We don't understand the link target. This could also be seen as an error.
}
context.stopRuntimeMeasurement(timingHandle);
@@ -1081,11 +1138,13 @@ public class ListsProcessor extends ODataSingleProcessor {
}
}
- private <T> void createInlinedEntities(final EdmEntitySet entitySet, final T data, final ODataEntry entryValues) throws ODataException {
+ private <T> void createInlinedEntities(final EdmEntitySet entitySet, final T data, final ODataEntry entryValues)
+ throws ODataException {
final EdmEntityType entityType = entitySet.getEntityType();
for (final String navigationPropertyName : entityType.getNavigationPropertyNames()) {
- final EdmNavigationProperty navigationProperty = (EdmNavigationProperty) entityType.getProperty(navigationPropertyName);
+ final EdmNavigationProperty navigationProperty =
+ (EdmNavigationProperty) entityType.getProperty(navigationPropertyName);
final EdmEntitySet relatedEntitySet = entitySet.getRelatedEntitySet(navigationProperty);
final EdmEntityType relatedEntityType = relatedEntitySet.getEntityType();
@@ -1106,7 +1165,8 @@ public class ListsProcessor extends ODataSingleProcessor {
Object relatedData = dataSource.newDataObject(relatedEntitySet);
setStructuralTypeValuesFromMap(relatedData, relatedEntityType, relatedValues.getProperties(), false);
dataSource.createData(relatedEntitySet, relatedData);
- dataSource.writeRelation(entitySet, data, relatedEntitySet, getStructuralTypeValueMap(relatedData, relatedEntityType));
+ dataSource.writeRelation(entitySet, data, relatedEntitySet, getStructuralTypeValueMap(relatedData,
+ relatedEntityType));
createInlinedEntities(relatedEntitySet, relatedData, relatedValues);
}
} else if (relatedValue instanceof ODataEntry) {
@@ -1114,7 +1174,8 @@ public class ListsProcessor extends ODataSingleProcessor {
Object relatedData = dataSource.newDataObject(relatedEntitySet);
setStructuralTypeValuesFromMap(relatedData, relatedEntityType, relatedValueEntry.getProperties(), false);
dataSource.createData(relatedEntitySet, relatedData);
- dataSource.writeRelation(entitySet, data, relatedEntitySet, getStructuralTypeValueMap(relatedData, relatedEntityType));
+ dataSource.writeRelation(entitySet, data, relatedEntitySet, getStructuralTypeValueMap(relatedData,
+ relatedEntityType));
createInlinedEntities(relatedEntitySet, relatedData, relatedValueEntry);
} else {
throw new ODataException("Unexpected class for a related value: " + relatedValue.getClass().getSimpleName());
@@ -1124,7 +1185,9 @@ public class ListsProcessor extends ODataSingleProcessor {
}
}
- private <T> Integer applySystemQueryOptions(final EdmEntitySet entitySet, final List<T> data, final FilterExpression filter, final InlineCount inlineCount, final OrderByExpression orderBy, final String skipToken, final Integer skip, final Integer top) throws ODataException {
+ private <T> Integer applySystemQueryOptions(final EdmEntitySet entitySet, final List<T> data,
+ final FilterExpression filter, final InlineCount inlineCount, final OrderByExpression orderBy,
+ final String skipToken, final Integer skip, final Integer top) throws ODataException {
ODataContext context = getContext();
final int timingHandle = context.startRuntimeMeasurement(getClass().getSimpleName(), "applySystemQueryOptions");
@@ -1357,14 +1420,18 @@ public class ListsProcessor extends ODataSingleProcessor {
} else {
throw new ODataNotImplementedException();
}
- currentExpression = currentExpression.getKind() == ExpressionKind.MEMBER ? ((MemberExpression) currentExpression).getPath() : null;
+ currentExpression =
+ currentExpression.getKind() == ExpressionKind.MEMBER ? ((MemberExpression) currentExpression).getPath()
+ : null;
}
- return memberType.valueToString(getPropertyValue(data, propertyPath), EdmLiteralKind.DEFAULT, memberProperty.getFacets());
+ return memberType.valueToString(getPropertyValue(data, propertyPath), EdmLiteralKind.DEFAULT, memberProperty
+ .getFacets());
case LITERAL:
final LiteralExpression literal = (LiteralExpression) expression;
final EdmSimpleType literalType = (EdmSimpleType) literal.getEdmType();
- return literalType.valueToString(literalType.valueOfString(literal.getUriLiteral(), EdmLiteralKind.URI, null, literalType.getDefaultType()),
+ return literalType.valueToString(literalType.valueOfString(literal.getUriLiteral(), EdmLiteralKind.URI, null,
+ literalType.getDefaultType()),
EdmLiteralKind.DEFAULT, null);
case METHOD:
@@ -1428,7 +1495,9 @@ public class ListsProcessor extends ODataSingleProcessor {
String skipToken = "";
for (final EdmProperty property : entitySet.getEntityType().getKeyProperties()) {
final EdmSimpleType type = (EdmSimpleType) property.getType();
- skipToken = skipToken.concat(type.valueToString(getPropertyValue(data, property), EdmLiteralKind.DEFAULT, property.getFacets()));
+ skipToken =
+ skipToken.concat(type.valueToString(getPropertyValue(data, property), EdmLiteralKind.DEFAULT, property
+ .getFacets()));
}
return skipToken;
}
@@ -1451,7 +1520,8 @@ public class ListsProcessor extends ODataSingleProcessor {
return getType(data, getGetterMethodName(property));
}
- private static <T, V> void setPropertyValue(final T data, final EdmProperty property, final V value) throws ODataException {
+ private static <T, V> void setPropertyValue(final T data, final EdmProperty property, final V value)
+ throws ODataException {
final String methodName = getSetterMethodName(getGetterMethodName(property));
if (methodName != null) {
setValue(data, methodName, value);
@@ -1459,7 +1529,9 @@ public class ListsProcessor extends ODataSingleProcessor {
}
private static String getGetterMethodName(final EdmProperty property) throws EdmException {
- final String prefix = property.isSimple() && property.getType() == EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance() ? "is" : "get";
+ final String prefix =
+ property.isSimple() && property.getType() == EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance() ? "is"
+ : "get";
final String defaultMethodName = prefix + property.getName();
return property.getMapping() == null || property.getMapping().getInternalName() == null ?
defaultMethodName : property.getMapping().getInternalName();
@@ -1470,7 +1542,8 @@ public class ListsProcessor extends ODataSingleProcessor {
null : getterMethodName.replaceFirst("^is", "set").replaceFirst("^get", "set");
}
- private static <T> Map<String, Object> getSimpleTypeValueMap(final T data, final List<EdmProperty> propertyPath) throws ODataException {
+ private static <T> Map<String, Object> getSimpleTypeValueMap(final T data, final List<EdmProperty> propertyPath)
+ throws ODataException {
final EdmProperty property = propertyPath.get(propertyPath.size() - 1);
Map<String, Object> valueWithMimeType = new HashMap<String, Object>();
valueWithMimeType.put(property.getName(), getPropertyValue(data, propertyPath));
@@ -1479,7 +1552,8 @@ public class ListsProcessor extends ODataSingleProcessor {
return valueWithMimeType;
}
- private <T> Map<String, Object> getStructuralTypeValueMap(final T data, final EdmStructuralType type) throws ODataException {
+ private <T> Map<String, Object> getStructuralTypeValueMap(final T data, final EdmStructuralType type)
+ throws ODataException {
ODataContext context = getContext();
final int timingHandle = context.startRuntimeMeasurement(getClass().getSimpleName(), "getStructuralTypeValueMap");
@@ -1511,7 +1585,8 @@ public class ListsProcessor extends ODataSingleProcessor {
return valueMap;
}
- private <T> Map<String, Object> getStructuralTypeTypeMap(final T data, final EdmStructuralType type) throws ODataException {
+ private <T> Map<String, Object> getStructuralTypeTypeMap(final T data, final EdmStructuralType type)
+ throws ODataException {
ODataContext context = getContext();
final int timingHandle = context.startRuntimeMeasurement(getClass().getSimpleName(), "getStructuralTypeTypeMap");
@@ -1521,7 +1596,8 @@ public class ListsProcessor extends ODataSingleProcessor {
if (property.isSimple()) {
typeMap.put(propertyName, getPropertyType(data, property));
} else {
- typeMap.put(propertyName, getStructuralTypeTypeMap(getPropertyValue(data, property), (EdmStructuralType) property.getType()));
+ typeMap.put(propertyName, getStructuralTypeTypeMap(getPropertyValue(data, property),
+ (EdmStructuralType) property.getType()));
}
}
@@ -1530,9 +1606,11 @@ public class ListsProcessor extends ODataSingleProcessor {
return typeMap;
}
- private <T> void setStructuralTypeValuesFromMap(final T data, final EdmStructuralType type, final Map<String, Object> valueMap, final boolean merge) throws ODataException {
+ private <T> void setStructuralTypeValuesFromMap(final T data, final EdmStructuralType type,
+ final Map<String, Object> valueMap, final boolean merge) throws ODataException {
ODataContext context = getContext();
- final int timingHandle = context.startRuntimeMeasurement(getClass().getSimpleName(), "setStructuralTypeValuesFromMap");
+ final int timingHandle =
+ context.startRuntimeMeasurement(getClass().getSimpleName(), "setStructuralTypeValuesFromMap");
for (final String propertyName : type.getPropertyNames()) {
final EdmProperty property = (EdmProperty) type.getProperty(propertyName);
@@ -1546,7 +1624,8 @@ public class ListsProcessor extends ODataSingleProcessor {
} else {
@SuppressWarnings("unchecked")
final Map<String, Object> values = (Map<String, Object>) value;
- setStructuralTypeValuesFromMap(getPropertyValue(data, property), (EdmStructuralType) property.getType(), values, merge);
+ setStructuralTypeValuesFromMap(getPropertyValue(data, property), (EdmStructuralType) property.getType(),
+ values, merge);
}
}
}
@@ -1613,7 +1692,8 @@ public class ListsProcessor extends ODataSingleProcessor {
return type;
}
- private static <T, V> void setValue(final T data, final String methodName, final V value) throws ODataNotFoundException {
+ private static <T, V> void setValue(final T data, final String methodName, final V value)
+ throws ODataNotFoundException {
try {
boolean found = false;
for (final Method method : Arrays.asList(data.getClass().getMethods())) {
@@ -1621,7 +1701,8 @@ public class ListsProcessor extends ODataSingleProcessor {
found = true;
final Class<?> type = method.getParameterTypes()[0];
if (value == null) {
- if (type.equals(byte.class) || type.equals(short.class) || type.equals(int.class) || type.equals(long.class) || type.equals(char.class)) {
+ if (type.equals(byte.class) || type.equals(short.class) || type.equals(int.class)
+ || type.equals(long.class) || type.equals(char.class)) {
method.invoke(data, 0);
} else if (type.equals(float.class) || type.equals(double.class)) {
method.invoke(data, 0.0);
@@ -1651,7 +1732,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse executeBatch(final BatchHandler handler, final String contentType, final InputStream content) throws ODataException {
+ public ODataResponse executeBatch(final BatchHandler handler, final String contentType, final InputStream content)
+ throws ODataException {
ODataResponse batchResponse;
List<BatchResponsePart> batchResponseParts = new ArrayList<BatchResponsePart>();
PathInfo pathInfo = getContext().getPathInfo();
@@ -1665,7 +1747,8 @@ public class ListsProcessor extends ODataSingleProcessor {
}
@Override
- public BatchResponsePart executeChangeSet(final BatchHandler handler, final List<ODataRequest> requests) throws ODataException {
+ public BatchResponsePart executeChangeSet(final BatchHandler handler, final List<ODataRequest> requests)
+ throws ODataException {
List<ODataResponse> responses = new ArrayList<ODataResponse>();
for (ODataRequest request : requests) {
ODataResponse response = handler.handleRequest(request);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
index fd64872..e3a4c9a 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.processor;
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.ref.model.Team;
/**
* Data for the reference scenario
- *
+ *
*/
public class ScenarioDataSource implements ListsDataSource {
@@ -63,7 +63,8 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public List<?> readData(final EdmEntitySet entitySet) throws ODataNotImplementedException, ODataNotFoundException, EdmException {
+ public List<?> readData(final EdmEntitySet entitySet) throws ODataNotImplementedException, ODataNotFoundException,
+ EdmException {
if (ENTITYSET_1_1.equals(entitySet.getName())) {
return Arrays.asList(dataContainer.getEmployees().toArray());
} else if (ENTITYSET_1_2.equals(entitySet.getName())) {
@@ -82,7 +83,8 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public Object readData(final EdmEntitySet entitySet, final Map<String, Object> keys) throws ODataNotImplementedException, ODataNotFoundException, EdmException {
+ public Object readData(final EdmEntitySet entitySet, final Map<String, Object> keys)
+ throws ODataNotImplementedException, ODataNotFoundException, EdmException {
if (ENTITYSET_1_1.equals(entitySet.getName())) {
for (final Employee employee : dataContainer.getEmployees()) {
if (employee.getId().equals(keys.get("EmployeeId"))) {
@@ -137,7 +139,9 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public Object readRelatedData(final EdmEntitySet sourceEntitySet, final Object sourceData, final EdmEntitySet targetEntitySet, final Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException {
+ public Object readRelatedData(final EdmEntitySet sourceEntitySet, final Object sourceData,
+ final EdmEntitySet targetEntitySet, final Map<String, Object> targetKeys) throws ODataNotImplementedException,
+ ODataNotFoundException, EdmException {
if (ENTITYSET_1_1.equals(targetEntitySet.getName())) {
List<?> data = Collections.emptyList();
if (ENTITYSET_1_2.equals(sourceEntitySet.getName())) {
@@ -214,7 +218,8 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public Object readData(final EdmFunctionImport function, final Map<String, Object> parameters, final Map<String, Object> keys) throws ODataNotImplementedException, ODataNotFoundException, EdmException {
+ public Object readData(final EdmFunctionImport function, final Map<String, Object> parameters,
+ final Map<String, Object> keys) throws ODataNotImplementedException, ODataNotFoundException, EdmException {
if (function.getName().equals("EmployeeSearch")) {
if (parameters.get("q") == null) {
throw new ODataNotFoundException(null);
@@ -335,7 +340,8 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public BinaryData readBinaryData(final EdmEntitySet entitySet, final Object mediaLinkEntryData) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
+ public BinaryData readBinaryData(final EdmEntitySet entitySet, final Object mediaLinkEntryData)
+ throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
if (mediaLinkEntryData == null) {
throw new ODataNotFoundException(null);
}
@@ -355,7 +361,9 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public void writeBinaryData(final EdmEntitySet entitySet, final Object mediaLinkEntryData, final BinaryData binaryData) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
+ public void
+ writeBinaryData(final EdmEntitySet entitySet, final Object mediaLinkEntryData, final BinaryData binaryData)
+ throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
if (mediaLinkEntryData == null) {
throw new ODataNotFoundException(null);
}
@@ -402,7 +410,8 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public void deleteData(final EdmEntitySet entitySet, final Map<String, Object> keys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
+ public void deleteData(final EdmEntitySet entitySet, final Map<String, Object> keys)
+ throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
final Object data = readData(entitySet, keys);
if (ENTITYSET_1_1.equals(entitySet.getName()) || ENTITYSET_1_4.equals(entitySet.getName())) {
@@ -456,7 +465,8 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public void createData(final EdmEntitySet entitySet, final Object data) throws ODataNotImplementedException, EdmException, ODataApplicationException {
+ public void createData(final EdmEntitySet entitySet, final Object data) throws ODataNotImplementedException,
+ EdmException, ODataApplicationException {
if (ENTITYSET_1_1.equals(entitySet.getName())) {
dataContainer.getEmployees().add((Employee) data);
} else if (ENTITYSET_1_2.equals(entitySet.getName())) {
@@ -475,7 +485,9 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public void deleteRelation(final EdmEntitySet sourceEntitySet, final Object sourceData, final EdmEntitySet targetEntitySet, final Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
+ public void deleteRelation(final EdmEntitySet sourceEntitySet, final Object sourceData,
+ final EdmEntitySet targetEntitySet, final Map<String, Object> targetKeys) throws ODataNotImplementedException,
+ ODataNotFoundException, EdmException, ODataApplicationException {
if (ENTITYSET_1_1.equals(targetEntitySet.getName())) {
if (ENTITYSET_1_2.equals(sourceEntitySet.getName())) {
for (Iterator<Employee> iterator = ((Team) sourceData).getEmployees().iterator(); iterator.hasNext();) {
@@ -535,7 +547,9 @@ public class ScenarioDataSource implements ListsDataSource {
}
@Override
- public void writeRelation(final EdmEntitySet sourceEntitySet, final Object sourceData, final EdmEntitySet targetEntitySet, final Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
+ public void writeRelation(final EdmEntitySet sourceEntitySet, final Object sourceData,
+ final EdmEntitySet targetEntitySet, final Map<String, Object> targetKeys) throws ODataNotImplementedException,
+ ODataNotFoundException, EdmException, ODataApplicationException {
if (ENTITYSET_1_1.equals(targetEntitySet.getName())) {
final Employee employee = (Employee) readData(targetEntitySet, targetKeys);
if (ENTITYSET_1_2.equals(sourceEntitySet.getName())) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java
index 484f2ee..978696e 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java
@@ -1,36 +1,35 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.processor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.ep.EntityProvider;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
import org.apache.olingo.odata2.api.processor.ODataErrorCallback;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
import org.apache.olingo.odata2.api.processor.ODataResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Callback for handling errors by logging internal server errors additionally.
- *
+ *
*/
public class ScenarioErrorCallback implements ODataErrorCallback {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java
index 8a4667d..ea46399 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.processor;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java
index 397281c..be8ca5f 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
@@ -25,9 +25,8 @@ import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
-
import org.apache.olingo.odata2.testutil.fit.BaseTest;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java
index fa38d1f..7c058a0 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
@@ -25,9 +25,8 @@ import static org.junit.Assert.assertTrue;
import java.util.List;
-import org.junit.Test;
-
import org.apache.olingo.odata2.testutil.fit.BaseTest;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java
index 2e7a5ed..0e20734 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
@@ -27,9 +27,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Calendar;
-import org.junit.Test;
-
import org.apache.olingo.odata2.testutil.fit.BaseTest;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java
index ad23b2a..69d172e 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
@@ -24,9 +24,8 @@ import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
-
import org.apache.olingo.odata2.testutil.fit.BaseTest;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java
index 2c8fdef..28303c7 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
@@ -24,9 +24,8 @@ import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
-
import org.apache.olingo.odata2.testutil.fit.BaseTest;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java
index 7d35c8c..1a2f83e 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
@@ -25,9 +25,8 @@ import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
-
import org.apache.olingo.odata2.testutil.fit.BaseTest;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java
index 94161b4..ce47662 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.read;
@@ -30,10 +30,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.nio.CharBuffer;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmEntityType;
@@ -47,6 +43,9 @@ import org.apache.olingo.odata2.ref.model.DataContainer;
import org.apache.olingo.odata2.ref.processor.ListsProcessor;
import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
import org.apache.olingo.odata2.testutil.fit.BaseTest;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
/**
*
@@ -104,7 +103,8 @@ public class EntitySetTest extends BaseTest {
public void readEmployees() throws Exception {
final UriInfo uriResult = mockUriResult("Employees");
- ODataResponse response = processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
+ ODataResponse response =
+ processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Employee"));
}
@@ -113,7 +113,8 @@ public class EntitySetTest extends BaseTest {
public void readTeams() throws Exception {
final UriInfo uriResult = mockUriResult("Teams");
- ODataResponse response = processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
+ ODataResponse response =
+ processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Team"));
}
@@ -122,7 +123,8 @@ public class EntitySetTest extends BaseTest {
public void readRooms() throws Exception {
final UriInfo uriResult = mockUriResult("Rooms");
- ODataResponse response = processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
+ ODataResponse response =
+ processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Room"));
}
@@ -131,7 +133,8 @@ public class EntitySetTest extends BaseTest {
public void readManagers() throws Exception {
final UriInfo uriResult = mockUriResult("Managers");
- ODataResponse response = processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
+ ODataResponse response =
+ processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Manager"));
}
@@ -140,7 +143,8 @@ public class EntitySetTest extends BaseTest {
public void readBuildings() throws Exception {
final UriInfo uriResult = mockUriResult("Buildings");
- ODataResponse response = processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
+ ODataResponse response =
+ processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Building"));
}
@@ -149,7 +153,8 @@ public class EntitySetTest extends BaseTest {
public void readPhotos() throws Exception {
final UriInfo uriResult = mockUriResult("Photos");
- ODataResponse response = processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
+ ODataResponse response =
+ processor.readEntitySet(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Photo"));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java
index cc048a1..67a00af 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.read;
@@ -31,10 +31,6 @@ import java.nio.CharBuffer;
import java.util.ArrayList;
import java.util.Arrays;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmEntityType;
@@ -52,6 +48,9 @@ import org.apache.olingo.odata2.ref.model.DataContainer;
import org.apache.olingo.odata2.ref.processor.ListsProcessor;
import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
import org.apache.olingo.odata2.testutil.fit.BaseTest;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
/**
*
@@ -82,7 +81,8 @@ public class EntityTest extends BaseTest {
processor.setContext(mockedContext);
}
- private UriInfo mockUriResult(final String entitySetName, final String keyName, final String keyValue) throws EdmException {
+ private UriInfo mockUriResult(final String entitySetName, final String keyName, final String keyValue)
+ throws EdmException {
EdmProperty keyProperty = mock(EdmProperty.class);
when(keyProperty.getName()).thenReturn(keyName);
when(keyProperty.getType()).thenReturn(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
@@ -129,7 +129,8 @@ public class EntityTest extends BaseTest {
public void readEmployees() throws Exception {
final UriInfo uriResult = mockUriResult("Employees", "EmployeeId", "5");
- ODataResponse response = processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString());
+ ODataResponse response =
+ processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Employee"));
}
@@ -138,7 +139,8 @@ public class EntityTest extends BaseTest {
public void readTeams() throws Exception {
final UriInfo uriResult = mockUriResult("Teams", "Id", "1");
- ODataResponse response = processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString());
+ ODataResponse response =
+ processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Team"));
}
@@ -147,7 +149,8 @@ public class EntityTest extends BaseTest {
public void readRooms() throws Exception {
final UriInfo uriResult = mockUriResult("Rooms", "Id", "1");
- ODataResponse response = processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
+ ODataResponse response =
+ processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Room"));
}
@@ -156,7 +159,8 @@ public class EntityTest extends BaseTest {
public void readManagers() throws Exception {
final UriInfo uriResult = mockUriResult("Managers", "EmployeeId", "1");
- ODataResponse response = processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString());
+ ODataResponse response =
+ processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Manager"));
}
@@ -165,7 +169,8 @@ public class EntityTest extends BaseTest {
public void readBuildings() throws Exception {
final UriInfo uriResult = mockUriResult("Buildings", "Id", "1");
- ODataResponse response = processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString());
+ ODataResponse response =
+ processor.readEntity(uriResult, ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString());
assertNotNull(response);
assertTrue(readContent(response).contains("Building"));
}
[49/59] [abbrv] cleanup of jpa api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
index 34721a0..b3195c3 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.exception;
@@ -28,28 +28,44 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
* The exception object is created with localized error texts provided error
* texts are maintained in localized languages.
*
- *
+ *
*
*/
public class ODataJPARuntimeException extends ODataJPAException {
- public static final MessageReference ENTITY_MANAGER_NOT_INITIALIZED = createMessageReference(ODataJPARuntimeException.class, "ENTITY_MANAGER_NOT_INITIALIZED");
- public static final MessageReference RESOURCE_NOT_FOUND = createMessageReference(ODataJPARuntimeException.class, "RESOURCE_NOT_FOUND");
+ public static final MessageReference ENTITY_MANAGER_NOT_INITIALIZED = createMessageReference(
+ ODataJPARuntimeException.class, "ENTITY_MANAGER_NOT_INITIALIZED");
+ public static final MessageReference RESOURCE_NOT_FOUND = createMessageReference(ODataJPARuntimeException.class,
+ "RESOURCE_NOT_FOUND");
public static final MessageReference GENERAL = createMessageReference(ODataJPARuntimeException.class, "GENERAL");
- public static final MessageReference INNER_EXCEPTION = createMessageReference(ODataJPARuntimeException.class, "INNER_EXCEPTION");
- public static final MessageReference JOIN_CLAUSE_EXPECTED = createMessageReference(ODataJPARuntimeException.class, "JOIN_CLAUSE_EXPECTED");
- public static final MessageReference ERROR_JPQLCTXBLDR_CREATE = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQLCTXBLDR_CREATE");
- public static final MessageReference ERROR_ODATA_FILTER_CONDITION = createMessageReference(ODataJPARuntimeException.class, "ERROR_ODATA_FILTER_CONDITION");
- public static final MessageReference ERROR_JPQL_QUERY_CREATE = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_QUERY_CREATE");
- public static final MessageReference ERROR_JPQL_CREATE_REQUEST = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_CREATE_REQUEST");
- public static final MessageReference ERROR_JPQL_UPDATE_REQUEST = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_UPDATE_REQUEST");
- public static final MessageReference ERROR_JPQL_DELETE_REQUEST = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_DELETE_REQUEST");
- public static final MessageReference ERROR_JPQL_KEY_VALUE = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_KEY_VALUE");
- public static final MessageReference ERROR_JPQL_PARAM_VALUE = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_PARAM_VALUE");
- public static final MessageReference ERROR_JPQL_UNIQUE_CONSTRAINT = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_UNIQUE_CONSTRAINT");
- public static final MessageReference ERROR_JPQL_INTEGRITY_CONSTRAINT = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_INTEGRITY_CONSTRAINT");
- public static final MessageReference RELATIONSHIP_INVALID = createMessageReference(ODataJPARuntimeException.class, "RELATIONSHIP_INVALID");
- public static final MessageReference RESOURCE_X_NOT_FOUND = createMessageReference(ODataJPARuntimeException.class, "RESOURCE_X_NOT_FOUND");
+ public static final MessageReference INNER_EXCEPTION = createMessageReference(ODataJPARuntimeException.class,
+ "INNER_EXCEPTION");
+ public static final MessageReference JOIN_CLAUSE_EXPECTED = createMessageReference(ODataJPARuntimeException.class,
+ "JOIN_CLAUSE_EXPECTED");
+ public static final MessageReference ERROR_JPQLCTXBLDR_CREATE = createMessageReference(
+ ODataJPARuntimeException.class, "ERROR_JPQLCTXBLDR_CREATE");
+ public static final MessageReference ERROR_ODATA_FILTER_CONDITION = createMessageReference(
+ ODataJPARuntimeException.class, "ERROR_ODATA_FILTER_CONDITION");
+ public static final MessageReference ERROR_JPQL_QUERY_CREATE = createMessageReference(ODataJPARuntimeException.class,
+ "ERROR_JPQL_QUERY_CREATE");
+ public static final MessageReference ERROR_JPQL_CREATE_REQUEST = createMessageReference(
+ ODataJPARuntimeException.class, "ERROR_JPQL_CREATE_REQUEST");
+ public static final MessageReference ERROR_JPQL_UPDATE_REQUEST = createMessageReference(
+ ODataJPARuntimeException.class, "ERROR_JPQL_UPDATE_REQUEST");
+ public static final MessageReference ERROR_JPQL_DELETE_REQUEST = createMessageReference(
+ ODataJPARuntimeException.class, "ERROR_JPQL_DELETE_REQUEST");
+ public static final MessageReference ERROR_JPQL_KEY_VALUE = createMessageReference(ODataJPARuntimeException.class,
+ "ERROR_JPQL_KEY_VALUE");
+ public static final MessageReference ERROR_JPQL_PARAM_VALUE = createMessageReference(ODataJPARuntimeException.class,
+ "ERROR_JPQL_PARAM_VALUE");
+ public static final MessageReference ERROR_JPQL_UNIQUE_CONSTRAINT = createMessageReference(
+ ODataJPARuntimeException.class, "ERROR_JPQL_UNIQUE_CONSTRAINT");
+ public static final MessageReference ERROR_JPQL_INTEGRITY_CONSTRAINT = createMessageReference(
+ ODataJPARuntimeException.class, "ERROR_JPQL_INTEGRITY_CONSTRAINT");
+ public static final MessageReference RELATIONSHIP_INVALID = createMessageReference(ODataJPARuntimeException.class,
+ "RELATIONSHIP_INVALID");
+ public static final MessageReference RESOURCE_X_NOT_FOUND = createMessageReference(ODataJPARuntimeException.class,
+ "RESOURCE_X_NOT_FOUND");
private ODataJPARuntimeException(final String localizedMessage, final Throwable e, final MessageReference msgRef) {
super(localizedMessage, e, msgRef);
@@ -60,17 +76,18 @@ public class ODataJPARuntimeException extends ODataJPAException {
* with localized error texts.
*
* @param messageReference
- * is a <b>mandatory</b> parameter referring to a literal that
- * could be translated to localized error texts.
+ * is a <b>mandatory</b> parameter referring to a literal that
+ * could be translated to localized error texts.
* @param e
- * is an optional parameter representing the previous exception
- * in the call stack
+ * is an optional parameter representing the previous exception
+ * in the call stack
* @return an instance of ODataJPARuntimeException which can be then raised.
* @throws ODataJPARuntimeException
*/
public static ODataJPARuntimeException throwException(final MessageReference messageReference, final Throwable e) {
ODataJPAMessageService messageService;
- messageService = ODataJPAFactory.createFactory().getODataJPAAccessFactory().getODataJPAMessageService(DEFAULT_LOCALE);
+ messageService =
+ ODataJPAFactory.createFactory().getODataJPAAccessFactory().getODataJPAMessageService(DEFAULT_LOCALE);
String message = messageService.getLocalizedMessage(messageReference, e);
return new ODataJPARuntimeException(message, e, messageReference);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java
index 68c149b..5059bb4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
/**
* <h3>OData JPA Processor API Library - Exceptions</h3>
@@ -22,10 +22,10 @@
* <ol><li>Model Exception</li>
* <li>Runtime Exception</li></ol>
* <br>
- * The Model Exception is thrown while processing JPA metamodels and
+ * The Model Exception is thrown while processing JPA metamodels and
* runtime exception is thrown while processing persistence data.
*
- *
+ *
*/
package org.apache.olingo.odata2.processor.api.jpa.exception;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
index bfe73a5..02268de 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.factory;
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView;
* <li>JPA Processor</li>
* </ol>
*
- *
+ *
*
*/
public interface JPAAccessFactory {
@@ -40,10 +40,8 @@ public interface JPAAccessFactory {
* EDM models from Java persistence models.
*
* @param oDataJPAContext
- * a non null instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView}
+ * a non null instance of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView}
*/
public JPAEdmModelView getJPAEdmModelView(ODataJPAContext oDataJPAContext);
@@ -53,10 +51,8 @@ public interface JPAAccessFactory {
* processing JPQL statements.
*
* @param oDataJPAContext
- * a non null instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAProcessor}
+ * a non null instance of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAProcessor}
*/
public JPAProcessor getJPAProcessor(ODataJPAContext oDataJPAContext);
@@ -66,10 +62,8 @@ public interface JPAAccessFactory {
* the mapping details maintained for an OData service
*
* @param oDataJPAContext
- * a non null instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAccess}
+ * a non null instance of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAccess}
*/
public JPAEdmMappingModelAccess getJPAEdmMappingModelAccess(ODataJPAContext oDataJPAContext);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
index ea9378f..52d45ab 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.factory;
@@ -30,15 +30,13 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStateme
* <p>
* <ul>
* <li>JPQL statement builders of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder}
- * </li>
+ * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder} </li>
* <li>JPQL context builder of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
- * </li>
+ * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder} </li>
* </ul>
* </p>
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
*/
public interface JPQLBuilderFactory {
@@ -46,10 +44,9 @@ public interface JPQLBuilderFactory {
* The method returns JPQL statement builder for building JPQL statements.
*
* @param context
- * is
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext}
- * that determines the type of JPQL statement builder. The
- * parameter cannot be null.
+ * is {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext} that determines the type of JPQL statement
+ * builder. The
+ * parameter cannot be null.
* @return an instance of JPQLStatementBuilder
*/
public JPQLStatementBuilder getStatementBuilder(JPQLContextView context);
@@ -59,10 +56,9 @@ public interface JPQLBuilderFactory {
* object.
*
* @param contextType
- * is
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
- * that determines the type of JPQL context builder. The
- * parameter cannot be null.
+ * is {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} that determines the type of JPQL context
+ * builder. The
+ * parameter cannot be null.
* @return an instance of JPQLContextBuilder
*/
public JPQLContextBuilder getContextBuilder(JPQLContextType contextType);
@@ -72,10 +68,9 @@ public interface JPQLBuilderFactory {
* context object.
*
* @param contextType
- * is
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
- * that determines the type of JPQL context builder. The
- * parameter cannot be null.
+ * is {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} that determines the type of JPQL context
+ * builder. The
+ * parameter cannot be null.
* @return an instance of JPAMethodContextBuilder
*/
public JPAMethodContextBuilder getJPAMethodContextBuilder(JPQLContextType contextType);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
index c0cf390..3d8073e 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.factory;
@@ -30,16 +30,13 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAMessageServi
*
* <p>
* <ul>
- * <li>OData JPA Processor of type
- * {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor}</li>
- * <li>JPA EDM Provider of type
- * {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider}</li>
- * <li>OData JPA Context
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}</li>
+ * <li>OData JPA Processor of type {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor}</li>
+ * <li>JPA EDM Provider of type {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider}</li>
+ * <li>OData JPA Context {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}</li>
* </ul>
* </p>
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
*/
public interface ODataJPAAccessFactory {
@@ -48,9 +45,8 @@ public interface ODataJPAAccessFactory {
* behavior of an OData service.
*
* @param oDataJPAContext
- * an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}.
- * The context should be initialized properly and cannot be null.
+ * an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}.
+ * The context should be initialized properly and cannot be null.
* @return An implementation of OData JPA Processor.
*/
public ODataSingleProcessor createODataProcessor(ODataJPAContext oDataJPAContext);
@@ -58,11 +54,10 @@ public interface ODataJPAAccessFactory {
/**
*
* @param oDataJPAContext
- * an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}.
- * The context should be initialized properly and cannot be null.
+ * an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}.
+ * The context should be initialized properly and cannot be null.
* @return An implementation of JPA EdmProvider. EdmProvider handles
- * meta-data.
+ * meta-data.
*/
public EdmProvider createJPAEdmProvider(ODataJPAContext oDataJPAContext);
@@ -70,8 +65,7 @@ public interface ODataJPAAccessFactory {
* The method creates an instance of OData JPA Context. An empty instance is
* returned.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
*/
public ODataJPAContext createODataJPAContext();
@@ -80,10 +74,9 @@ public interface ODataJPAAccessFactory {
* dependent message text.
*
* @param locale
- * is the language in which the message service should load
- * message texts.
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAMessageService}
+ * is the language in which the message service should load
+ * message texts.
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAMessageService}
*/
public ODataJPAMessageService getODataJPAMessageService(Locale locale);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java
index 6888ec8..b421ce4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.factory;
@@ -32,14 +32,15 @@ package org.apache.olingo.odata2.processor.api.jpa.factory;
* factory implementation.
* <p>
*
- *
+ *
*
*
*
*/
public abstract class ODataJPAFactory {
- private static final String IMPLEMENTATION = "org.apache.olingo.odata2.processor.core.jpa.factory.ODataJPAFactoryImpl";
+ private static final String IMPLEMENTATION =
+ "org.apache.olingo.odata2.processor.core.jpa.factory.ODataJPAFactoryImpl";
private static ODataJPAFactory factoryImpl;
/**
@@ -47,9 +48,7 @@ public abstract class ODataJPAFactory {
* The instance of this factory can be used for creating other factory
* implementations.
*
- * @return instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory}
- * .
+ * @return instance of type {@link org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory} .
*/
public static ODataJPAFactory createFactory() {
@@ -75,8 +74,7 @@ public abstract class ODataJPAFactory {
* this method to return an implementation of JPQLBuilderFactory if default
* implementation from library is not required.
*
- * @return instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory}
+ * @return instance of type {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory}
*/
public JPQLBuilderFactory getJPQLBuilderFactory() {
return null;
@@ -87,8 +85,7 @@ public abstract class ODataJPAFactory {
* method to return an implementation of JPAAccessFactory if default
* implementation from library is not required.
*
- * @return instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory}
+ * @return instance of type {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory}
*/
public JPAAccessFactory getJPAAccessFactory() {
return null;
@@ -99,8 +96,7 @@ public abstract class ODataJPAFactory {
* this method to return an implementation of ODataJPAAccessFactory if
* default implementation from library is not required.
*
- * @return instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAAccessFactory}
+ * @return instance of type {@link org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAAccessFactory}
*/
public ODataJPAAccessFactory getODataJPAAccessFactory() {
return null;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java
index 5de70c9..de2b699 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
/**
* <h3>OData JPA Processor API Library - Factory</h3>
@@ -27,7 +27,7 @@
*
* The instances of these factories can be obtained from an abstract ODataJPAFactory.
*
- *
+ *
*/
package org.apache.olingo.odata2.processor.api.jpa.factory;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
index e0f7a55..ab24e67 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
* built can be used for constructing JPQL statements. <br>
* A default implementation is provided by the library.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
* @see org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory
@@ -57,7 +57,7 @@ public abstract class JPQLContext implements JPQLContextView {
* sets JPA Entity Name into the context
*
* @param jpaEntityName
- * is the name of JPA Entity
+ * is the name of JPA Entity
*/
protected final void setJPAEntityName(final String jpaEntityName) {
this.jpaEntityName = jpaEntityName;
@@ -67,7 +67,7 @@ public abstract class JPQLContext implements JPQLContextView {
* sets JPA Entity alias name into the context
*
* @param jpaEntityAlias
- * is the JPA entity alias name
+ * is the JPA entity alias name
*/
protected final void setJPAEntityAlias(final String jpaEntityAlias) {
this.jpaEntityAlias = jpaEntityAlias;
@@ -85,7 +85,7 @@ public abstract class JPQLContext implements JPQLContextView {
* sets the JPQL context type into the context
*
* @param type
- * is JPQLContextType
+ * is JPQLContextType
*/
protected final void setType(final JPQLContextType type) {
this.type = type;
@@ -109,19 +109,19 @@ public abstract class JPQLContext implements JPQLContextView {
/**
* the method returns an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
- * based on the JPQLContextType. The context builder can be used for
+ * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder} based on the
+ * JPQLContextType. The context builder can be used for
* building different JPQL contexts.
*
* @param contextType
- * is the JPQLContextType
+ * is the JPQLContextType
* @param resultsView
- * is the OData request view
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
+ * is the OData request view
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
* @throws ODataJPARuntimeException
*/
- public final static JPQLContextBuilder createBuilder(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
+ public final static JPQLContextBuilder createBuilder(final JPQLContextType contextType, final Object resultsView)
+ throws ODataJPARuntimeException {
return JPQLContextBuilder.create(contextType, resultsView);
}
@@ -129,7 +129,7 @@ public abstract class JPQLContext implements JPQLContextView {
* The abstract class is extended by specific JPQLContext builder for
* building JPQLContexts.
*
- *
+ *
*
*/
public static abstract class JPQLContextBuilder {
@@ -146,15 +146,17 @@ public abstract class JPQLContext implements JPQLContextView {
* the method instantiates an instance of type JPQLContextBuilder.
*
* @param contextType
- * indicates the type of JPQLContextBuilder to instantiate.
+ * indicates the type of JPQLContextBuilder to instantiate.
* @param resultsView
- * is the OData request view
+ * is the OData request view
* @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
+ * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
* @throws ODataJPARuntimeException
*/
- private static JPQLContextBuilder create(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
- JPQLContextBuilder contextBuilder = ODataJPAFactory.createFactory().getJPQLBuilderFactory().getContextBuilder(contextType);
+ private static JPQLContextBuilder create(final JPQLContextType contextType, final Object resultsView)
+ throws ODataJPARuntimeException {
+ JPQLContextBuilder contextBuilder =
+ ODataJPAFactory.createFactory().getJPQLBuilderFactory().getContextBuilder(contextType);
if (contextBuilder == null) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQLCTXBLDR_CREATE, null);
}
@@ -167,8 +169,7 @@ public abstract class JPQLContext implements JPQLContextView {
* to build JPQL Contexts. The build method makes use of information set
* into the context to built JPQL Context Types.
*
- * @return an instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext}
+ * @return an instance of {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext}
* @throws ODataJPAModelException
* @throws ODataJPARuntimeException
*/
@@ -179,7 +180,7 @@ public abstract class JPQLContext implements JPQLContextView {
* The method sets the OData request view into the JPQL context.
*
* @param resultsView
- * is an instance representing OData request.
+ * is an instance representing OData request.
*/
protected abstract void setResultsView(Object resultsView);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
index d1a0590..17df83a 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
@@ -1,27 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
/**
* Enumerated list of JPQL context Types.
*
- *
+ *
*
*/
public enum JPQLContextType {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
index 1cd0071..d1ac24f 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.processor.api.jpa.jpql;
* The interface provides a view on JPQL Context. The view can be used to access
* different JPQL context type implementations.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
*/
@@ -47,8 +47,7 @@ public interface JPQLContextView {
/**
* The method returns a JPQL context type
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
*/
public JPQLContextType getType();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
index 176b093..4392015 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
* clauses to the Select statement. The JPQL Join context view is built from
* OData read entity set with navigation request.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectContextView
*
*/
@@ -38,8 +38,7 @@ public interface JPQLJoinContextView extends JPQLSelectContextView {
* The method returns a list of JPA Join Clauses. The returned list of
* values can be used for building JPQL Statements with Join clauses.
*
- * @return a list of
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
+ * @return a list of {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
*/
public List<JPAJoinClause> getJPAJoinClauses();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
index 1799772..7d71dc3 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
* any WHERE,ORDERBY clauses. The clauses are built from OData read entity
* request views.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectSingleContextView
*
*/
@@ -39,8 +39,7 @@ public interface JPQLJoinSelectSingleContextView extends JPQLSelectSingleContext
* The method returns a list of JPA Join Clauses. The returned list of
* values can be used for building JPQL Statements with Join clauses.
*
- * @return a list of
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
+ * @return a list of {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
*/
public abstract List<JPAJoinClause> getJPAJoinClauses();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
index 729a095..58f595e 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
@@ -26,7 +26,7 @@ import java.util.HashMap;
* "ORDERBY", "WHERE". The clauses are built from OData read entity set request
* views. The clauses thus built can be used for building JPQL Statements.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
index 9222943..5e492be 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.KeyPredicate;
* WHERE,JOIN,ORDERBY clauses. The clauses are built from OData read entity
* request views.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
index 6ac545b..e68b4d4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
@@ -22,15 +22,14 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
/**
- * The class represents a Java Persistence Query Language (JPQL) Statement.
- * The JPQL statement is built using a builder namely
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder}
- * . Based upon the JPQL Context types (
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} different
- * kinds of JPQL statements are built.
+ * The class represents a Java Persistence Query Language (JPQL) Statement.
+ * The JPQL statement is built using a builder namely
+ * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder} . Based upon the JPQL
+ * Context types ( {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} different
+ * kinds of JPQL statements are built.
* The JPQL statements thus generated can be executed using JPA Query APIs to fetch JPA entities.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView
*/
@@ -44,10 +43,9 @@ public class JPQLStatement {
* upon the JPQL Context.
*
* @param context
- * a non null value of
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView}
- * . The context is expected to be set to be built with no
- * errors.
+ * a non null value of {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView} . The context is
+ * expected to be set to be built with no
+ * errors.
* @return an instance of JPQL statement builder
* @throws ODataJPARuntimeException
*/
@@ -80,7 +78,7 @@ public class JPQLStatement {
* A default statement builder for building each kind of JPQL statements is
* provided by the library.
*
- *
+ *
*
*/
public static abstract class JPQLStatementBuilder {
@@ -99,10 +97,9 @@ public class JPQLStatement {
* The abstract method is implemented by specific statement builder for
* building JPQL Statement.
*
- * @return an instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement}
+ * @return an instance of {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement}
* @throws ODataJPARuntimeException
- * in case there are errors building the statements
+ * in case there are errors building the statements
*/
public abstract JPQLStatement build() throws ODataJPARuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
index e385c23..dc02b90 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
@@ -1,27 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
/**
* <h3>OData JPA Processor API Library - Java Persistence Query Language</h3>
* The library provides set of APIs for building JPQL contexts from OData Requests.
* The JPQL contexts thus built can be used for building JPQL Statements.
*
- *
+ *
*/
package org.apache.olingo.odata2.processor.api.jpa.jpql;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
index 7ac6b90..9d3238d 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -40,18 +40,16 @@ public interface JPAEdmAssociationEndView extends JPAEdmBaseView {
/**
* The method gets the one of the association ends present in the container.
*
- * @return one of the
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
- * {@link org.apache.olingo.odata2.api.edm.provider.Association}
+ * @return one of the {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
+ * {@link org.apache.olingo.odata2.api.edm.provider.Association}
*/
AssociationEnd getEdmAssociationEnd2();
/**
* The method gets the other association end present in the container.
*
- * @return one of the
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
- * {@link org.apache.olingo.odata2.api.edm.provider.Association}
+ * @return one of the {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
+ * {@link org.apache.olingo.odata2.api.edm.provider.Association}
*/
AssociationEnd getEdmAssociationEnd1();
@@ -68,20 +66,17 @@ public interface JPAEdmAssociationEndView extends JPAEdmBaseView {
* </i>
*
* @param end1
- * one end of type
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
- * an {@link org.apache.olingo.odata2.api.edm.provider.Association}
+ * one end of type {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
+ * an {@link org.apache.olingo.odata2.api.edm.provider.Association}
* @param end2
- * other end of type
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
- * an {@link org.apache.olingo.odata2.api.edm.provider.Association}
- * <p>
+ * other end of type {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
+ * an {@link org.apache.olingo.odata2.api.edm.provider.Association} <p>
* @return <ul>
- * <li><i>true</i> - Only if the properties of <b>end1</b> matches
- * with all the properties of any one end and only if the properties
- * of <b>end2</b> matches with all the properties of the remaining
- * end</li> <li><i>false</i> - Otherwise</li>
- * </ul>
+ * <li><i>true</i> - Only if the properties of <b>end1</b> matches
+ * with all the properties of any one end and only if the properties
+ * of <b>end2</b> matches with all the properties of the remaining
+ * end</li> <li><i>false</i> - Otherwise</li>
+ * </ul>
*/
boolean compare(AssociationEnd end1, AssociationEnd end2);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
index 832480c..911569d 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -34,8 +34,8 @@ import org.apache.olingo.odata2.api.edm.provider.AssociationSet;
* container for list of association sets that are consistent.
* </p>
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
index 678115a..7cc7cda 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -40,8 +40,8 @@ import org.apache.olingo.odata2.api.edm.provider.Association;
* </ol>
* </p>
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView
@@ -61,36 +61,32 @@ public interface JPAEdmAssociationView extends JPAEdmBaseView {
* set to be consistent only if all its mandatory properties can be
* completely built from a Java Persistence Relationship.
*
- * @return a consistent list of
- * {@link org.apache.olingo.odata2.api.edm.provider.Association}
+ * @return a consistent list of {@link org.apache.olingo.odata2.api.edm.provider.Association}
*
*/
public List<Association> getConsistentEdmAssociationList();
/**
- * The method adds
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
- * to its container
+ * The method adds {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView} to its container
*
* @param associationView
- * of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+ * of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
*/
- public void addJPAEdmAssociationView(JPAEdmAssociationView associationView, JPAEdmAssociationEndView associationEndView);
+ public void addJPAEdmAssociationView(JPAEdmAssociationView associationView,
+ JPAEdmAssociationEndView associationEndView);
/**
* The method searches for an Association in its container against the
- * search parameter <b>view</b> of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}.
+ * search parameter <b>view</b> of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+ * .
*
* The Association in the container <b>view</b> is searched against the
* consistent list of Association stored in this container.
*
* @param view
- * of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+ * of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
* @return {@link org.apache.olingo.odata2.api.edm.provider.Association} if found
- * in the container
+ * in the container
*/
public Association searchAssociation(JPAEdmAssociationEndView view);
@@ -101,8 +97,7 @@ public interface JPAEdmAssociationView extends JPAEdmBaseView {
* </p>
*
* @param refView
- * of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
+ * of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
*/
public void addJPAEdmRefConstraintView(JPAEdmReferentialConstraintView refView);
@@ -111,23 +106,22 @@ public interface JPAEdmAssociationView extends JPAEdmBaseView {
* being processed.
*
* @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
+ * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
*/
public JPAEdmReferentialConstraintView getJPAEdmReferentialConstraintView();
/**
* The method searches for the number of associations with similar endpoints in its container against the
- * search parameter <b>view</b> of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}.
+ * search parameter <b>view</b> of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+ * .
*
* The Association in the container <b>view</b> is searched against the
* consistent list of Association stored in this container.
*
* @param view
- * of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+ * of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
* @return {@link org.apache.olingo.odata2.api.edm.provider.Association} if found
- * in the container
+ * in the container
*/
int getNumberOfAssociationsWithSimilarEndPoints(JPAEdmAssociationEndView view);
[32/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityComplexPropertyInfo.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityComplexPropertyInfo.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityComplexPropertyInfo.java
index 5a4303f..01d78da 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityComplexPropertyInfo.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityComplexPropertyInfo.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.aggregator;
@@ -36,12 +36,14 @@ public class EntityComplexPropertyInfo extends EntityPropertyInfo {
protected List<EntityPropertyInfo> entityPropertyInfo;
- EntityComplexPropertyInfo(final String name, final EdmType type, final EdmFacets facets, final EdmCustomizableFeedMappings customizableFeedMapping, final List<EntityPropertyInfo> childEntityInfos) {
+ EntityComplexPropertyInfo(final String name, final EdmType type, final EdmFacets facets,
+ final EdmCustomizableFeedMappings customizableFeedMapping, final List<EntityPropertyInfo> childEntityInfos) {
super(name, type, facets, customizableFeedMapping, null, null);
entityPropertyInfo = childEntityInfos;
}
- static EntityComplexPropertyInfo create(final EdmProperty property, final List<String> propertyNames, final Map<String, EntityPropertyInfo> childEntityInfos) throws EdmException {
+ static EntityComplexPropertyInfo create(final EdmProperty property, final List<String> propertyNames,
+ final Map<String, EntityPropertyInfo> childEntityInfos) throws EdmException {
List<EntityPropertyInfo> childEntityInfoList = new ArrayList<EntityPropertyInfo>(childEntityInfos.size());
for (String name : propertyNames) {
childEntityInfoList.add(childEntityInfos.get(name));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java
index 566faba..9345c7e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.aggregator;
@@ -46,9 +46,10 @@ import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
/**
- * Aggregator to get easy and fast access to all for serialization and de-serialization necessary {@link EdmEntitySet} informations.
+ * Aggregator to get easy and fast access to all for serialization and de-serialization necessary {@link EdmEntitySet}
+ * informations.
+ *
*
- *
*/
public class EntityInfoAggregator {
@@ -100,15 +101,16 @@ public class EntityInfoAggregator {
* Create an {@link EntityInfoAggregator} based on given {@link EdmEntitySet}
*
* @param entitySet
- * with which the {@link EntityInfoAggregator} is initialized.
- * @param expandSelectTree
+ * with which the {@link EntityInfoAggregator} is initialized.
+ * @param expandSelectTree
* @return created and initialized {@link EntityInfoAggregator}
* @throws EntityProviderException
- * if during initialization of {@link EntityInfoAggregator} something goes wrong (e.g. exceptions during
- * access
- * of {@link EdmEntitySet}).
+ * if during initialization of {@link EntityInfoAggregator} something goes wrong (e.g. exceptions during
+ * access
+ * of {@link EdmEntitySet}).
*/
- public static EntityInfoAggregator create(final EdmEntitySet entitySet, final ExpandSelectTreeNode expandSelectTree) throws EntityProviderException {
+ public static EntityInfoAggregator create(final EdmEntitySet entitySet, final ExpandSelectTreeNode expandSelectTree)
+ throws EntityProviderException {
EntityInfoAggregator eia = new EntityInfoAggregator();
eia.initialize(entitySet, expandSelectTree);
return eia;
@@ -118,12 +120,12 @@ public class EntityInfoAggregator {
* Create an {@link EntityInfoAggregator} based on given {@link EdmEntitySet}
*
* @param entitySet
- * with which the {@link EntityInfoAggregator} is initialized.
+ * with which the {@link EntityInfoAggregator} is initialized.
* @return created and initialized {@link EntityInfoAggregator}
* @throws EntityProviderException
- * if during initialization of {@link EntityInfoAggregator} something goes wrong (e.g. exceptions during
- * access
- * of {@link EdmEntitySet}).
+ * if during initialization of {@link EntityInfoAggregator} something goes wrong (e.g. exceptions during
+ * access
+ * of {@link EdmEntitySet}).
*/
public static EntityInfoAggregator create(final EdmEntitySet entitySet) throws EntityProviderException {
EntityInfoAggregator eia = new EntityInfoAggregator();
@@ -135,11 +137,11 @@ public class EntityInfoAggregator {
* Create an {@link EntityPropertyInfo} based on given {@link EdmProperty}
*
* @param property
- * for which the {@link EntityPropertyInfo} is created.
+ * for which the {@link EntityPropertyInfo} is created.
* @return created {@link EntityPropertyInfo}
* @throws EntityProviderException
- * if create of {@link EntityPropertyInfo} something goes wrong (e.g. exceptions during
- * access of {@link EdmProperty}).
+ * if create of {@link EntityPropertyInfo} something goes wrong (e.g. exceptions during
+ * access of {@link EdmProperty}).
*/
public static EntityPropertyInfo create(final EdmProperty property) throws EntityProviderException {
try {
@@ -151,16 +153,18 @@ public class EntityInfoAggregator {
}
/**
- * Create an map of <code>complex type property name</code> to {@link EntityPropertyInfo} based on given {@link EdmComplexType}
+ * Create an map of <code>complex type property name</code> to {@link EntityPropertyInfo} based on given
+ * {@link EdmComplexType}
*
* @param complexType
- * for which the {@link EntityPropertyInfo} is created.
+ * for which the {@link EntityPropertyInfo} is created.
* @return created map of <code>complex type property name</code> to {@link EntityPropertyInfo}
* @throws EntityProviderException
- * if create of {@link EntityPropertyInfo} something goes wrong (e.g. exceptions during
- * access of {@link EntityPropertyInfo}).
+ * if create of {@link EntityPropertyInfo} something goes wrong (e.g. exceptions during
+ * access of {@link EntityPropertyInfo}).
*/
- public static Map<String, EntityPropertyInfo> create(final EdmComplexType complexType) throws EntityProviderException {
+ public static Map<String, EntityPropertyInfo> create(final EdmComplexType complexType)
+ throws EntityProviderException {
try {
EntityInfoAggregator entityInfo = new EntityInfoAggregator();
return entityInfo.createPropertyInfoObjects(complexType, complexType.getPropertyNames());
@@ -173,11 +177,11 @@ public class EntityInfoAggregator {
* Create an {@link EntityPropertyInfo} based on given {@link EdmFunctionImport}
*
* @param functionImport
- * for which the {@link EntityPropertyInfo} is created.
+ * for which the {@link EntityPropertyInfo} is created.
* @return created {@link EntityPropertyInfo}
* @throws EntityProviderException
- * if create of {@link EntityPropertyInfo} something goes wrong (e.g. exceptions during
- * access of {@link EdmFunctionImport}).
+ * if create of {@link EntityPropertyInfo} something goes wrong (e.g. exceptions during
+ * access of {@link EdmFunctionImport}).
*/
public static EntityPropertyInfo create(final EdmFunctionImport functionImport) throws EntityProviderException {
try {
@@ -204,7 +208,7 @@ public class EntityInfoAggregator {
/**
* @return <code>true</code> if the entity container of {@link EdmEntitySet} is the default container,
- * otherwise <code>false</code>.
+ * otherwise <code>false</code>.
*/
public boolean isDefaultEntityContainer() {
return isDefaultEntityContainer;
@@ -231,7 +235,7 @@ public class EntityInfoAggregator {
/**
* @return unmodifiable set of found <code>none syndication target path names</code> (all target path names which are
- * not pre-defined).
+ * not pre-defined).
*/
public List<String> getNoneSyndicationTargetPathNames() {
return Collections.unmodifiableList(noneSyndicationTargetPaths);
@@ -246,7 +250,7 @@ public class EntityInfoAggregator {
/**
* @return unmodifiable set of all property names.
- */
+ */
public List<String> getPropertyNames() throws EntityProviderException {
return Collections.unmodifiableList(propertyNames);
}
@@ -284,7 +288,7 @@ public class EntityInfoAggregator {
/**
* @return list of all key property infos
- * @throws EntityProviderException
+ * @throws EntityProviderException
*/
public List<EntityPropertyInfo> getKeyPropertyInfos() throws EntityProviderException {
@@ -305,7 +309,8 @@ public class EntityInfoAggregator {
return navigationPropertyInfos.get(name);
}
- private void initialize(final EdmEntitySet entitySet, final ExpandSelectTreeNode expandSelectTree) throws EntityProviderException {
+ private void initialize(final EdmEntitySet entitySet, final ExpandSelectTreeNode expandSelectTree)
+ throws EntityProviderException {
try {
this.entitySet = entitySet;
entityType = entitySet.getEntityType();
@@ -348,7 +353,8 @@ public class EntityInfoAggregator {
}
}
- private Map<String, EntityPropertyInfo> createPropertyInfoObjects(final EdmStructuralType type, final List<String> propertyNames) throws EntityProviderException {
+ private Map<String, EntityPropertyInfo> createPropertyInfoObjects(final EdmStructuralType type,
+ final List<String> propertyNames) throws EntityProviderException {
try {
Map<String, EntityPropertyInfo> infos = new HashMap<String, EntityPropertyInfo>();
@@ -368,7 +374,8 @@ public class EntityInfoAggregator {
}
}
- private Map<String, NavigationPropertyInfo> createNavigationInfoObjects(final EdmStructuralType type, final List<String> propertyNames) throws EntityProviderException {
+ private Map<String, NavigationPropertyInfo> createNavigationInfoObjects(final EdmStructuralType type,
+ final List<String> propertyNames) throws EntityProviderException {
try {
Map<String, NavigationPropertyInfo> infos = new HashMap<String, NavigationPropertyInfo>();
@@ -384,7 +391,8 @@ public class EntityInfoAggregator {
}
}
- private EntityPropertyInfo createEntityPropertyInfo(final EdmProperty property) throws EdmException, EntityProviderException {
+ private EntityPropertyInfo createEntityPropertyInfo(final EdmProperty property) throws EdmException,
+ EntityProviderException {
EdmType type = property.getType();
if (type instanceof EdmSimpleType) {
return EntityPropertyInfo.create(property);
@@ -397,7 +405,8 @@ public class EntityInfoAggregator {
}
}
- private EntityPropertyInfo createEntityPropertyInfo(final EdmFunctionImport functionImport, final EdmType type) throws EdmException, EntityProviderException {
+ private EntityPropertyInfo createEntityPropertyInfo(final EdmFunctionImport functionImport, final EdmType type)
+ throws EdmException, EntityProviderException {
EntityPropertyInfo epi;
if (type.getKind() == EdmTypeKind.COMPLEX) {
@@ -430,7 +439,8 @@ public class EntityInfoAggregator {
}
}
- private void checkTargetPathInfo(final EdmProperty property, final EntityPropertyInfo propertyInfo) throws EntityProviderException {
+ private void checkTargetPathInfo(final EdmProperty property, final EntityPropertyInfo propertyInfo)
+ throws EntityProviderException {
try {
EdmCustomizableFeedMappings customizableFeedMappings = property.getCustomizableFeedMappings();
if (customizableFeedMappings != null) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java
index 83ab4df..931034e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.aggregator;
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.EdmType;
/**
* Collects informations about a property of an entity.
- *
+ *
*/
public class EntityPropertyInfo {
private final String name;
@@ -37,7 +37,8 @@ public class EntityPropertyInfo {
private final String mimeType;
private final EdmMapping mapping;
- EntityPropertyInfo(final String name, final EdmType type, final EdmFacets facets, final EdmCustomizableFeedMappings customizableFeedMapping, final String mimeType, final EdmMapping mapping) {
+ EntityPropertyInfo(final String name, final EdmType type, final EdmFacets facets,
+ final EdmCustomizableFeedMappings customizableFeedMapping, final String mimeType, final EdmMapping mapping) {
this.name = name;
this.type = type;
this.facets = facets;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java
index 6aa8fde..c45657e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.aggregator;
@@ -61,7 +61,8 @@ public class EntityTypeMapping {
}
@SuppressWarnings("unchecked")
- public static EntityTypeMapping create(final String name, final Map<String, Object> mappings) throws EntityProviderException {
+ public static EntityTypeMapping create(final String name, final Map<String, Object> mappings)
+ throws EntityProviderException {
if (mappings == null) {
return ENTITY_TYPE_MAPPING;
}
@@ -89,8 +90,7 @@ public class EntityTypeMapping {
/**
* If this {@link EntityTypeMapping} is complex the mapping for the property
- * with the given <code>name</code> is returned; otherwise an empty
- * {@link EntityTypeMapping} is returned.
+ * with the given <code>name</code> is returned; otherwise an empty {@link EntityTypeMapping} is returned.
* @param name
* @return the mapping for this entity type
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/NavigationPropertyInfo.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/NavigationPropertyInfo.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/NavigationPropertyInfo.java
index 7918a69..1322115 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/NavigationPropertyInfo.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/NavigationPropertyInfo.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.aggregator;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
index 716c4bb..fb0a41c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -62,7 +62,8 @@ public class AtomServiceDocumentConsumer {
CommonAttributesImpl attributes = new CommonAttributesImpl();
try {
while (reader.hasNext()
- && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_SERVICE.equals(reader.getLocalName()))) {
+ && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_SERVICE
+ .equals(reader.getLocalName()))) {
reader.next();
if (reader.isStartElement()) {
currentHandledStartTagName = reader.getLocalName();
@@ -79,7 +80,8 @@ public class AtomServiceDocumentConsumer {
}
}
if (workspaces.isEmpty()) {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent("Service element must contain at least one workspace element"));
+ throw new EntityProviderException(EntityProviderException.INVALID_STATE
+ .addContent("Service element must contain at least one workspace element"));
}
reader.close();
atomInfo.setWorkspaces(workspaces).setCommonAttributes(attributes).setExtesionElements(extElements);
@@ -88,7 +90,8 @@ public class AtomServiceDocumentConsumer {
serviceDocument.setEntitySetsInfo(atomInfo.getEntitySetsInfo());
return serviceDocument;
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -98,9 +101,12 @@ public class AtomServiceDocumentConsumer {
attribute.setBase(reader.getAttributeValue(null, FormatXml.XML_BASE));
attribute.setLang(reader.getAttributeValue(null, FormatXml.XML_LANG));
for (int i = 0; i < reader.getAttributeCount(); i++) {
- if (!(FormatXml.XML_BASE.equals(reader.getAttributeLocalName(i)) && Edm.PREFIX_XML.equals(reader.getAttributePrefix(i))
- || (FormatXml.XML_LANG.equals(reader.getAttributeLocalName(i)) && Edm.PREFIX_XML.equals(reader.getAttributePrefix(i)))
- || ("local".equals(reader.getAttributeNamespace(i)) || DEFAULT_PREFIX.equals(reader.getAttributePrefix(i))))) {
+ if (!(FormatXml.XML_BASE.equals(reader.getAttributeLocalName(i))
+ && Edm.PREFIX_XML.equals(reader.getAttributePrefix(i))
+ || (FormatXml.XML_LANG.equals(reader.getAttributeLocalName(i)) && Edm.PREFIX_XML.equals(reader
+ .getAttributePrefix(i)))
+ || ("local".equals(reader.getAttributeNamespace(i)) || DEFAULT_PREFIX.equals(reader.getAttributePrefix(i)))))
+ {
extAttributes.add(new ExtensionAttributeImpl()
.setName(reader.getAttributeLocalName(i))
.setNamespace(reader.getAttributeNamespace(i))
@@ -112,14 +118,17 @@ public class AtomServiceDocumentConsumer {
return attribute.setAttributes(extAttributes);
}
- private WorkspaceImpl parseWorkspace(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ private WorkspaceImpl parseWorkspace(final XMLStreamReader reader)
+ throws XMLStreamException, EntityProviderException {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_WORKSPACE);
TitleImpl title = null;
List<Collection> collections = new ArrayList<Collection>();
List<ExtensionElement> extElements = new ArrayList<ExtensionElement>();
CommonAttributesImpl attributes = parseCommonAttribute(reader);
- while (reader.hasNext() && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_WORKSPACE.equals(reader.getLocalName()))) {
+ while (reader.hasNext()
+ && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_WORKSPACE
+ .equals(reader.getLocalName()))) {
reader.next();
if (reader.isStartElement()) {
currentHandledStartTagName = reader.getLocalName();
@@ -133,12 +142,15 @@ public class AtomServiceDocumentConsumer {
}
}
if (title == null) {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent("Missing element title for workspace"));
+ throw new EntityProviderException(EntityProviderException.INVALID_STATE
+ .addContent("Missing element title for workspace"));
}
- return new WorkspaceImpl().setTitle(title).setCollections(collections).setAttributes(attributes).setExtesionElements(extElements);
+ return new WorkspaceImpl().setTitle(title).setCollections(collections).setAttributes(attributes)
+ .setExtesionElements(extElements);
}
- private CollectionImpl parseCollection(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ private CollectionImpl parseCollection(final XMLStreamReader reader) throws XMLStreamException,
+ EntityProviderException {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_COLLECTION);
TitleImpl title = null;
String resourceIdentifier = reader.getAttributeValue(null, FormatXml.ATOM_HREF);
@@ -149,7 +161,9 @@ public class AtomServiceDocumentConsumer {
if (resourceIdentifier == null) {
throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent("href"));
}
- while (reader.hasNext() && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_COLLECTION.equals(reader.getLocalName()))) {
+ while (reader.hasNext()
+ && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())
+ && FormatXml.APP_COLLECTION.equals(reader.getLocalName()))) {
reader.next();
if (reader.isStartElement()) {
currentHandledStartTagName = reader.getLocalName();
@@ -164,13 +178,16 @@ public class AtomServiceDocumentConsumer {
}
}
}
- return new CollectionImpl().setHref(resourceIdentifier).setTitle(title).setCommonAttributes(attributes).setExtesionElements(extElements).setAcceptElements(acceptList).setCategories(categories);
+ return new CollectionImpl().setHref(resourceIdentifier).setTitle(title).setCommonAttributes(attributes)
+ .setExtesionElements(extElements).setAcceptElements(acceptList).setCategories(categories);
}
private TitleImpl parseTitle(final XMLStreamReader reader) throws XMLStreamException {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_TITLE);
String text = "";
- while (reader.hasNext() && !(reader.isEndElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI()) && FormatXml.ATOM_TITLE.equals(reader.getLocalName()))) {
+ while (reader.hasNext()
+ && !(reader.isEndElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI()) && FormatXml.ATOM_TITLE
+ .equals(reader.getLocalName()))) {
if (reader.isCharacters()) {
text += reader.getText();
}
@@ -183,7 +200,9 @@ public class AtomServiceDocumentConsumer {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_ACCEPT);
CommonAttributesImpl commonAttributes = parseCommonAttribute(reader);
String text = "";
- while (reader.hasNext() && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_ACCEPT.equals(reader.getLocalName()))) {
+ while (reader.hasNext()
+ && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_ACCEPT
+ .equals(reader.getLocalName()))) {
if (reader.isCharacters()) {
text += reader.getText();
}
@@ -192,7 +211,8 @@ public class AtomServiceDocumentConsumer {
return new AcceptImpl().setCommonAttributes(commonAttributes).setText(text);
}
- private CategoriesImpl parseCategories(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ private CategoriesImpl parseCategories(final XMLStreamReader reader) throws XMLStreamException,
+ EntityProviderException {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_CATEGORIES);
CategoriesImpl categories = new CategoriesImpl();
String href = reader.getAttributeValue(null, FormatXml.ATOM_HREF);
@@ -209,7 +229,9 @@ public class AtomServiceDocumentConsumer {
categories.setFixed(Fixed.NO);
}
List<Category> categoriesList = new ArrayList<Category>();
- while (reader.hasNext() && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_CATEGORIES.equals(reader.getLocalName()))) {
+ while (reader.hasNext()
+ && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())
+ && FormatXml.APP_CATEGORIES.equals(reader.getLocalName()))) {
reader.next();
if (reader.isStartElement()) {
currentHandledStartTagName = reader.getLocalName();
@@ -222,7 +244,8 @@ public class AtomServiceDocumentConsumer {
}
if ((href != null && fixed != null && categories.getScheme() != null) ||
(href == null && fixed == null && categories.getScheme() == null)) {
- throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent("for the element categories"));
+ throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE
+ .addContent("for the element categories"));
}
return categories;
}
@@ -237,16 +260,19 @@ public class AtomServiceDocumentConsumer {
return category.setCommonAttributes(attributes);
}
- private ExtensionElementImpl parseExtensionSansTitleElement(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ private ExtensionElementImpl parseExtensionSansTitleElement(final XMLStreamReader reader) throws XMLStreamException,
+ EntityProviderException {
ExtensionElementImpl extElement = new ExtensionElementImpl();
if (!(Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())
- || (FormatXml.ATOM_TITLE.equals(reader.getLocalName()) && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())))) {
+ || (FormatXml.ATOM_TITLE.equals(reader.getLocalName())
+ && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())))) {
extElement = parseElement(reader);
}
return extElement;
}
- private ExtensionElementImpl parseExtensionElement(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ private ExtensionElementImpl parseExtensionElement(final XMLStreamReader reader) throws XMLStreamException,
+ EntityProviderException {
ExtensionElementImpl extElement = null;
if (!Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())) {
extElement = parseElement(reader);
@@ -254,11 +280,16 @@ public class AtomServiceDocumentConsumer {
return extElement;
}
- private ExtensionElementImpl parseElement(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ private ExtensionElementImpl parseElement(final XMLStreamReader reader) throws XMLStreamException,
+ EntityProviderException {
List<ExtensionElement> extensionElements = new ArrayList<ExtensionElement>();
- ExtensionElementImpl extElement = new ExtensionElementImpl().setName(reader.getLocalName()).setNamespace(reader.getNamespaceURI()).setPrefix(reader.getPrefix());
+ ExtensionElementImpl extElement =
+ new ExtensionElementImpl().setName(reader.getLocalName()).setNamespace(reader.getNamespaceURI()).setPrefix(
+ reader.getPrefix());
extElement.setAttributes(parseAttribute(reader));
- while (reader.hasNext() && !(reader.isEndElement() && extElement.getName() != null && extElement.getName().equals(reader.getLocalName()))) {
+ while (reader.hasNext()
+ && !(reader.isEndElement() && extElement.getName() != null && extElement.getName()
+ .equals(reader.getLocalName()))) {
reader.next();
if (reader.isCharacters()) {
extElement.setText(reader.getText());
@@ -301,7 +332,8 @@ public class AtomServiceDocumentConsumer {
try {
streamReader = factory.createXMLStreamReader(in);
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return streamReader;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java
index 9114781..6824808 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -43,7 +43,8 @@ public class JsonEntityConsumer {
/** Default used charset for reader */
private static final String DEFAULT_CHARSET = "UTF-8";
- public ODataEntry readEntry(final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataEntry readEntry(final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
JsonReader reader = null;
EntityProviderException cachedException = null;
@@ -53,7 +54,9 @@ public class JsonEntityConsumer {
return new JsonEntryConsumer(reader, eia, properties).readSingleEntry();
} catch (UnsupportedEncodingException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -63,14 +66,16 @@ public class JsonEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
}
}
- public ODataFeed readFeed(final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties readProperties) throws EntityProviderException {
+ public ODataFeed readFeed(final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties readProperties) throws EntityProviderException {
JsonReader reader = null;
EntityProviderException cachedException = null;
@@ -83,7 +88,9 @@ public class JsonEntityConsumer {
return result;
} catch (UnsupportedEncodingException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -93,14 +100,16 @@ public class JsonEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
}
}
- public Map<String, Object> readProperty(final EdmProperty property, final InputStream content, final EntityProviderReadProperties readProperties) throws EntityProviderException {
+ public Map<String, Object> readProperty(final EdmProperty property, final InputStream content,
+ final EntityProviderReadProperties readProperties) throws EntityProviderException {
JsonReader reader = null;
EntityProviderException cachedException = null;
@@ -108,7 +117,9 @@ public class JsonEntityConsumer {
reader = createJsonReader(content);
return new JsonPropertyConsumer().readPropertyStandalone(reader, property, readProperties);
} catch (final UnsupportedEncodingException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -118,7 +129,8 @@ public class JsonEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
@@ -133,7 +145,9 @@ public class JsonEntityConsumer {
reader = createJsonReader(content);
return new JsonLinkConsumer().readLink(reader, entitySet);
} catch (final UnsupportedEncodingException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -143,7 +157,8 @@ public class JsonEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
@@ -158,7 +173,9 @@ public class JsonEntityConsumer {
reader = createJsonReader(content);
return new JsonLinkConsumer().readLinks(reader, entitySet);
} catch (final UnsupportedEncodingException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -168,14 +185,16 @@ public class JsonEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
}
}
- private JsonReader createJsonReader(final Object content) throws EntityProviderException, UnsupportedEncodingException {
+ private JsonReader createJsonReader(final Object content) throws EntityProviderException,
+ UnsupportedEncodingException {
if (content == null) {
throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
index c9129bd..e1fe75f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -63,7 +63,8 @@ public class JsonEntryConsumer {
private final EntityProviderReadProperties readProperties;
private final ODataEntryImpl entryResult;
- public JsonEntryConsumer(final JsonReader reader, final EntityInfoAggregator eia, final EntityProviderReadProperties readProperties) {
+ public JsonEntryConsumer(final JsonReader reader, final EntityInfoAggregator eia,
+ final EntityProviderReadProperties readProperties) {
typeMappings = readProperties.getTypeMappings();
this.eia = eia;
this.readProperties = readProperties;
@@ -86,14 +87,18 @@ public class JsonEntryConsumer {
reader.endObject();
if (reader.peek() != JsonToken.END_DOCUMENT) {
- throw new EntityProviderException(EntityProviderException.END_DOCUMENT_EXPECTED.addContent(reader.peek().toString()));
+ throw new EntityProviderException(EntityProviderException.END_DOCUMENT_EXPECTED.addContent(reader.peek()
+ .toString()));
}
} catch (IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (IllegalStateException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return entryResult;
@@ -152,7 +157,8 @@ public class JsonEntryConsumer {
} else if (FormatJson.TYPE.equals(name)) {
String fullQualifiedName = eia.getEntityType().getNamespace() + Edm.DELIMITER + eia.getEntityType().getName();
if (!fullQualifiedName.equals(value)) {
- throw new EntityProviderException(EntityProviderException.INVALID_ENTITYTYPE.addContent(fullQualifiedName).addContent(value));
+ throw new EntityProviderException(EntityProviderException.INVALID_ENTITYTYPE.addContent(fullQualifiedName)
+ .addContent(value));
}
} else if (FormatJson.ETAG.equals(name)) {
entryMetadata.setEtag(value);
@@ -165,7 +171,8 @@ public class JsonEntryConsumer {
} else if (FormatJson.CONTENT_TYPE.equals(name)) {
mediaMetadata.setContentType(value);
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(name).addContent(FormatJson.METADATA));
+ throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(name).addContent(
+ FormatJson.METADATA));
}
}
@@ -175,12 +182,14 @@ public class JsonEntryConsumer {
private void validateMetadata() throws EdmException, EntityProviderException {
if (eia.getEntityType().hasStream()) {
if (mediaMetadata.getSourceLink() == null) {
- throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent(FormatJson.MEDIA_SRC).addContent(FormatJson.METADATA));
+ throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent(FormatJson.MEDIA_SRC)
+ .addContent(FormatJson.METADATA));
}
if (mediaMetadata.getContentType() == null) {
- throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent(FormatJson.CONTENT_TYPE).addContent(FormatJson.METADATA));
+ throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent(FormatJson.CONTENT_TYPE)
+ .addContent(FormatJson.METADATA));
}
- //TODO Mime Type Mapping
+ // TODO Mime Type Mapping
} else {
if (mediaMetadata.getContentType() != null || mediaMetadata.getEditLink() != null
|| mediaMetadata.getEtag() != null || mediaMetadata.getSourceLink() != null) {
@@ -189,7 +198,8 @@ public class JsonEntryConsumer {
}
}
- private void readNavigationProperty(final String navigationPropertyName) throws IOException, EntityProviderException, EdmException {
+ private void readNavigationProperty(final String navigationPropertyName) throws IOException, EntityProviderException,
+ EdmException {
NavigationPropertyInfo navigationPropertyInfo = eia.getNavigationPropertyInfo(navigationPropertyName);
if (navigationPropertyInfo == null) {
throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent(navigationPropertyName));
@@ -209,14 +219,16 @@ public class JsonEntryConsumer {
}
reader.endObject();
} else {
- EdmNavigationProperty navigationProperty = (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
+ EdmNavigationProperty navigationProperty =
+ (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
EdmEntitySet inlineEntitySet = eia.getEntitySet().getRelatedEntitySet(navigationProperty);
EntityInfoAggregator inlineEia = EntityInfoAggregator.create(inlineEntitySet);
EntityProviderReadProperties inlineReadProperties;
OnReadInlineContent callback = readProperties.getCallback();
try {
if (callback == null) {
- inlineReadProperties = EntityProviderReadProperties.init().mergeSemantic(readProperties.getMergeSemantic()).build();
+ inlineReadProperties =
+ EntityProviderReadProperties.init().mergeSemantic(readProperties.getMergeSemantic()).build();
} else {
inlineReadProperties = callback.receiveReadProperties(readProperties, navigationProperty);
@@ -247,23 +259,27 @@ public class JsonEntryConsumer {
}
} catch (ODataApplicationException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
reader.endObject();
} else {
- final EdmNavigationProperty navigationProperty = (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
+ final EdmNavigationProperty navigationProperty =
+ (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
final EdmEntitySet inlineEntitySet = eia.getEntitySet().getRelatedEntitySet(navigationProperty);
final EntityInfoAggregator inlineInfo = EntityInfoAggregator.create(inlineEntitySet);
OnReadInlineContent callback = readProperties.getCallback();
EntityProviderReadProperties inlineReadProperties;
if (callback == null) {
- inlineReadProperties = EntityProviderReadProperties.init().mergeSemantic(readProperties.getMergeSemantic()).build();
+ inlineReadProperties =
+ EntityProviderReadProperties.init().mergeSemantic(readProperties.getMergeSemantic()).build();
} else {
try {
inlineReadProperties = callback.receiveReadProperties(readProperties, navigationProperty);
} catch (final ODataApplicationException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
ODataFeed feed = new JsonFeedConsumer(reader, inlineInfo, inlineReadProperties).readInlineFeedStandalone();
@@ -276,7 +292,8 @@ public class JsonEntryConsumer {
try {
callback.handleReadFeed(result);
} catch (final ODataApplicationException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
@@ -300,9 +317,9 @@ public class JsonEntryConsumer {
}
private ODataEntry readInlineEntry(final String name) throws EdmException, EntityProviderException, IOException {
- //consume the already started content
+ // consume the already started content
handleName(name);
- //consume the rest of the entry content
+ // consume the rest of the entry content
readEntryContent();
return entryResult;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java
index bcc6631..d0ec1e1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -47,7 +47,8 @@ public class JsonFeedConsumer {
private FeedMetadataImpl feedMetadata = new FeedMetadataImpl();
private boolean resultsArrayPresent = false;
- public JsonFeedConsumer(final JsonReader reader, final EntityInfoAggregator eia, final EntityProviderReadProperties readProperties) {
+ public JsonFeedConsumer(final JsonReader reader, final EntityInfoAggregator eia,
+ final EntityProviderReadProperties readProperties) {
this.reader = reader;
this.eia = eia;
this.readProperties = readProperties;
@@ -59,15 +60,19 @@ public class JsonFeedConsumer {
if (reader.peek() != JsonToken.END_DOCUMENT) {
- throw new EntityProviderException(EntityProviderException.END_DOCUMENT_EXPECTED.addContent(reader.peek().toString()));
+ throw new EntityProviderException(EntityProviderException.END_DOCUMENT_EXPECTED.addContent(reader.peek()
+ .toString()));
}
} catch (IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (IllegalStateException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return new ODataFeedImpl(entries, feedMetadata);
}
@@ -119,7 +124,8 @@ public class JsonFeedConsumer {
String nextLink = reader.nextString();
feedMetadata.setNextLink(nextLink);
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(nextName).addContent("JsonFeed"));
+ throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(nextName).addContent(
+ "JsonFeed"));
}
} else if (FormatJson.DELTA.equals(nextName)) {
@@ -127,10 +133,12 @@ public class JsonFeedConsumer {
String deltaLink = reader.nextString();
feedMetadata.setDeltaLink(deltaLink);
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(nextName).addContent("JsonFeed"));
+ throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(nextName).addContent(
+ "JsonFeed"));
}
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(nextName).addContent("JsonFeed"));
+ throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(nextName).addContent(
+ "JsonFeed"));
}
}
@@ -143,7 +151,8 @@ public class JsonFeedConsumer {
reader.endArray();
}
- protected static void readInlineCount(final JsonReader reader, final FeedMetadataImpl feedMetadata) throws IOException, EntityProviderException {
+ protected static void readInlineCount(final JsonReader reader, final FeedMetadataImpl feedMetadata)
+ throws IOException, EntityProviderException {
if (reader.peek() == JsonToken.STRING && feedMetadata.getInlineCount() == null) {
int inlineCount;
try {
@@ -161,10 +170,11 @@ public class JsonFeedConsumer {
}
}
- protected ODataFeed readStartedInlineFeed(final String name) throws EdmException, EntityProviderException, IOException {
- //consume the already started content
+ protected ODataFeed readStartedInlineFeed(final String name) throws EdmException, EntityProviderException,
+ IOException {
+ // consume the already started content
handleName(name);
- //consume the rest of the entry content
+ // consume the rest of the entry content
readFeedContent();
return new ODataFeedImpl(entries, feedMetadata);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java
index 80acfa4..2b6f038 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -56,7 +56,8 @@ public class JsonLinkConsumer {
if (FormatJson.URI.equals(nextName) && reader.peek() == JsonToken.STRING) {
result = reader.nextString();
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(FormatJson.D + " or " + FormatJson.URI).addContent(nextName));
+ throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(
+ FormatJson.D + " or " + FormatJson.URI).addContent(nextName));
}
reader.endObject();
if (wrapped) {
@@ -67,9 +68,11 @@ public class JsonLinkConsumer {
return result;
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final IllegalStateException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -112,13 +115,15 @@ public class JsonLinkConsumer {
if (FormatJson.RESULTS.equals(nextName)) {
links = readLinksArray(reader);
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(FormatJson.RESULTS).addContent(nextName));
+ throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(FormatJson.RESULTS)
+ .addContent(nextName));
}
if (reader.hasNext() && reader.peek() == JsonToken.NAME) {
if (FormatJson.COUNT.equals(reader.nextName())) {
JsonFeedConsumer.readInlineCount(reader, feedMetadata);
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(FormatJson.COUNT).addContent(nextName));
+ throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(FormatJson.COUNT)
+ .addContent(nextName));
}
}
for (; openedObjects > 0; openedObjects--) {
@@ -127,9 +132,11 @@ public class JsonLinkConsumer {
reader.peek(); // to assert end of document
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final IllegalStateException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return links;
@@ -145,7 +152,8 @@ public class JsonLinkConsumer {
if (FormatJson.URI.equals(nextName) && reader.peek() == JsonToken.STRING) {
links.add(reader.nextString());
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(FormatJson.URI).addContent(nextName));
+ throw new EntityProviderException(EntityProviderException.INVALID_CONTENT.addContent(FormatJson.URI)
+ .addContent(nextName));
}
reader.endObject();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
index ab67bfb..af1262d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -43,7 +43,8 @@ import com.google.gson.stream.JsonToken;
*/
public class JsonPropertyConsumer {
- public Map<String, Object> readPropertyStandalone(final JsonReader reader, final EdmProperty property, final EntityProviderReadProperties readProperties) throws EntityProviderException {
+ public Map<String, Object> readPropertyStandalone(final JsonReader reader, final EdmProperty property,
+ final EntityProviderReadProperties readProperties) throws EntityProviderException {
try {
EntityPropertyInfo entityPropertyInfo = EntityInfoAggregator.create(property);
Map<String, Object> typeMappings = readProperties == null ? null : readProperties.getTypeMappings();
@@ -62,18 +63,23 @@ public class JsonPropertyConsumer {
reader.endObject();
if (reader.peek() != JsonToken.END_DOCUMENT) {
- throw new EntityProviderException(EntityProviderException.END_DOCUMENT_EXPECTED.addContent(reader.peek().toString()));
+ throw new EntityProviderException(EntityProviderException.END_DOCUMENT_EXPECTED.addContent(reader.peek()
+ .toString()));
}
return result;
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final IllegalStateException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
- private void handleName(final JsonReader reader, final Map<String, Object> typeMappings, final EntityPropertyInfo entityPropertyInfo, final Map<String, Object> result, final String nextName) throws EntityProviderException {
+ private void handleName(final JsonReader reader, final Map<String, Object> typeMappings,
+ final EntityPropertyInfo entityPropertyInfo, final Map<String, Object> result, final String nextName)
+ throws EntityProviderException {
if (!entityPropertyInfo.getName().equals(nextName)) {
throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent(nextName));
}
@@ -85,19 +91,23 @@ public class JsonPropertyConsumer {
result.put(nextName, propertyValue);
}
- protected Object readPropertyValue(final JsonReader reader, final EntityPropertyInfo entityPropertyInfo, final Object typeMapping) throws EntityProviderException {
+ protected Object readPropertyValue(final JsonReader reader, final EntityPropertyInfo entityPropertyInfo,
+ final Object typeMapping) throws EntityProviderException {
try {
return entityPropertyInfo.isComplex() ?
readComplexProperty(reader, (EntityComplexPropertyInfo) entityPropertyInfo, typeMapping) :
readSimpleProperty(reader, entityPropertyInfo, typeMapping);
} catch (final EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
- private Object readSimpleProperty(final JsonReader reader, final EntityPropertyInfo entityPropertyInfo, final Object typeMapping) throws EdmException, EntityProviderException, IOException {
+ private Object readSimpleProperty(final JsonReader reader, final EntityPropertyInfo entityPropertyInfo,
+ final Object typeMapping) throws EdmException, EntityProviderException, IOException {
final EdmSimpleType type = (EdmSimpleType) entityPropertyInfo.getType();
Object value = null;
final JsonToken tokenType = reader.peek();
@@ -110,7 +120,8 @@ public class JsonPropertyConsumer {
value = reader.nextBoolean();
value = value.toString();
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE.addContent(entityPropertyInfo.getName()));
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE
+ .addContent(entityPropertyInfo.getName()));
}
break;
case Byte:
@@ -121,14 +132,16 @@ public class JsonPropertyConsumer {
value = reader.nextInt();
value = value.toString();
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE.addContent(entityPropertyInfo.getName()));
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE
+ .addContent(entityPropertyInfo.getName()));
}
break;
default:
if (tokenType == JsonToken.STRING) {
value = reader.nextString();
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE.addContent(entityPropertyInfo.getName()));
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE
+ .addContent(entityPropertyInfo.getName()));
}
break;
}
@@ -139,11 +152,13 @@ public class JsonPropertyConsumer {
}
@SuppressWarnings("unchecked")
- private Object readComplexProperty(final JsonReader reader, final EntityComplexPropertyInfo complexPropertyInfo, final Object typeMapping) throws EdmException, EntityProviderException, IOException {
+ private Object readComplexProperty(final JsonReader reader, final EntityComplexPropertyInfo complexPropertyInfo,
+ final Object typeMapping) throws EdmException, EntityProviderException, IOException {
if (reader.peek().equals(JsonToken.NULL)) {
reader.nextNull();
if (complexPropertyInfo.isMandatory()) {
- throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE.addContent(complexPropertyInfo.getName()));
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE.addContent(complexPropertyInfo
+ .getName()));
}
return null;
}
@@ -156,7 +171,8 @@ public class JsonPropertyConsumer {
if (typeMapping instanceof Map) {
mapping = (Map<String, Object>) typeMapping;
} else {
- throw new EntityProviderException(EntityProviderException.INVALID_MAPPING.addContent(complexPropertyInfo.getName()));
+ throw new EntityProviderException(EntityProviderException.INVALID_MAPPING.addContent(complexPropertyInfo
+ .getName()));
}
} else {
mapping = new HashMap<String, Object>();
@@ -168,12 +184,15 @@ public class JsonPropertyConsumer {
reader.beginObject();
childName = reader.nextName();
if (!FormatJson.TYPE.equals(childName)) {
- throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent(FormatJson.TYPE).addContent(FormatJson.METADATA));
+ throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent(FormatJson.TYPE)
+ .addContent(FormatJson.METADATA));
}
String actualTypeName = reader.nextString();
- String expectedTypeName = complexPropertyInfo.getType().getNamespace() + Edm.DELIMITER + complexPropertyInfo.getType().getName();
+ String expectedTypeName =
+ complexPropertyInfo.getType().getNamespace() + Edm.DELIMITER + complexPropertyInfo.getType().getName();
if (!expectedTypeName.equals(actualTypeName)) {
- throw new EntityProviderException(EntityProviderException.INVALID_ENTITYTYPE.addContent(expectedTypeName).addContent(actualTypeName));
+ throw new EntityProviderException(EntityProviderException.INVALID_ENTITYTYPE.addContent(expectedTypeName)
+ .addContent(actualTypeName));
}
reader.endObject();
} else {
[08/59] [abbrv] Clean up of odata api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
index 6e70c6a..efd83d8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,11 +23,12 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmSimpleTypeKind holds all EdmSimpleTypes defined as primitive type in the Entity Data Model (EDM).
- *
+ *
*/
public enum EdmSimpleTypeKind {
- Binary, Boolean, Byte, DateTime, DateTimeOffset, Decimal, Double, Guid, Int16, Int32, Int64, SByte, Single, String, Time, Null;
+ Binary, Boolean, Byte, DateTime, DateTimeOffset, Decimal, Double, Guid, Int16, Int32, Int64, SByte, Single, String,
+ Time, Null;
/**
* Returns the {@link FullQualifiedName} for this SimpleTypeKind.
@@ -72,7 +73,7 @@ public enum EdmSimpleTypeKind {
* </ul></p>
* @param uriLiteral the literal
* @return an instance of {@link EdmLiteral}, containing the literal
- * in default String representation and the EDM simple type
+ * in default String representation and the EDM simple type
* @throws EdmLiteralException if the literal is malformed
*/
public static EdmLiteral parseUriLiteral(final String uriLiteral) throws EdmLiteralException {
@@ -80,7 +81,7 @@ public enum EdmSimpleTypeKind {
}
/**
- * Cached access to {@link EdmSimpleTypeFacade} which is used i.a. for {@link EdmSimpleType} instance creation
+ * Cached access to {@link EdmSimpleTypeFacade} which is used i.a. for {@link EdmSimpleType} instance creation
* or parsing of {@link EdmLiteral}s.
*/
private static class SimpleTypeFacadeHolder {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
index ba1f4c4..9b92c5e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import java.util.List;
* @org.apache.olingo.odata2.DoNotImplement
* EdmStructuralType is the base for a complex type or an entity type.
* <p>Complex types and entity types are described in the Conceptual Schema Definition of the OData protocol.
- *
+ *
*/
public interface EdmStructuralType extends EdmMappable, EdmType {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
index 8af4d5a..f16ba58 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmTargetPath specifies the possible default targets for an EDM property which is mapped to an atom element.
- *
+ *
*/
public class EdmTargetPath {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
index 77f39c4..8eb8b36 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmType holds the namespace of a given type and its type as {@link EdmTypeKind}.
- *
+ *
*/
public interface EdmType extends EdmNamed {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
index 6b7d6d8..b843f63 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmTypeKind specifies the type of an EDM element.
- *
+ *
*/
public enum EdmTypeKind {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
index c39e4a9..7636a3a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmTyped indicates if an EDM element is of a special type and holds the multiplicity of that type.
- *
+ *
*/
public interface EdmTyped extends EdmNamed {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
index ffb345e..dfb6d15 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* A full qualified name of any element in the EDM consists of a name and a namespace.
- *
+ *
*/
public class FullQualifiedName {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java
index f9f577b..9708d5f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
index ec4482f..e71d85f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.edm.EdmAnnotationAttribute;
/**
* Objects of this class represent an annotation attribute
- *
+ *
*/
public class AnnotationAttribute implements EdmAnnotationAttribute {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
index 50c2ab0..d1e0e4e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.EdmAnnotationElement;
/**
* Objects of this class represent an annotation element.
- *
+ *
*/
public class AnnotationElement implements EdmAnnotationElement {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
index 72bbeb4..d78ef45 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this class represent an association
- *
+ *
*/
public class Association {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
index cffa7a1..11fcf2a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
/**
* Objects of this class represent an association end
- *
+ *
*/
public class AssociationEnd {
@@ -38,7 +38,7 @@ public class AssociationEnd {
private List<AnnotationElement> annotationElements;
/**
- * @return {@link FullQualifiedName} full qualified name (namespace and name)
+ * @return {@link FullQualifiedName} full qualified name (namespace and name)
*/
public FullQualifiedName getType() {
return type;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
index 7de7204..a5b6207 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
/**
* Objects of this class represent an association set
- *
+ *
*/
public class AssociationSet {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
index ad9d845..c2fa5c0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this class represent an association set end
- *
+ *
*/
public class AssociationSetEnd {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
index 095d70a..02f88f1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
/**
* Objects of this class represent a complex property.
- *
+ *
*/
public class ComplexProperty extends Property {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
index 73c52df..c3f53e5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
/**
* Objects of this class represent a complex type
- *
+ *
*/
public class ComplexType {
@@ -45,7 +45,7 @@ public class ComplexType {
}
/**
- * @return {@link FullQualifiedName} of the base type of this type (namespace and name)
+ * @return {@link FullQualifiedName} of the base type of this type (namespace and name)
*/
public FullQualifiedName getBaseType() {
return baseType;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
index e3d7d31..9bc570e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.edm.EdmCustomizableFeedMappings;
/**
* Objects of this class represent customizable feed mappings.
- *
+ *
*/
public class CustomizableFeedMappings implements EdmCustomizableFeedMappings {
@@ -123,8 +123,8 @@ public class CustomizableFeedMappings implements EdmCustomizableFeedMappings {
/**
* <p>Sets the target path.</p>
- * <p>For standard Atom elements, constants are available in
- * {@link org.apache.olingo.odata2.api.edm.EdmTargetPath EdmTargetPath}.</p>
+ * <p>For standard Atom elements, constants are available in {@link org.apache.olingo.odata2.api.edm.EdmTargetPath
+ * EdmTargetPath}.</p>
* @param fcTargetPath
* @return {@link CustomizableFeedMappings} for method chaining
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
index 281505c..552eb01 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,8 +21,9 @@ package org.apache.olingo.odata2.api.edm.provider;
import java.util.List;
/**
- * Objects of this class represent the data service. They contain all schemas of the EDM as well as the dataServiceVersion
- *
+ * Objects of this class represent the data service. They contain all schemas of the EDM as well as the
+ * dataServiceVersion
+ *
*/
public class DataServices {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
index 9f62f29..7fcb382 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this class represent documentation
- *
+ *
*/
public class Documentation {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
index 4b4ccf1..bc793eb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -26,8 +26,8 @@ import org.apache.olingo.odata2.api.exception.ODataNotImplementedException;
/**
* Default EDM Provider which is to be extended by the application
- *
- *
+ *
+ *
*/
public abstract class EdmProvider {
@@ -88,10 +88,12 @@ public abstract class EdmProvider {
* @param association
* @param sourceEntitySetName
* @param sourceEntitySetRole
- * @return {@link AssociationSet} for the given container name, association name, source entity set name and source entity set role
+ * @return {@link AssociationSet} for the given container name, association name, source entity set name and source
+ * entity set role
* @throws ODataException
*/
- public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
+ public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
+ final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
throw new ODataNotImplementedException();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
index d4ea27f..d765156 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
@@ -1,27 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.edm.provider;
/**
- * This interface can be used to access the {@link EdmProvider} within an application.
- *
- *
+ * This interface can be used to access the {@link EdmProvider} within an application.
+ *
+ *
*/
public interface EdmProviderAccessor {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
index badb6ae..9dbdc8a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,18 +25,19 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
/**
* EDM Provider Factory which can be used to create an edm provider (e.g. from a metadata document)
- *
- *
+ *
+ *
*/
public class EdmProviderFactory {
/**
- * Creates and returns an edm provider.
+ * Creates and returns an edm provider.
* @param metadataXml a metadata xml input stream (means the metadata document)
* @param validate true if semantic checks for metadata document input stream shall be done
* @return an instance of EdmProvider
*/
- public static EdmProvider getEdmProvider(final InputStream metadataXml, final boolean validate) throws EntityProviderException {
+ public static EdmProvider getEdmProvider(final InputStream metadataXml, final boolean validate)
+ throws EntityProviderException {
return RuntimeDelegate.createEdmProvider(metadataXml, validate);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
index ae74bb9..0b375ab 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this class represent an entity container including its child elements
- *
+ *
*/
public class EntityContainer extends EntityContainerInfo {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
index fdcb4ac..440a0b9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this class represent an entity container
- *
+ *
*/
public class EntityContainerInfo {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
index a9c5c2b..8208e67 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
/**
* Objects of this class represent an entity set
- *
+ *
*/
public class EntitySet {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
index 23907f9..ddd12bf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
/**
* Objects of this class represent an entity type
- *
+ *
*/
public class EntityType extends ComplexType {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
index 7e3db68..498b696 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -26,12 +26,14 @@ import org.apache.olingo.odata2.api.edm.EdmFacets;
/**
* Objects of this class represent the facets an entity type, property or function import can have
- *
+ *
*/
public class Facets implements EdmFacets {
- /** Specification default is TRUE but we won't set it here because
- * we want to know if it's set explicitly by an application. */
+ /**
+ * Specification default is TRUE but we won't set it here because
+ * we want to know if it's set explicitly by an application.
+ */
Boolean nullable;
String defaultValue;
Integer maxLength;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java
index c16882a..60c9cad 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this class represent a function import
- *
+ *
*/
public class FunctionImport {
@@ -58,7 +58,7 @@ public class FunctionImport {
}
/**
- * @return <b>String</b> name of the used HTTP method
+ * @return <b>String</b> name of the used HTTP method
*/
public String getHttpMethod() {
return httpMethod;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java
index e9c22f7..a1ea28e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
/**
* Objects of this class represent function import parameters
- *
+ *
*/
public class FunctionImportParameter {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java
index 3688ccb..dd2cb86 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this class represent a key for an entity type
- *
+ *
*/
public class Key {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
index cc6e555..f7f0f00 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.edm.EdmMapping;
/**
* Object of this class represent the mapping of a value to a MIME type.
- *
+ *
*/
public class Mapping implements EdmMapping {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java
index 3b2f45e..4860bec 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
/**
* Objects of this Class represent a navigation property
- *
+ *
*/
public class NavigationProperty {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java
index 29ab475..ca819c7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.EdmAction;
/**
* Objects of this class represent an OnDelete Action
- *
+ *
*/
public class OnDelete {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java
index b5ee9f1..a8e9331 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.EdmFacets;
/**
* Objects of this class represent a property of an entity type
- *
+ *
*/
public abstract class Property {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java
index 890ff91..1308fa6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,8 +22,8 @@ import java.util.List;
/**
* Objects of this class represent a reference to a property via its name
- *
- *
+ *
+ *
*/
public class PropertyRef {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java
index ec54d68..a2ac913 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this Class represent a referential constraint
- *
+ *
*/
public class ReferentialConstraint {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java
index 1cd57e5..1a551a4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this Class represent a referential constraint role
- *
+ *
*/
public class ReferentialConstraintRole {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java
index 988d14d..e4de072 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
/**
* Objects of this Class represent a return type of a function import
- *
+ *
*/
public class ReturnType {
@@ -45,7 +45,7 @@ public class ReturnType {
}
/**
- * Sets the type of this {@link ReturnType} via the types {@link FullQualifiedName}
+ * Sets the type of this {@link ReturnType} via the types {@link FullQualifiedName}
* @param qualifiedName
* @return {@link ReturnType} for method chaining
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java
index 62dacc1..1b9e8d8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Objects of this class represent a schema
- *
+ *
*/
public class Schema {
[17/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
index d259c6f..8bcb204 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -83,17 +83,89 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
private final String[] propertyNames = { "EmployeeId", "EmployeeName", "Location" };
- private final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ private final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\""
+ + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "<Property Name=\""
+ + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>"
+ + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>"
+ + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
- private final String xml2 = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\" xmlns:prefix=\"namespace\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_01 + "\">" + "<prefix:schemaElement>text3</prefix:schemaElement>" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ private final String xml2 = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06
+ + "\" xmlns:prefix=\"namespace\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_01 + "\">" + "<prefix:schemaElement>text3</prefix:schemaElement>"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\""
+ + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "<Property Name=\""
+ + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>"
+ + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>"
+ + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
- private final String xmlWithBaseType = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ private final String xmlWithBaseType = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06
+ + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\""
+ + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1]
+ + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "<Property Name=\"" + propertyNames[2]
+ + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>"
+ + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>"
+ + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
- private final String xmlWithAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
- + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">" + "<OnDelete Action=\"Cascade\"/>" + "</End>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ private final String xmlWithAssociation =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
+ + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Manager\" ToRole=\"r_Employees\" />"
+ + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">"
+ + "<OnDelete Action=\"Cascade\"/>" + "</End>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>"
+ + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
+ + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\""
+ + ASSOCIATION + "\" Association=\"RefScenario." + ASSOCIATION + "\">"
+ + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>"
+ + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
- private final String xmlWithTwoSchemas = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\"/>" + "</EntityType>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Photo\">" + "<Key><PropertyRef Name=\"Id\"/></Key>" + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\" ConcurrencyMode=\"Fixed\" MaxLength=\"" + MAX_LENGTH + "\"/>" + "<Property Name=\"Name\" Type=\"Edm.String\" Unicode=\"true\" DefaultValue=\"" + DEFAULT_VALUE
- + "\" FixedLength=\"false\"/>" + "<Property Name=\"BinaryData\" Type=\"Edm.Binary\" m:MimeType=\"" + MIME_TYPE + "\"/>" + "<Property Name=\"Содержание\" Type=\"Edm.String\" m:FC_TargetPath=\"" + FC_TARGET_PATH + "\" m:FC_NsUri=\"" + FC_NS_URI + "\"" + " m:FC_NsPrefix=\"" + FC_NS_PREFIX + "\" m:FC_KeepInContent=\"" + FC_KEEP_IN_CONTENT + "\" m:FC_ContentKind=\"text\" >" + "</Property>" + "</EntityType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ private final String xmlWithTwoSchemas = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06
+ + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\""
+ + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1]
+ + "\" Type=\"Edm.String\"/>" + "</EntityType>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2
+ + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Photo\">"
+ + "<Key><PropertyRef Name=\"Id\"/></Key>"
+ + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\" ConcurrencyMode=\"Fixed\" MaxLength=\""
+ + MAX_LENGTH + "\"/>" + "<Property Name=\"Name\" Type=\"Edm.String\" Unicode=\"true\" DefaultValue=\""
+ + DEFAULT_VALUE
+ + "\" FixedLength=\"false\"/>" + "<Property Name=\"BinaryData\" Type=\"Edm.Binary\" m:MimeType=\"" + MIME_TYPE
+ + "\"/>" + "<Property Name=\"Содержание\" Type=\"Edm.String\" m:FC_TargetPath=\"" + FC_TARGET_PATH
+ + "\" m:FC_NsUri=\"" + FC_NS_URI + "\"" + " m:FC_NsPrefix=\"" + FC_NS_PREFIX + "\" m:FC_KeepInContent=\""
+ + FC_KEEP_IN_CONTENT + "\" m:FC_ContentKind=\"text\" >" + "</Property>" + "</EntityType>" + "</Schema>"
+ + "</edmx:DataServices>" + "</edmx:Edmx>";
@Test
public void test() throws XMLStreamException, EntityProviderException {
@@ -185,8 +257,19 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test
public void testComplexTypeWithBaseType() throws XMLStreamException, EntityProviderException {
- final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<ComplexType Name=\"c_Location\" BaseType=\"RefScenario.c_BaseType_for_Location\">" + "</ComplexType>" + "<ComplexType Name=\"c_Other_Location\" BaseType=\"RS.c_BaseType_for_Location\">" + "</ComplexType>" + "</Schema>"
- + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xml =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
+ + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">"
+ + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>"
+ + "<ComplexType Name=\"c_Location\" BaseType=\"RefScenario.c_BaseType_for_Location\">" + "</ComplexType>"
+ + "<ComplexType Name=\"c_Other_Location\" BaseType=\"RS.c_BaseType_for_Location\">" + "</ComplexType>"
+ + "</Schema>"
+ + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xml);
DataServices result = parser.readMetadata(reader, true);
@@ -216,7 +299,17 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testComplexTypeWithInvalidBaseType() throws XMLStreamException, EntityProviderException {
- final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<ComplexType Name=\"c_Location\" BaseType=\"RefScenario.Employee\">" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xml =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
+ + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">"
+ + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>"
+ + "<ComplexType Name=\"c_Location\" BaseType=\"RefScenario.Employee\">" + "</ComplexType>" + "</Schema>"
+ + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xml);
parser.readMetadata(reader, true);
@@ -224,7 +317,17 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testComplexTypeWithInvalidBaseType2() throws XMLStreamException, EntityProviderException {
- final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<ComplexType Name=\"c_Location\" BaseType=\"c_BaseType_for_Location\">" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xml =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
+ + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">"
+ + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>"
+ + "<ComplexType Name=\"c_Location\" BaseType=\"c_BaseType_for_Location\">" + "</ComplexType>" + "</Schema>"
+ + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xml);
parser.readMetadata(reader, true);
@@ -340,7 +443,16 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test
public void testEntitySet() throws XMLStreamException, EntityProviderException {
- final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmWithEntityContainer =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
+ + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "</EntityContainer>"
+ + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmWithEntityContainer);
DataServices result = parser.readMetadata(reader, true);
@@ -385,8 +497,33 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test
public void testFunctionImport() throws XMLStreamException, EntityProviderException {
- final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<FunctionImport Name=\"EmployeeSearch\" ReturnType=\"Collection(RefScenario.Employee)\" EntitySet=\"Employees\" m:HttpMethod=\"GET\">" + "<Parameter Name=\"q\" Type=\"Edm.String\" Nullable=\"true\" />"
- + "</FunctionImport>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmWithEntityContainer =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\""
+ + propertyNames[1]
+ + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
+ + "</EntityType>"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
+ + "<FunctionImport Name=\"EmployeeSearch\" ReturnType=\"Collection(RefScenario.Employee)\" " +
+ "EntitySet=\"Employees\" m:HttpMethod=\"GET\">"
+ + "<Parameter Name=\"q\" Type=\"Edm.String\" Nullable=\"true\" />"
+ + "</FunctionImport>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmWithEntityContainer);
DataServices result = parser.readMetadata(reader, true);
@@ -414,7 +551,14 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test()
public void testAlias() throws XMLStreamException, EntityProviderException {
- final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RS.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xml =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\""
+ + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RS.Employee\" m:HasStream=\"true\">" + "</EntityType>"
+ + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xml);
DataServices result = parser.readMetadata(reader, true);
@@ -432,7 +576,10 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testEntityTypeWithoutKeys() throws XMLStreamException, EntityProviderException {
- final String xmlWithoutKeys = "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "</Schema>";
+ final String xmlWithoutKeys =
+ "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\">" + "<Property Name=\"" + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "</Schema>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithoutKeys);
parser.readMetadata(reader, true);
@@ -440,7 +587,10 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testInvalidBaseType() throws XMLStreamException, EntityProviderException {
- final String xmlWithInvalidBaseType = "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Manager\" BaseType=\"Employee\" m:HasStream=\"true\">" + "</EntityType>" + "</Schema>";
+ final String xmlWithInvalidBaseType =
+ "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Manager\" BaseType=\"Employee\" m:HasStream=\"true\">" + "</EntityType>"
+ + "</Schema>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidBaseType);
parser.readMetadata(reader, true);
@@ -448,8 +598,32 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testInvalidRole() throws XMLStreamException, EntityProviderException {
- final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"Manager\" ToRole=\"Employees\" />" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "</Schema>"
- + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmlWithInvalidAssociation =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"Manager\" ToRole=\"Employees\" />"
+ + "</EntityType>" + "<Association Name=\"ManagerEmployees\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>"
+ + "</Schema>"
+ + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
parser.readMetadata(reader, true);
@@ -457,8 +631,31 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testInvalidRelationship() throws XMLStreamException, EntityProviderException {
- final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployee\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "</Schema>"
- + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmlWithInvalidAssociation =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployee\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
+ + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "</EntityType>" + "<Association Name=\"ManagerEmployees\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>"
+ + "</Schema>"
+ + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
parser.readMetadata(reader, true);
@@ -466,7 +663,18 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testMissingRelationship() throws Exception {
- final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
+ final String xmlWithInvalidAssociation =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\""
+ + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" />" + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>"
+ + "<Association Name=\"ManagerEmployees\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
+ + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
try {
@@ -482,8 +690,31 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testMissingEntityType() throws Exception {
- final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" />" + "</EntityContainer>" + "<Association Name=\"ManagerEmployees\">"
- + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
+ final String xmlWithInvalidAssociation =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
+ + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" />" + "</EntityContainer>" + "<Association Name=\"ManagerEmployees\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
+ + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
try {
@@ -499,7 +730,30 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testMissingType() throws Exception {
- final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
+ final String xmlWithInvalidAssociation =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
+ + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "</EntityType>" + "<Association Name=\"ManagerEmployees\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
+ + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
try {
@@ -515,7 +769,30 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testMissingTypeAtAssociation() throws Exception {
- final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
+ final String xmlWithInvalidAssociation =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
+ + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "</EntityType>" + "<Association Name=\"ManagerEmployees\">"
+ + "<End Multiplicity=\"*\" Role=\"r_Employees\"/>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
+ + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
try {
@@ -531,8 +808,33 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testMissingTypeAtFunctionImport() throws Exception {
- final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<FunctionImport Name=\"EmployeeSearch\" ReturnType=\"Collection(RefScenario.Employee)\" EntitySet=\"Employees\" m:HttpMethod=\"GET\">" + "<Parameter Name=\"q\" Nullable=\"true\" />" + "</FunctionImport>"
- + "</EntityContainer></Schema></edmx:DataServices></edmx:Edmx>";
+ final String xml =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\""
+ + propertyNames[1]
+ + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
+ + "</EntityType>"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
+ + "<FunctionImport Name=\"EmployeeSearch\" ReturnType=\"Collection(RefScenario.Employee)\" " +
+ "EntitySet=\"Employees\" m:HttpMethod=\"GET\">"
+ + "<Parameter Name=\"q\" Nullable=\"true\" />" + "</FunctionImport>"
+ + "</EntityContainer></Schema></edmx:DataServices></edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xml);
try {
@@ -548,9 +850,31 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testMissingAssociation() throws Exception {
- final String xmlWithAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<AssociationSet Name=\"" + ASSOCIATION
- // + "\" Association=\"RefScenario." + ASSOCIATION
- + "\">" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices></edmx:Edmx>";
+ final String xmlWithAssociation =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
+ + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<AssociationSet Name=\""
+ + ASSOCIATION
+ // + "\" Association=\"RefScenario." + ASSOCIATION
+ + "\">" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>"
+ + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices></edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithAssociation);
try {
@@ -566,8 +890,40 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testInvalidAssociation() throws XMLStreamException, EntityProviderException {
- final String xmlWithInvalidAssociationSet = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
- + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">" + "<OnDelete Action=\"Cascade\"/>" + "</End>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmlWithInvalidAssociationSet =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
+ + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Manager\" ToRole=\"r_Employees\" />"
+ + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">"
+ + "<OnDelete Action=\"Cascade\"/>" + "</End>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
+ + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\""
+ + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">"
+ + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>"
+ + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>"
+ + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociationSet);
parser.readMetadata(reader, true);
@@ -578,8 +934,27 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
public void testInvalidAssociationEnd() throws XMLStreamException, EntityProviderException {
final String employees = "r_Employees";
final String manager = "r_Manager";
- final String xmlWithInvalidAssociationSetEnd = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"" + employees + "\" ToRole=\"" + manager + "\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"" + manager + "\" ToRole=\"" + employees + "\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
- + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"" + employees + "1" + "\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"" + manager + "\"/>" + "</Association>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"" + manager + "\"/>" + "<End EntitySet=\"Employees\" Role=\"" + employees + "\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmlWithInvalidAssociationSetEnd =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\""
+ + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\""
+ + employees + "\" ToRole=\"" + manager + "\" />" + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\""
+ + manager + "\" ToRole=\"" + employees + "\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION
+ + "\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"" + employees + "1" + "\"/>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"" + manager + "\"/>" + "</Association>"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
+ + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\""
+ + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">"
+ + "<End EntitySet=\"Managers\" Role=\"" + manager + "\"/>" + "<End EntitySet=\"Employees\" Role=\""
+ + employees + "\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>"
+ + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociationSetEnd);
parser.readMetadata(reader, true);
@@ -590,8 +965,27 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
public void testInvalidAssociationEnd2() throws XMLStreamException, EntityProviderException {
final String employees = "r_Employees";
final String manager = "r_Manager";
- final String xmlWithInvalidAssociationSetEnd = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"" + employees + "\" ToRole=\"" + manager + "\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"" + manager + "\" ToRole=\"" + employees + "\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
- + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"" + employees + "\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"" + manager + "\"/>" + "</Association>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"" + manager + "\"/>" + "<End EntitySet=\"Managers\" Role=\"" + manager + "\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmlWithInvalidAssociationSetEnd =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\""
+ + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\""
+ + employees + "\" ToRole=\"" + manager + "\" />" + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\""
+ + manager + "\" ToRole=\"" + employees + "\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION
+ + "\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"" + employees + "\"/>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"" + manager + "\"/>" + "</Association>"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
+ + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\""
+ + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">"
+ + "<End EntitySet=\"Managers\" Role=\"" + manager + "\"/>" + "<End EntitySet=\"Managers\" Role=\""
+ + manager + "\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>"
+ + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociationSetEnd);
parser.readMetadata(reader, true);
@@ -600,7 +994,16 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test(expected = EntityProviderException.class)
public void testInvalidEntitySet() throws XMLStreamException, EntityProviderException {
- final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Mitarbeiter\"/>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmWithEntityContainer =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
+ + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Mitarbeiter\"/>" + "</EntityContainer>"
+ + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmWithEntityContainer);
parser.readMetadata(reader, true);
@@ -609,8 +1012,19 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test
public void testEntityTypeInOtherSchema() throws XMLStreamException, EntityProviderException {
- final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Photos\" EntityType=\"" + NAMESPACE2 + ".Photo\"/>" + "</EntityContainer>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Photo\">" + "<Key><PropertyRef Name=\"Id\"/></Key>" + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\"/>" + "</EntityType>" + "</Schema>" + "</edmx:DataServices>"
- + "</edmx:Edmx>";
+ final String xmWithEntityContainer =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
+ + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Photos\" EntityType=\"" + NAMESPACE2 + ".Photo\"/>" + "</EntityContainer>"
+ + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
+ + "<EntityType Name= \"Photo\">" + "<Key><PropertyRef Name=\"Id\"/></Key>"
+ + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\"/>" + "</EntityType>" + "</Schema>"
+ + "</edmx:DataServices>"
+ + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmWithEntityContainer);
DataServices result = parser.readMetadata(reader, true);
@@ -629,10 +1043,71 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test
public void scenarioTest() throws XMLStreamException, EntityProviderException {
final String ASSOCIATION2 = "TeamEmployees";
- final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "<NavigationProperty Name=\"ne_Team\" Relationship=\"RefScenario.TeamEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Team\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
- + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />" + "</EntityType>" + "<EntityType Name=\"Team\">" + "<Key>" + "<PropertyRef Name=\"Id\"/>" + "</Key>" + "<NavigationProperty Name=\"nt_Employees\" Relationship=\"RefScenario.TeamEmployees\" FromRole=\"r_Team\" ToRole=\"r_Employees\" />" + "</EntityType>" + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<Association Name=\"" + ASSOCIATION + "\">" + "<End Type=\"RS.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">" + "<OnDelete Action=\"Cascade\"/>" + "</End>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "<Association Name=\"" + ASSOCIATION2 + "\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Team\" Multiplicity=\"1\" Role=\"r_Team\"/>" + "</Association>"
- + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RS.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<EntitySet Name=\"Teams\" EntityType=\"RefScenario.Team\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "<AssociationSet Name=\"" + ASSOCIATION2 + "\" Association=\"RefScenario." + ASSOCIATION2 + "\">" + "<End EntitySet=\"Teams\" Role=\"r_Team\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Photo\">" + "<Key>" + "<PropertyRef Name=\"Id\"/>" + "<PropertyRef Name=\"Name\"/>" + "</Key>"
- + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\" ConcurrencyMode=\"Fixed\" MaxLength=\"" + MAX_LENGTH + "\"/>" + "<Property Name=\"Name\" Type=\"Edm.String\" Unicode=\"true\" DefaultValue=\"" + DEFAULT_VALUE + "\" FixedLength=\"false\"/>" + "<Property Name=\"BinaryData\" Type=\"Edm.Binary\" m:MimeType=\"" + MIME_TYPE + "\"/>" + "<Property Name=\"Содержание\" Type=\"Edm.String\" m:FC_TargetPath=\"" + FC_TARGET_PATH + "\" m:FC_NsUri=\"" + FC_NS_URI + "\"" + " m:FC_NsPrefix=\"" + FC_NS_PREFIX + "\" m:FC_KeepInContent=\"" + FC_KEEP_IN_CONTENT + "\" m:FC_ContentKind=\"text\" >" + "</Property>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Photos\" EntityType=\"RefScenario2.Photo\"/>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xml =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" Alias=\"RS\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\""
+ + propertyNames[0]
+ + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\""
+ + propertyNames[2]
+ + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
+ + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
+ + "<NavigationProperty Name=\"ne_Team\" Relationship=\"RefScenario.TeamEmployees\" " +
+ "FromRole=\"r_Employees\" ToRole=\"r_Team\" />"
+ + "</EntityType>"
+ + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+ + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" " +
+ "FromRole=\"r_Manager\" ToRole=\"r_Employees\" />"
+ + "</EntityType>"
+ + "<EntityType Name=\"Team\">"
+ + "<Key>"
+ + "<PropertyRef Name=\"Id\"/>"
+ + "</Key>"
+ + "<NavigationProperty Name=\"nt_Employees\" Relationship=\"RefScenario.TeamEmployees\"" +
+ " FromRole=\"r_Team\" ToRole=\"r_Employees\" />"
+ + "</EntityType>" + "<ComplexType Name=\"c_Location\">"
+ + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<Association Name=\""
+ + ASSOCIATION + "\">" + "<End Type=\"RS.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">"
+ + "<OnDelete Action=\"Cascade\"/>" + "</End>"
+ + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>"
+ + "<Association Name=\"" + ASSOCIATION2 + "\">"
+ + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
+ + "<End Type=\"RefScenario.Team\" Multiplicity=\"1\" Role=\"r_Team\"/>" + "</Association>"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Employees\" EntityType=\"RS.Employee\"/>"
+ + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>"
+ + "<EntitySet Name=\"Teams\" EntityType=\"RefScenario.Team\"/>" + "<AssociationSet Name=\"" + ASSOCIATION
+ + "\" Association=\"RefScenario." + ASSOCIATION + "\">"
+ + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>"
+ + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "<AssociationSet Name=\""
+ + ASSOCIATION2 + "\" Association=\"RefScenario." + ASSOCIATION2 + "\">"
+ + "<End EntitySet=\"Teams\" Role=\"r_Team\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>"
+ + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2
+ + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Photo\">" + "<Key>"
+ + "<PropertyRef Name=\"Id\"/>" + "<PropertyRef Name=\"Name\"/>" + "</Key>"
+ + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\" ConcurrencyMode=\"Fixed\" MaxLength=\""
+ + MAX_LENGTH + "\"/>" + "<Property Name=\"Name\" Type=\"Edm.String\" Unicode=\"true\" DefaultValue=\""
+ + DEFAULT_VALUE + "\" FixedLength=\"false\"/>"
+ + "<Property Name=\"BinaryData\" Type=\"Edm.Binary\" m:MimeType=\"" + MIME_TYPE + "\"/>"
+ + "<Property Name=\"Содержание\" Type=\"Edm.String\" m:FC_TargetPath=\"" + FC_TARGET_PATH
+ + "\" m:FC_NsUri=\"" + FC_NS_URI + "\"" + " m:FC_NsPrefix=\"" + FC_NS_PREFIX + "\" m:FC_KeepInContent=\""
+ + FC_KEEP_IN_CONTENT + "\" m:FC_ContentKind=\"text\" >" + "</Property>" + "</EntityType>"
+ + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
+ + "<EntitySet Name=\"Photos\" EntityType=\"RefScenario2.Photo\"/>" + "</EntityContainer>" + "</Schema>"
+ + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xml);
DataServices result = parser.readMetadata(reader, true);
@@ -671,9 +1146,34 @@ public class XmlMetadataConsumerTest extends AbstractXmlProducerTestHelper {
@Test
public void testAnnotations() throws XMLStreamException, EntityProviderException {
- final String xmlWithAnnotations = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\" xmlns:annoPrefix=\"http://annoNamespace\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" prefix1:href=\"http://foo\" xmlns:prefix1=\"namespaceForAnno\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"EmployeeId\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"EmployeeName\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\" annoPrefix:annoName=\"annoText\">" + "<annoPrefix:propertyAnnoElement>text</annoPrefix:propertyAnnoElement>" + "<annoPrefix:propertyAnnoElement2 />" + "</Property>" + "</EntityType>" + "<annoPrefix:schemaElementTest1>" + "<prefix:schemaElementTest2 xmlns:prefix=\"namespace\">text3" + "</prefix:schemaElementTest2>"
- + "<annoPrefix:schemaElementTest3 rel=\"self\" pre:href=\"http://foo\" xmlns:pre=\"namespaceForAnno\">text4</annoPrefix:schemaElementTest3>" + " </annoPrefix:schemaElementTest1>" + "</Schema>"
- + "</edmx:DataServices>" + "</edmx:Edmx>";
+ final String xmlWithAnnotations =
+ "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
+ + Edm.NAMESPACE_EDMX_2007_06
+ + "\" xmlns:annoPrefix=\"http://annoNamespace\">"
+ + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08
+ + "\">"
+ + "<Schema Namespace=\""
+ + NAMESPACE
+ + "\" xmlns=\""
+ + Edm.NAMESPACE_EDM_2008_09
+ + "\">"
+ + "<EntityType Name= \"Employee\" prefix1:href=\"http://foo\" xmlns:prefix1=\"namespaceForAnno\">"
+ + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
+ + "<Property Name=\"EmployeeId\" Type=\"Edm.String\" Nullable=\"false\"/>"
+ + "<Property Name=\"EmployeeName\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\" " +
+ "annoPrefix:annoName=\"annoText\">"
+ + "<annoPrefix:propertyAnnoElement>text</annoPrefix:propertyAnnoElement>"
+ + "<annoPrefix:propertyAnnoElement2 />"
+ + "</Property>"
+ + "</EntityType>"
+ + "<annoPrefix:schemaElementTest1>"
+ + "<prefix:schemaElementTest2 xmlns:prefix=\"namespace\">text3"
+ + "</prefix:schemaElementTest2>"
+ + "<annoPrefix:schemaElementTest3 rel=\"self\" pre:href=\"http://foo\" " +
+ "xmlns:pre=\"namespaceForAnno\">text4</annoPrefix:schemaElementTest3>"
+ + " </annoPrefix:schemaElementTest1>" + "</Schema>"
+ + "</edmx:DataServices>" + "</edmx:Edmx>";
XmlMetadataConsumer parser = new XmlMetadataConsumer();
XMLStreamReader reader = createStreamReader(xmlWithAnnotations);
DataServices result = parser.readMetadata(reader, false);
[23/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
index 233175a..39912ee 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -36,7 +36,7 @@ import org.junit.Test;
/**
* Tests for the parsing of URI literals
- *
+ *
*/
public class EdmSimpleTypeFacadeTest extends BaseTest {
@@ -191,15 +191,16 @@ public class EdmSimpleTypeFacadeTest extends BaseTest {
* to the given EDM simple type and has the correct parsed value.
*
* @param literal
- * the URI literal value to be parsed as string
+ * the URI literal value to be parsed as string
* @param typeKind
- * the {@link EdmSimpleTypeKind} the URI literal should be compatible to
+ * the {@link EdmSimpleTypeKind} the URI literal should be compatible to
* @param expectedLiteral
- * the expected literal value
- * @throws UriSyntaxException
+ * the expected literal value
+ * @throws UriSyntaxException
* @throws EdmException
*/
- private void parseLiteral(final String literal, final EdmSimpleTypeKind typeKind, final String expectedLiteral) throws UriSyntaxException, EdmException {
+ private void parseLiteral(final String literal, final EdmSimpleTypeKind typeKind, final String expectedLiteral)
+ throws UriSyntaxException, EdmException {
final EdmLiteral uriLiteral = EdmSimpleTypeKind.parseUriLiteral(literal);
assertTrue(typeKind.getEdmSimpleTypeInstance().isCompatible(uriLiteral.getType()));
@@ -291,7 +292,8 @@ public class EdmSimpleTypeFacadeTest extends BaseTest {
@Test
public void parseGuid() throws Exception {
- parseLiteral("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'", EdmSimpleTypeKind.Guid, "1225c695-cfb8-4ebb-aaaa-80da344efa6a");
+ parseLiteral("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'", EdmSimpleTypeKind.Guid,
+ "1225c695-cfb8-4ebb-aaaa-80da344efa6a");
}
@Test
@@ -307,7 +309,8 @@ public class EdmSimpleTypeFacadeTest extends BaseTest {
@Test
public void parseDatetimeOffset() throws Exception {
parseLiteral("datetimeoffset'2009-12-26T21:23:38Z'", EdmSimpleTypeKind.DateTimeOffset, "2009-12-26T21:23:38Z");
- parseLiteral("datetimeoffset'2002-10-10T12:00:00-05:00'", EdmSimpleTypeKind.DateTimeOffset, "2002-10-10T12:00:00-05:00");
+ parseLiteral("datetimeoffset'2002-10-10T12:00:00-05:00'", EdmSimpleTypeKind.DateTimeOffset,
+ "2002-10-10T12:00:00-05:00");
parseLiteral("datetimeoffset'2009-12-26T21:23:38'", EdmSimpleTypeKind.DateTimeOffset, "2009-12-26T21:23:38");
}
@@ -359,7 +362,8 @@ public class EdmSimpleTypeFacadeTest extends BaseTest {
parseWrongLiteralContent("time'3'", EdmLiteralException.LITERALFORMAT);
}
- private void parseIncompatibleLiteralContent(final String literal, final EdmSimpleTypeKind typeKind) throws EdmLiteralException {
+ private void parseIncompatibleLiteralContent(final String literal, final EdmSimpleTypeKind typeKind)
+ throws EdmLiteralException {
final EdmLiteral uriLiteral = EdmSimpleTypeKind.parseUriLiteral(literal);
assertFalse(typeKind.getEdmSimpleTypeInstance().isCompatible(uriLiteral.getType()));
}
[24/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
index ffe566e..e3409da 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -85,13 +85,15 @@ public class ODataExceptionWrapperTest extends BaseTest {
assertEquals("text/html", contentTypeHeader);
}
- private ODataExceptionWrapper createWrapper(final ODataContextImpl context, final Map<String, String> queryParameters, final List<String> acceptContentTypes) throws URISyntaxException {
+ private ODataExceptionWrapper createWrapper(final ODataContextImpl context,
+ final Map<String, String> queryParameters, final List<String> acceptContentTypes) throws URISyntaxException {
ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(context, queryParameters, acceptContentTypes);
return exceptionWrapper;
}
- private ODataContextImpl getMockedContext(final String requestUri, final String serviceRoot) throws ODataException, URISyntaxException {
+ private ODataContextImpl getMockedContext(final String requestUri, final String serviceRoot) throws ODataException,
+ URISyntaxException {
ODataContextImpl context = Mockito.mock(ODataContextImpl.class);
PathInfoImpl pathInfo = new PathInfoImpl();
pathInfo.setRequestUri(new URI(requestUri));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
index 505b9fc..72780c8 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -77,7 +77,7 @@ import org.junit.Test;
/**
* Tests for the validation of HTTP method, URI path, query options,
* and request-body content type.
- *
+ *
*/
public class ODataRequestHandlerValidationTest extends BaseTest {
@@ -237,7 +237,7 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
when(request.getAcceptHeaders()).thenReturn(acceptHeaders);
String acceptHeadersAsString = null;
for (String string : acceptHeaders) {
- if(acceptHeadersAsString == null) {
+ if (acceptHeadersAsString == null) {
acceptHeadersAsString = string;
} else {
acceptHeadersAsString += ", " + string;
@@ -246,7 +246,7 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
when(request.getRequestHeaderValue("Accept")).thenReturn(acceptHeadersAsString);
return request;
}
-
+
private ODataRequest mockODataRequest(
final ODataHttpMethod method,
final List<String> pathSegments,
@@ -257,7 +257,6 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
return mockODataRequest(method, pathSegments, queryParameters, acceptHeaders, requestContentType);
}
-
private ODataService mockODataService(final ODataServiceFactory serviceFactory) throws ODataException {
ODataService service = DispatcherTest.getMockService();
when(service.getEntityDataModel()).thenReturn(edm);
@@ -348,7 +347,8 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
final List<String> acceptHeaders,
final HttpStatusCodes expectedStatusCode) throws ODataException {
- executeAndValidateRequest(ODataHttpMethod.GET, pathSegments, queryParameters, acceptHeaders, null, expectedStatusCode);
+ executeAndValidateRequest(ODataHttpMethod.GET, pathSegments, queryParameters, acceptHeaders, null,
+ expectedStatusCode);
}
private void executeAndValidateRequest(final ODataHttpMethod method,
@@ -362,7 +362,8 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
final ODataService service = mockODataService(serviceFactory);
when(serviceFactory.createService(any(ODataContext.class))).thenReturn(service);
- final ODataRequest request = mockODataRequest(method, pathSegments, queryParameters, acceptHeaders, requestContentType);
+ final ODataRequest request =
+ mockODataRequest(method, pathSegments, queryParameters, acceptHeaders, requestContentType);
final ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
final ODataResponse response = new ODataRequestHandler(serviceFactory, service, context).handle(request);
@@ -371,12 +372,13 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
response.getStatus());
}
-
- private void checkValueContentType(final ODataHttpMethod method, final UriType uriType, final String requestContentType) throws Exception {
+ private void checkValueContentType(final ODataHttpMethod method, final UriType uriType,
+ final String requestContentType) throws Exception {
executeAndValidateRequest(method, createPathSegments(uriType, false, true), null, requestContentType, null);
}
- private void wrongRequest(final ODataHttpMethod method, final List<String> pathSegments, final Map<String, String> queryParameters) throws ODataException {
+ private void wrongRequest(final ODataHttpMethod method, final List<String> pathSegments,
+ final Map<String, String> queryParameters) throws ODataException {
executeAndValidateRequest(method, pathSegments, queryParameters, null, HttpStatusCodes.METHOD_NOT_ALLOWED);
}
@@ -396,7 +398,8 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
null);
}
- private void wrongProperty(final ODataHttpMethod method, final boolean ofComplex, final Boolean key) throws ODataException {
+ private void wrongProperty(final ODataHttpMethod method, final boolean ofComplex, final Boolean key)
+ throws ODataException {
EdmProperty property = (EdmProperty) (ofComplex ?
edm.getComplexType("RefScenario", "c_Location").getProperty("Country") :
edm.getEntityType("RefScenario", "Employee").getProperty("Age"));
@@ -416,20 +419,25 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
wrongRequest(method, pathSegments, null);
}
- private void wrongNavigationPath(final ODataHttpMethod method, final UriType uriType, final HttpStatusCodes expectedStatusCode) throws ODataException {
+ private void wrongNavigationPath(final ODataHttpMethod method, final UriType uriType,
+ final HttpStatusCodes expectedStatusCode) throws ODataException {
executeAndValidateRequest(method, createPathSegments(uriType, true, false), null, null, expectedStatusCode);
}
- private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType, final ContentType requestContentType) throws ODataException {
+ private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType,
+ final ContentType requestContentType) throws ODataException {
wrongRequestContentType(method, uriType, false, requestContentType);
}
- private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType, final boolean isValue, final ContentType requestContentType) throws ODataException {
+ private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType, final boolean isValue,
+ final ContentType requestContentType) throws ODataException {
wrongRequestContentType(method, uriType, isValue, requestContentType.toContentTypeString());
}
- private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType, final boolean isValue, final String requestContentType) throws ODataException {
- executeAndValidateRequest(method, createPathSegments(uriType, false, isValue), null, requestContentType, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE);
+ private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType, final boolean isValue,
+ final String requestContentType) throws ODataException {
+ executeAndValidateRequest(method, createPathSegments(uriType, false, isValue), null, requestContentType,
+ HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE);
}
@Test
@@ -438,7 +446,8 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
final ODataService service = mockODataService(serviceFactory);
when(serviceFactory.createService(any(ODataContext.class))).thenReturn(service);
- ODataRequest request = mockODataRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI0, false, false), null, null);
+ ODataRequest request =
+ mockODataRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI0, false, false), null, null);
ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
final ODataRequestHandler handler = new ODataRequestHandler(serviceFactory, service, context);
@@ -472,13 +481,17 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
public void allowedMethods() throws Exception {
executeAndValidateRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI0, false, false), null, null, null);
executeAndValidateRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI1, false, false), null, null, null);
- executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI1, false, false), null, HttpContentType.APPLICATION_JSON, null);
+ executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI1, false, false), null,
+ HttpContentType.APPLICATION_JSON, null);
executeAndValidateRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI2, false, false), null, null, null);
executeAndValidateRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI3, false, false), null, null, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI3, false, false), null, HttpContentType.APPLICATION_JSON, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI3, false, false), null, HttpContentType.APPLICATION_JSON, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI3, false, false), null,
+ HttpContentType.APPLICATION_JSON, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI3, false, false), null,
+ HttpContentType.APPLICATION_JSON, null);
executeAndValidateRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI4, false, false), null, null, null);
- executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI9, false, false), null, HttpContentType.MULTIPART_MIXED, null);
+ executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI9, false, false), null,
+ HttpContentType.MULTIPART_MIXED, null);
executeAndValidateRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI15, false, false), null, null, null);
executeAndValidateRequest(ODataHttpMethod.GET, createPathSegments(UriType.URI17, false, false), null, null, null);
}
@@ -558,12 +571,12 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, false, false, false, true, false, false);
wrongOptions(ODataHttpMethod.PUT, UriType.URI17, false, true, false, false, false, false, false, false, false);
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI17, false, false),
- createOptions(true, false, false, false, false, false, false, false, false),
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI17, false, false),
+ createOptions(true, false, false, false, false, false, false, false, false),
null, HttpStatusCodes.BAD_REQUEST);
-
- executeAndValidateRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI17, false, false),
- createOptions(true, false, false, false, false, false, false, false, false),
+
+ executeAndValidateRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI17, false, false),
+ createOptions(true, false, false, false, false, false, false, false, false),
null, HttpStatusCodes.BAD_REQUEST);
// wrongOptions(ODataHttpMethod.DELETE, UriType.URI17, true, false, false, false, false, false, false, false, false);
@@ -615,84 +628,106 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI17, HttpStatusCodes.BAD_REQUEST);
}
-
@Test
public void requestAcceptHeader() throws Exception {
- executeAndValidateGetRequest(createPathSegments(UriType.URI1, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI1, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI2, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI2, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI3, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI3, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI4, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI4, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI5, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI5, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI6A, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI6A, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI6B, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI6B, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI7A, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI7A, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI7B, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI7B, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_JSON), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI8, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI8, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_XML), null);
// in discussion, hence currently not implemented (see ODataRequestHandler#doContentNegotiation(...))
// executeAndValidateGetRequest(createPathSegments(UriType.URI8, false, false), null,
// Arrays.asList(HttpContentType.TEXT_PLAIN), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI9, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI9, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_XML), HttpStatusCodes.METHOD_NOT_ALLOWED);
- executeAndValidateGetRequest(createPathSegments(UriType.URI15, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI15, false, false), null,
Arrays.asList(HttpContentType.TEXT_PLAIN), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI16, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI16, false, false), null,
Arrays.asList(HttpContentType.TEXT_PLAIN), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI17, false, true), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI17, false, true), null,
Arrays.asList(HttpContentType.APPLICATION_OCTET_STREAM), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI50A, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI50A, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_XML), null);
- executeAndValidateGetRequest(createPathSegments(UriType.URI50B, false, false), null,
+ executeAndValidateGetRequest(createPathSegments(UriType.URI50B, false, false), null,
Arrays.asList(HttpContentType.APPLICATION_XML), null);
}
-
+
@Test
public void requestContentType() throws Exception {
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI2, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI2, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI2, false, false), null, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI3, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI3, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI3, false, false), null, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI4, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI4, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI4, false, false), null, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI5, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI5, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI5, false, false), null, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI6A, false, false), null, HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
- executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI6A, false, false), null, HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
- executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI6A, false, false), null, HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
-
- executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI6B, false, false), null, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI7A, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI7A, false, false), null, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI7A, false, false), null, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI7B, false, false), null, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI9, false, false), null, HttpContentType.MULTIPART_MIXED, null);
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI2, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI2, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI2, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI3, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI3, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI3, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI4, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI4, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI4, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI5, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI5, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI5, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI6A, false, false), null,
+ HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI6A, false, false), null,
+ HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI6A, false, false), null,
+ HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
+
+ executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI6B, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI7A, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI7A, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, createPathSegments(UriType.URI7A, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI7B, false, false), null,
+ HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI9, false, false), null,
+ HttpContentType.MULTIPART_MIXED, null);
}
@Test
public void requestContentTypeMediaResource() throws Exception {
- executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI1, false, false), null, "image/jpeg", null);
+ executeAndValidateRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI1, false, false), null, "image/jpeg",
+ null);
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI17, false, true), null, "image/jpeg", null);
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI17, false, true), null, "image/jpeg",
+ null);
}
@Test
@@ -700,7 +735,8 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
EdmFunctionImport function = edm.getDefaultEntityContainer().getFunctionImport("MaximalAge");
when(function.getHttpMethod()).thenReturn(ODataHttpMethod.PUT.name());
executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI14, false, false), null, null, null);
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI14, false, false), null, HttpContentType.WILDCARD, null);
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI14, false, false), null,
+ HttpContentType.WILDCARD, null);
checkValueContentType(ODataHttpMethod.PUT, UriType.URI14, null);
checkValueContentType(ODataHttpMethod.PUT, UriType.URI14, HttpContentType.WILDCARD);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java
index fe5d8e9..fb20afc 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java
index 013cd4c..969a07c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
index 3b530e9..a3c0512 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/AcceptParserTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -31,7 +31,8 @@ public class AcceptParserTest {
@Test
public void testAcceptHeader() throws BatchException {
- List<String> acceptHeaders = AcceptParser.parseAcceptHeaders("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
+ List<String> acceptHeaders =
+ AcceptParser.parseAcceptHeaders("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
assertNotNull(acceptHeaders);
assertEquals(4, acceptHeaders.size());
assertEquals("text/html", acceptHeaders.get(0));
@@ -72,7 +73,8 @@ public class AcceptParserTest {
@Test
public void testAcceptHeaderWithTwoParameters() throws BatchException {
- List<String> acceptHeaders = AcceptParser.parseAcceptHeaders("application/xml;another=test ; param=alskdf, */*;q=0.1");
+ List<String> acceptHeaders =
+ AcceptParser.parseAcceptHeaders("application/xml;another=test ; param=alskdf, */*;q=0.1");
assertNotNull(acceptHeaders);
assertEquals(2, acceptHeaders.size());
assertEquals("application/xml;another=test ; param=alskdf", acceptHeaders.get(0));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
index 725a810..f66a864 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -95,7 +95,8 @@ public class BatchRequestParserTest {
if (retrieveRequest.getQueryParameters().get("$format") != null) {
assertEquals("json", retrieveRequest.getQueryParameters().get("$format"));
}
- assertEquals(SERVICE_ROOT + "Employees('2')/EmployeeName?$format=json", retrieveRequest.getPathInfo().getRequestUri().toASCIIString());
+ assertEquals(SERVICE_ROOT + "Employees('2')/EmployeeName?$format=json", retrieveRequest.getPathInfo()
+ .getRequestUri().toASCIIString());
} else {
List<ODataRequest> requests = object.getRequests();
for (ODataRequest request : requests) {
@@ -108,7 +109,8 @@ public class BatchRequestParserTest {
assertTrue(request.getAcceptableLanguages().isEmpty());
assertEquals("*/*", request.getAcceptHeaders().get(2));
assertEquals("application/atomsvc+xml", request.getAcceptHeaders().get(0));
- assertEquals(new URI(SERVICE_ROOT + "Employees('2')/EmployeeName").toASCIIString(), request.getPathInfo().getRequestUri().toASCIIString());
+ assertEquals(new URI(SERVICE_ROOT + "Employees('2')/EmployeeName").toASCIIString(), request.getPathInfo()
+ .getRequestUri().toASCIIString());
ODataPathSegmentImpl pathSegment = new ODataPathSegmentImpl("Employees('2')", null);
assertEquals(pathSegment.getPath(), request.getPathInfo().getODataSegments().get(0).getPath());
@@ -159,7 +161,8 @@ public class BatchRequestParserTest {
ODataRequest retrieveRequest = object.getRequests().get(0);
assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
assertEquals("Age gt 40", retrieveRequest.getQueryParameters().get("$filter"));
- assertEquals(new URI("http://localhost/odata/Employees?$filter=Age%20gt%2040"), retrieveRequest.getPathInfo().getRequestUri());
+ assertEquals(new URI("http://localhost/odata/Employees?$filter=Age%20gt%2040"), retrieveRequest.getPathInfo()
+ .getRequestUri());
} else {
List<ODataRequest> requests = object.getRequests();
for (ODataRequest request : requests) {
@@ -283,7 +286,7 @@ public class BatchRequestParserTest {
public void testNoBoundaryString() throws BatchException {
String batch = "--batch_8194-cf13-1f56" + LF
+ GET_REQUEST
- //+ no boundary string
+ // + no boundary string
+ GET_REQUEST
+ "--batch_8194-cf13-1f56--";
parseInvalidBatchBody(batch);
@@ -371,7 +374,7 @@ public class BatchRequestParserTest {
String batch = "--batch_8194-cf13-1f56" + LF
+ MIME_HEADERS
+ LF
- + /*GET*/"Employees('1')/EmployeeName HTTP/1.1" + LF
+ + /* GET */"Employees('1')/EmployeeName HTTP/1.1" + LF
+ LF
+ "--batch_8194-cf13-1f56--";
parseInvalidBatchBody(batch);
@@ -398,7 +401,7 @@ public class BatchRequestParserTest {
String batch = "--batch_8194-cf13-1f56" + LF
+ "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + LF
+ LF
- + "--changeset_f980-1cb6-94d"/*+"d"*/+ LF
+ + "--changeset_f980-1cb6-94d"/* +"d" */+ LF
+ MIME_HEADERS
+ LF
+ "POST Employees('2') HTTP/1.1" + LF
@@ -451,22 +454,29 @@ public class BatchRequestParserTest {
@Test(expected = BatchException.class)
public void testNoCloseDelimiter3() throws BatchException {
- String batch = "--batch_8194-cf13-1f56" + LF + GET_REQUEST + "--batch_8194-cf13-1f56-"/*no hash*/;
+ String batch = "--batch_8194-cf13-1f56" + LF + GET_REQUEST + "--batch_8194-cf13-1f56-"/* no hash */;
parseInvalidBatchBody(batch);
}
@Test
public void testAcceptHeaders() throws BatchException, URISyntaxException {
- String batch = "--batch_8194-cf13-1f56" + LF
- + MIME_HEADERS
- + LF
- + "GET Employees('2')/EmployeeName HTTP/1.1" + LF
- + "Content-Length: 100000" + LF
- + "Content-Type: application/json;odata=verbose" + LF
- + "Accept: application/xml;q=0.3, application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.001" + LF
- + LF
- + LF
- + "--batch_8194-cf13-1f56--";
+ String batch =
+ "--batch_8194-cf13-1f56"
+ + LF
+ + MIME_HEADERS
+ + LF
+ + "GET Employees('2')/EmployeeName HTTP/1.1"
+ + LF
+ + "Content-Length: 100000"
+ + LF
+ + "Content-Type: application/json;odata=verbose"
+ + LF
+ + "Accept: application/xml;q=0.3, application/atomsvc+xml;q=0.8, " +
+ "application/json;odata=verbose;q=0.5, */*;q=0.001"
+ + LF
+ + LF
+ + LF
+ + "--batch_8194-cf13-1f56--";
List<BatchRequestPart> batchRequestParts = parse(batch);
for (BatchRequestPart multipart : batchRequestParts) {
if (!multipart.isChangeSet()) {
@@ -585,10 +595,13 @@ public class BatchRequestParserTest {
} else {
for (ODataRequest request : multipart.getRequests()) {
if (ODataHttpMethod.POST.equals(request.getMethod())) {
- assertEquals(CONTENT_ID_REFERENCE, request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID.toLowerCase()));
+ assertEquals(CONTENT_ID_REFERENCE, request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID
+ .toLowerCase()));
} else if (ODataHttpMethod.PUT.equals(request.getMethod())) {
- assertEquals(PUT_MIME_HEADER_CONTENT_ID, request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID.toLowerCase()));
- assertEquals(PUT_REQUEST_HEADER_CONTENT_ID, request.getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase()));
+ assertEquals(PUT_MIME_HEADER_CONTENT_ID, request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID
+ .toLowerCase()));
+ assertEquals(PUT_REQUEST_HEADER_CONTENT_ID, request
+ .getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase()));
assertNull(request.getPathInfo().getRequestUri());
assertEquals("$" + CONTENT_ID_REFERENCE, request.getPathInfo().getODataSegments().get(0).getPath());
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java
index 61e6709..1331e73 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java
index 7936051..06daa2a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -152,7 +152,7 @@ public class BatchResponseParserTest {
@Test(expected = BatchException.class)
public void testInvalidContentType() throws BatchException {
String putResponse = "--batch_123" + LF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + LF //Missing boundary parameter
+ + "Content-Type: " + HttpContentType.MULTIPART_MIXED + LF // Missing boundary parameter
+ LF
+ "--changeset_12ks93js84d" + LF
+ "Content-Type: application/http" + LF
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseWriterTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseWriterTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseWriterTest.java
index 8ea770a..ea7d2bb 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseWriterTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseWriterTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -72,7 +72,8 @@ public class BatchResponseWriterTest {
@Test
public void testResponse() throws BatchException, IOException {
List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
- ODataResponse response = ODataResponse.entity("Walter Winter").status(HttpStatusCodes.OK).contentHeader("application/json").build();
+ ODataResponse response =
+ ODataResponse.entity("Walter Winter").status(HttpStatusCodes.OK).contentHeader("application/json").build();
List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
responses.add(response);
parts.add(BatchResponsePart.responses(responses).changeSet(false).build());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
index 14cac0f..439bb89 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.commons;
@@ -77,7 +77,7 @@ public class ContentTypeTest extends BaseTest {
assertFalse(ContentType.isParseable("application /atom+xml; charset=UTF-8"));
//
assertFalse(ContentType.isParseable("app/app/moreapp"));
- //assertFalse(ContentType.isParseable("application/atom+xml; charset = UTF-8"));
+ // assertFalse(ContentType.isParseable("application/atom+xml; charset = UTF-8"));
assertFalse(ContentType.isParseable(null));
assertFalse(ContentType.isParseable(""));
assertFalse(ContentType.isParseable("hugo"));
@@ -94,7 +94,7 @@ public class ContentTypeTest extends BaseTest {
assertFalse(ContentType.isParseable("application /atom+xml; charset=UTF-8"));
//
assertNull(ContentType.parse("app/app/moreapp"));
- //assertFalse(ContentType.isParseable("application/atom+xml; charset = UTF-8"));
+ // assertFalse(ContentType.isParseable("application/atom+xml; charset = UTF-8"));
assertNull(ContentType.parse(null));
assertNull(ContentType.parse("hugo"));
assertNull(ContentType.parse("hugo"));
@@ -126,14 +126,14 @@ public class ContentTypeTest extends BaseTest {
List<ContentType> contentTypes = ContentType.createAsCustom(Arrays.asList("custom", "image/jpeg"));
Assert.assertEquals(2, contentTypes.size());
-
- for (ContentType contentType: contentTypes) {
- if(contentType.getType().equals("custom")) {
+
+ for (ContentType contentType : contentTypes) {
+ if (contentType.getType().equals("custom")) {
assertEquals("custom", contentType.getType());
assertNull(contentType.getSubtype());
assertEquals("custom", contentType.toString());
assertEquals(ODataFormat.CUSTOM, contentType.getODataFormat());
- } else if(contentType.getType().equals("image")) {
+ } else if (contentType.getType().equals("image")) {
assertEquals("image", contentType.getType());
assertEquals("jpeg", contentType.getSubtype());
assertEquals("image/jpeg", contentType.toString());
@@ -241,11 +241,13 @@ public class ContentTypeTest extends BaseTest {
/**
* See: RFC 2616:
- * The type, subtype, and parameter attribute names are case-insensitive. Parameter values might or might not be case-sensitive,
- * depending on the semantics of the parameter name. Linear white space (LWS) MUST NOT be used between the type and subtype,
+ * The type, subtype, and parameter attribute names are case-insensitive. Parameter values might or might not be
+ * case-sensitive,
+ * depending on the semantics of the parameter name. Linear white space (LWS) MUST NOT be used between the type and
+ * subtype,
* nor between an attribute and its value.
* </p>
- * @throws Throwable
+ * @throws Throwable
*/
@Test
public void testContentTypeCreationInvalidWithSpaces() throws Throwable {
@@ -254,7 +256,9 @@ public class ContentTypeTest extends BaseTest {
failContentTypeCreation("app / space", IllegalArgumentException.class);
}
- private void failContentTypeCreation(final String contentType, final Class<? extends Exception> expectedExceptionClass) throws Exception {
+ private void
+ failContentTypeCreation(final String contentType, final Class<? extends Exception> expectedExceptionClass)
+ throws Exception {
try {
ContentType.create(contentType);
Assert.fail("Expected exception class " + expectedExceptionClass +
@@ -366,7 +370,8 @@ public class ContentTypeTest extends BaseTest {
@Test
public void testContentTypeCreationFromStrings() {
- List<ContentType> types = ContentType.create(Arrays.asList("type/subtype", "application/xml", "application/json;key=value"));
+ List<ContentType> types =
+ ContentType.create(Arrays.asList("type/subtype", "application/xml", "application/json;key=value"));
assertEquals(3, types.size());
@@ -392,7 +397,8 @@ public class ContentTypeTest extends BaseTest {
@Test(expected = IllegalArgumentException.class)
public void testContentTypeCreationFromStringsFail() {
- List<ContentType> types = ContentType.create(Arrays.asList("type/subtype", "application/xml", "application/json/FAIL;key=value"));
+ List<ContentType> types =
+ ContentType.create(Arrays.asList("type/subtype", "application/xml", "application/json/FAIL;key=value"));
assertEquals(3, types.size());
}
@@ -471,27 +477,27 @@ public class ContentTypeTest extends BaseTest {
assertEquals("type/subtype;key1=value1;key2=value2", mt.toString());
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testFormatParserInValidInputOnlyType() {
ContentType.create("aaa");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testFormatParserInValidInputOnlyTypeWithSepartor() {
ContentType.create("aaa/");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testFormatParserInValidInputOnlySubTypeWithSepartor() {
ContentType.create("/aaa");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testFormatParserInValidInputOnlySepartor() {
ContentType.create("/");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testFormatParserInValidInputEmpty() {
ContentType.create("");
}
@@ -529,7 +535,7 @@ public class ContentTypeTest extends BaseTest {
assertEquals(2, t.getParameters().size());
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testFormatParserInValidInputTypeNullPara() {
ContentType.create("aaa;x=y;a");
}
@@ -973,14 +979,14 @@ public class ContentTypeTest extends BaseTest {
@Test
public void testQParameterSort() {
- validateSort(Arrays.asList("a1/b1;q=0.2", "a2/b2;q=0.5", "a3/b3;q=0.333"), 1,2,0);
- validateSort(Arrays.asList("a1/b1;q=0", "a2/b2;q=0.5", "a3/b3;q=0.333"), 1,2,0);
- validateSort(Arrays.asList("a1/b1;q=1", "a2/b2;q=0.5", "a3/b3;q=0.333"), 0,1,2);
- validateSort(Arrays.asList("a1/b1;q=1", "a2/b2;q=0.5", "a3/b3;q=1.333"), 0,1,2);
- validateSort(Arrays.asList("a1/b1;q=0.2", "a2/b2;q=0.9", "a3/b3"), 2,1,0);
+ validateSort(Arrays.asList("a1/b1;q=0.2", "a2/b2;q=0.5", "a3/b3;q=0.333"), 1, 2, 0);
+ validateSort(Arrays.asList("a1/b1;q=0", "a2/b2;q=0.5", "a3/b3;q=0.333"), 1, 2, 0);
+ validateSort(Arrays.asList("a1/b1;q=1", "a2/b2;q=0.5", "a3/b3;q=0.333"), 0, 1, 2);
+ validateSort(Arrays.asList("a1/b1;q=1", "a2/b2;q=0.5", "a3/b3;q=1.333"), 0, 1, 2);
+ validateSort(Arrays.asList("a1/b1;q=0.2", "a2/b2;q=0.9", "a3/b3"), 2, 1, 0);
}
- private void validateSort(List<String> toSort, int ... expectedSequence) {
+ private void validateSort(final List<String> toSort, final int... expectedSequence) {
List<String> expected = new ArrayList<String>();
for (int i : expectedSequence) {
expected.add(toSort.get(i));
@@ -991,7 +997,7 @@ public class ContentTypeTest extends BaseTest {
assertEquals(expected.get(i), toSort.get(i));
}
}
-
+
private Map<String, String> addParameters(final String... content) {
Map<String, String> map = new HashMap<String, String>();
for (int i = 0; i < content.length - 1; i += 2) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java
index 1a33259..a9c8299 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.commons;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java
index a313828..f22dea0 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.commons;
@@ -28,7 +28,7 @@ import org.junit.Test;
/**
* Tests for percent-encoding.
- *
+ *
*/
public class EncoderTest extends BaseTest {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java
index 3a147cd..954a310 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
index 31ad5e0..f13d8a4 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
@@ -58,7 +58,7 @@ import org.junit.Test;
/**
* Tests for the debug information output.
- *
+ *
*/
public class ODataDebugResponseWrapperTest extends BaseTest {
@@ -88,7 +88,8 @@ public class ODataDebugResponseWrapperTest extends BaseTest {
return response;
}
- private RuntimeMeasurement mockRuntimeMeasurement(final String method, final long startTime, final long stopTime, final long startMemory, final long stopMemory) {
+ private RuntimeMeasurement mockRuntimeMeasurement(final String method, final long startTime, final long stopTime,
+ final long startMemory, final long stopMemory) {
RuntimeMeasurement measurement = mock(RuntimeMeasurement.class);
when(measurement.getClassName()).thenReturn("class");
when(measurement.getMethodName()).thenReturn(method);
@@ -108,11 +109,14 @@ public class ODataDebugResponseWrapperTest extends BaseTest {
final ODataContext context = mockContext(ODataHttpMethod.PUT);
final ODataResponse wrappedResponse = mockResponse(HttpStatusCodes.NO_CONTENT, null, null);
- final ODataResponse response = new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ final ODataResponse response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
String actualJson = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertEquals(EXPECTED.replace(ODataHttpMethod.GET.name(), ODataHttpMethod.PUT.name())
- .replace(Integer.toString(HttpStatusCodes.OK.getStatusCode()), Integer.toString(HttpStatusCodes.NO_CONTENT.getStatusCode()))
+ .replace(Integer.toString(HttpStatusCodes.OK.getStatusCode()),
+ Integer.toString(HttpStatusCodes.NO_CONTENT.getStatusCode()))
.replace(HttpStatusCodes.OK.getInfo(), HttpStatusCodes.NO_CONTENT.getInfo()),
actualJson);
}
@@ -122,25 +126,34 @@ public class ODataDebugResponseWrapperTest extends BaseTest {
final ODataContext context = mockContext(ODataHttpMethod.GET);
ODataResponse wrappedResponse = mockResponse(HttpStatusCodes.OK, "\"test\"", HttpContentType.APPLICATION_JSON);
- ODataResponse response = new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ ODataResponse response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
String entity = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertEquals(EXPECTED.replace("{\"request", "{\"body\":\"test\",\"request")
- .replace("}}}", "},\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"" + HttpContentType.APPLICATION_JSON + "\"}}}"),
+ .replace("}}}",
+ "},\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"" + HttpContentType.APPLICATION_JSON + "\"}}}"),
entity);
wrappedResponse = mockResponse(HttpStatusCodes.OK, "test", HttpContentType.TEXT_PLAIN);
- response = new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
entity = StringHelper.inputStreamToString((InputStream) response.getEntity());
- assertEquals(EXPECTED.replace("{\"request", "{\"body\":\"test\",\"request")
- .replace("}}}", "},\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"" + HttpContentType.TEXT_PLAIN + "\"}}}"),
+ assertEquals(
+ EXPECTED.replace("{\"request", "{\"body\":\"test\",\"request")
+ .replace("}}}",
+ "},\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"" + HttpContentType.TEXT_PLAIN + "\"}}}"),
entity);
wrappedResponse = mockResponse(HttpStatusCodes.OK, null, "image/png");
when(wrappedResponse.getEntity()).thenReturn(new ByteArrayInputStream("test".getBytes()));
- response = new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
entity = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertEquals(EXPECTED.replace("{\"request", "{\"body\":\"dGVzdA==\",\"request")
.replace("}}}", "},\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"image/png\"}}}"),
@@ -156,11 +169,15 @@ public class ODataDebugResponseWrapperTest extends BaseTest {
final ODataResponse wrappedResponse = mockResponse(HttpStatusCodes.OK, null, HttpContentType.APPLICATION_JSON);
- final ODataResponse response = new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ final ODataResponse response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
String entity = StringHelper.inputStreamToString((InputStream) response.getEntity());
- assertEquals(EXPECTED.replace("},\"response", ",\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"" + HttpContentType.APPLICATION_JSON + "\"}},\"response")
- .replace("}}}", "},\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"" + HttpContentType.APPLICATION_JSON + "\"}}}"),
+ assertEquals(EXPECTED.replace("},\"response",
+ ",\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"" + HttpContentType.APPLICATION_JSON + "\"}},\"response")
+ .replace("}}}",
+ "},\"headers\":{\"" + HttpHeaders.CONTENT_TYPE + "\":\"" + HttpContentType.APPLICATION_JSON + "\"}}}"),
entity);
}
@@ -192,8 +209,10 @@ public class ODataDebugResponseWrapperTest extends BaseTest {
when(select2.getNavigationPropertySegments()).thenReturn(segments);
when(uriInfo.getSelect()).thenReturn(Arrays.asList(select1, select2));
- final ODataResponse response = new ODataDebugResponseWrapper(context, wrappedResponse, uriInfo, null, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ final ODataResponse response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, uriInfo, null,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
String entity = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertEquals(EXPECTED.replace("}}}",
"}},\"uri\":{\"filter\":{\"nodeType\":\"LITERAL\",\"type\":\"Edm.Boolean\",\"value\":\"true\"},"
@@ -222,8 +241,10 @@ public class ODataDebugResponseWrapperTest extends BaseTest {
when(filterTree.getUriLiteral()).thenReturn("wrong");
when(exception.getFilterTree()).thenReturn(filterTree);
- final ODataResponse response = new ODataDebugResponseWrapper(context, wrappedResponse, uriInfo, exception, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ final ODataResponse response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, uriInfo, exception,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
String entity = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertEquals(EXPECTED.replace("}}}",
"}},\"uri\":{\"error\":{\"filter\":\"wrong\"},\"filter\":null},"
@@ -249,8 +270,10 @@ public class ODataDebugResponseWrapperTest extends BaseTest {
final ODataResponse wrappedResponse = mockResponse(HttpStatusCodes.OK, null, null);
- ODataResponse response = new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ ODataResponse response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), null,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
String entity = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertEquals(EXPECTED.replace("}}}",
"}},\"runtime\":[{\"class\":\"class\",\"method\":\"method\",\"duration\":41,\"memory\":3,"
@@ -279,11 +302,14 @@ public class ODataDebugResponseWrapperTest extends BaseTest {
when(exception.getCause()).thenReturn(innerException);
when(exception.getStackTrace()).thenReturn(Arrays.copyOfRange(stackTrace, 1, 3));
- final ODataResponse response = new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), exception, ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
- .wrapResponse();
+ final ODataResponse response =
+ new ODataDebugResponseWrapper(context, wrappedResponse, mock(UriInfo.class), exception,
+ ODataDebugResponseWrapper.ODATA_DEBUG_JSON)
+ .wrapResponse();
String entity = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertEquals(EXPECTED
- .replace(Integer.toString(HttpStatusCodes.OK.getStatusCode()), Integer.toString(HttpStatusCodes.BAD_REQUEST.getStatusCode()))
+ .replace(Integer.toString(HttpStatusCodes.OK.getStatusCode()),
+ Integer.toString(HttpStatusCodes.BAD_REQUEST.getStatusCode()))
.replace(HttpStatusCodes.OK.getInfo(), HttpStatusCodes.BAD_REQUEST.getInfo())
.replace("}}}", "}},"
+ "\"stacktrace\":{\"exceptions\":[{\"class\":\"" + exception.getClass().getName() + "\","
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java
index 86e6fbb..8d2cfa3 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
[35/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
index 8739b62..aceb6cf 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.commons;
@@ -25,7 +25,7 @@ import java.io.UnsupportedEncodingException;
* percent-encoded UTF-8 representation according to
* <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>
* (with consideration of its predecessor RFC 2396).
- *
+ *
*/
public class Encoder {
@@ -52,8 +52,23 @@ public class Encoder {
private final static String UNRESERVED = "-._~"; // + ALPHA + DIGIT
// RFC 3986 says: "For consistency, URI producers and normalizers should
// use uppercase hexadecimal digits for all percent-encodings."
- private final static String[] hex = { "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", "%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F", "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", "%28", "%29", "%2A", "%2B", "%2C", "%2D", "%2E", "%2F", "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37", "%38", "%39", "%3A", "%3B", "%3C", "%3D", "%3E", "%3F", "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47", "%48", "%49", "%4A", "%4B", "%4C", "%4D", "%4E", "%4F", "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57", "%58", "%59", "%5A", "%5B", "%5C", "%5D", "%5E", "%5F", "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67", "%68", "%69", "%6A", "%6B", "%6C", "%6D", "%6E", "%6F", "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77", "%78", "%79", "%7A", "%7B", "%7C", "%7D", "%7E", "%7F", "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", "%88"
,
- "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F", "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F", "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7", "%A8", "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF", "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7", "%B8", "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF", "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7", "%C8", "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF", "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7", "%D8", "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF", "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7", "%E8", "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF", "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7", "%F8", "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF" };
+ private final static String[] hex = { "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0A",
+ "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", "%18", "%19", "%1A",
+ "%1B", "%1C", "%1D", "%1E", "%1F", "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", "%28", "%29", "%2A",
+ "%2B", "%2C", "%2D", "%2E", "%2F", "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37", "%38", "%39", "%3A",
+ "%3B", "%3C", "%3D", "%3E", "%3F", "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47", "%48", "%49", "%4A",
+ "%4B", "%4C", "%4D", "%4E", "%4F", "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57", "%58", "%59", "%5A",
+ "%5B", "%5C", "%5D", "%5E", "%5F", "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67", "%68", "%69", "%6A",
+ "%6B", "%6C", "%6D", "%6E", "%6F", "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77", "%78", "%79", "%7A",
+ "%7B", "%7C", "%7D", "%7E", "%7F", "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", "%88",
+ "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F", "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98",
+ "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F", "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7", "%A8",
+ "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF", "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7", "%B8",
+ "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF", "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7", "%C8",
+ "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF", "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7", "%D8",
+ "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF", "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7", "%E8",
+ "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF", "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7", "%F8",
+ "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF" };
private static final Encoder encoder = new Encoder(ODATA_UNENCODED);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java
index ae3801a..bb04303 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java
index cdd189f..8b68337 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
@@ -49,7 +49,8 @@ public class DebugInfoBody implements DebugInfo {
final String contentType = response.getContentHeader();
if (contentType.startsWith("image/")) {
if (response.getEntity() instanceof InputStream) {
- jsonStreamWriter.stringValueRaw(Base64.encodeBase64String(getBinaryFromInputStream((InputStream) response.getEntity())));
+ jsonStreamWriter.stringValueRaw(Base64.encodeBase64String(getBinaryFromInputStream((InputStream) response
+ .getEntity())));
} else if (response.getEntity() instanceof String) {
jsonStreamWriter.stringValueRaw(getContentString());
} else {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java
index ec2c9bf..c84f51f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
@@ -52,9 +52,11 @@ public class DebugInfoException implements DebugInfo {
while (throwable != null) {
jsonStreamWriter.beginObject()
.namedStringValueRaw("class", throwable.getClass().getCanonicalName()).separator()
- .namedStringValue("message",
+ .namedStringValue(
+ "message",
throwable instanceof ODataMessageException ?
- MessageService.getMessage(locale, ((ODataMessageException) throwable).getMessageReference()).getText() :
+ MessageService.getMessage(locale, ((ODataMessageException) throwable).getMessageReference())
+ .getText() :
throwable.getLocalizedMessage())
.separator();
@@ -84,7 +86,8 @@ public class DebugInfoException implements DebugInfo {
jsonStreamWriter.endObject();
}
- private static void appendJsonStackTraceElement(final JsonStreamWriter jsonStreamWriter, final StackTraceElement stackTraceElement) throws IOException {
+ private static void appendJsonStackTraceElement(final JsonStreamWriter jsonStreamWriter,
+ final StackTraceElement stackTraceElement) throws IOException {
jsonStreamWriter.beginObject()
.namedStringValueRaw("class", stackTraceElement.getClassName()).separator()
.namedStringValueRaw("method", stackTraceElement.getMethodName()).separator()
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
index c99a3f3..94680e0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java
index aa0d8da..154ba1b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java
index 65ab05a..fadde0c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
@@ -121,7 +121,8 @@ public class DebugInfoRuntime implements DebugInfo {
appendJsonChildren(jsonStreamWriter, rootNode);
}
- private static void appendJsonNode(final JsonStreamWriter jsonStreamWriter, final RuntimeNode node) throws IOException {
+ private static void appendJsonNode(final JsonStreamWriter jsonStreamWriter, final RuntimeNode node)
+ throws IOException {
jsonStreamWriter.beginObject()
.namedStringValueRaw("class", node.className).separator()
.namedStringValueRaw("method", node.methodName).separator()
@@ -138,7 +139,8 @@ public class DebugInfoRuntime implements DebugInfo {
jsonStreamWriter.endObject();
}
- private static void appendJsonChildren(final JsonStreamWriter jsonStreamWriter, final RuntimeNode node) throws IOException {
+ private static void appendJsonChildren(final JsonStreamWriter jsonStreamWriter, final RuntimeNode node)
+ throws IOException {
jsonStreamWriter.beginArray();
boolean first = true;
for (final RuntimeNode childNode : node.children) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java
index d535ce5..21ca068 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
@@ -111,7 +111,8 @@ public class DebugInfoUri implements DebugInfo {
if (!uriInfo.getExpand().isEmpty() || !uriInfo.getSelect().isEmpty()) {
String expandSelectString;
try {
- ExpandSelectTreeCreator expandSelectCreator = new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
+ ExpandSelectTreeCreator expandSelectCreator =
+ new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
final ExpandSelectTreeNodeImpl expandSelectTree = expandSelectCreator.create();
expandSelectString = expandSelectTree.toJsonString();
} catch (final EdmException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
index 56b45d4..e32973e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.debug;
@@ -42,7 +42,7 @@ import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
/**
* Wraps an OData response into an OData response containing additional
* information useful for support purposes.
- *
+ *
*/
public class ODataDebugResponseWrapper {
@@ -55,7 +55,8 @@ public class ODataDebugResponseWrapper {
private final Exception exception;
private final boolean isJson;
- public ODataDebugResponseWrapper(final ODataContext context, final ODataResponse response, final UriInfo uriInfo, final Exception exception, final String debugValue) {
+ public ODataDebugResponseWrapper(final ODataContext context, final ODataResponse response, final UriInfo uriInfo,
+ final Exception exception, final String debugValue) {
this.context = context;
this.response = response;
this.uriInfo = uriInfo;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java
index 3ba2472..e78e8b6 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.edm.EdmTypeKind;
/**
* Abstract implementation of the EDM simple-type interface.
- *
+ *
*/
public abstract class AbstractSimpleType implements EdmSimpleType {
@@ -74,7 +74,8 @@ public abstract class AbstractSimpleType implements EdmSimpleType {
}
@Override
- public final <T> T valueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ public final <T> T valueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
if (value == null) {
if (facets == null || facets.isNullable() == null || facets.isNullable()) {
return null;
@@ -90,10 +91,12 @@ public abstract class AbstractSimpleType implements EdmSimpleType {
return internalValueOfString(value, literalKind, facets, returnType);
}
- protected abstract <T> T internalValueOfString(String value, EdmLiteralKind literalKind, EdmFacets facets, Class<T> returnType) throws EdmSimpleTypeException;
+ protected abstract <T> T internalValueOfString(String value, EdmLiteralKind literalKind, EdmFacets facets,
+ Class<T> returnType) throws EdmSimpleTypeException;
@Override
- public final String valueToString(final Object value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ public final String valueToString(final Object value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value == null) {
if (facets == null || facets.isNullable() == null || facets.isNullable()) {
return null;
@@ -110,7 +113,8 @@ public abstract class AbstractSimpleType implements EdmSimpleType {
return literalKind == EdmLiteralKind.URI ? toUriLiteral(result) : result;
}
- protected abstract <T> String internalValueToString(T value, EdmLiteralKind literalKind, EdmFacets facets) throws EdmSimpleTypeException;
+ protected abstract <T> String internalValueToString(T value, EdmLiteralKind literalKind, EdmFacets facets)
+ throws EdmSimpleTypeException;
@Override
public String toUriLiteral(final String literal) throws EdmSimpleTypeException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java
index a20d2e5..6974ed9 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the internal simple type Bit.
- *
+ *
*/
public class Bit extends AbstractSimpleType {
@@ -46,12 +46,14 @@ public class Bit extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
return EdmSByte.getInstance().internalValueOfString(value, literalKind, facets, returnType);
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
return EdmSByte.getInstance().internalValueToString(value, literalKind, facets);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java
index 77455f5..9922cb0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Binary.
- *
+ *
*/
public class EdmBinary extends AbstractSimpleType {
@@ -60,7 +60,8 @@ public class EdmBinary extends AbstractSimpleType {
value.matches("(?:X|binary)'(?:\\p{XDigit}{2})*'") : Base64.isBase64(value);
}
- private static boolean validateMaxLength(final String value, final EdmLiteralKind literalKind, final EdmFacets facets) {
+ private static boolean
+ validateMaxLength(final String value, final EdmLiteralKind literalKind, final EdmFacets facets) {
return facets == null || facets.getMaxLength() == null ? true :
literalKind == EdmLiteralKind.URI ?
// In URI representation, each byte is represented as two hexadecimal digits;
@@ -70,7 +71,8 @@ public class EdmBinary extends AbstractSimpleType {
// In default representation, every three bytes are represented as four base-64 characters.
// Additionally, there could be up to two padding "=" characters if the number of bytes is
// not a multiple of three, and there could be carriage return/line feed combinations.
- facets.getMaxLength() >= value.length() * 3 / 4 - (value.endsWith("==") ? 2 : value.endsWith("=") ? 1 : 0) - crlfLength(value);
+ facets.getMaxLength() >= value.length() * 3 / 4 - (value.endsWith("==") ? 2 : value.endsWith("=") ? 1 : 0)
+ - crlfLength(value);
}
private static int crlfLength(final String value) {
@@ -87,7 +89,8 @@ public class EdmBinary extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
if (!validateLiteral(value, literalKind)) {
throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT.addContent(value));
}
@@ -120,7 +123,8 @@ public class EdmBinary extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
byte[] byteArrayValue;
if (value instanceof byte[]) {
byteArrayValue = (byte[]) value;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java
index a325101..3802a00 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Boolean.
- *
+ *
*/
public class EdmBoolean extends AbstractSimpleType {
@@ -58,7 +58,8 @@ public class EdmBoolean extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
if (validateLiteral(value)) {
if (returnType.isAssignableFrom(Boolean.class)) {
return returnType.cast(Boolean.valueOf("true".equals(value) || "1".equals(value)));
@@ -71,7 +72,8 @@ public class EdmBoolean extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof Boolean) {
return Boolean.toString((Boolean) value);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java
index 909eef2..ab936aa 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Byte.
- *
+ *
*/
public class EdmByte extends AbstractSimpleType {
@@ -48,7 +48,8 @@ public class EdmByte extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
Short valueShort;
try {
valueShort = Short.parseShort(value);
@@ -65,7 +66,8 @@ public class EdmByte extends AbstractSimpleType {
if (valueShort <= Byte.MAX_VALUE) {
return returnType.cast(valueShort.byteValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (returnType.isAssignableFrom(Integer.class)) {
return returnType.cast(valueShort.intValue());
@@ -77,7 +79,8 @@ public class EdmByte extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof Byte || value instanceof Short || value instanceof Integer || value instanceof Long) {
if (((Number) value).longValue() >= 0 && ((Number) value).longValue() <= 255) {
return value.toString();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java
index d1bfedd..1e47e41 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type DateTime.
- *
+ *
*/
public class EdmDateTime extends AbstractSimpleType {
@@ -50,7 +50,8 @@ public class EdmDateTime extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
// In JSON, we allow also the XML literal form, so there is on purpose
// no exception if the JSON pattern does not match.
if (literalKind == EdmLiteralKind.JSON) {
@@ -102,14 +103,14 @@ public class EdmDateTime extends AbstractSimpleType {
}
/**
- * Parses a formatted date/time value and sets the values of a
- * {@link Calendar} object accordingly.
- * @param value the formatted date/time value as String
- * @param facets additional constraints for parsing (optional)
+ * Parses a formatted date/time value and sets the values of a {@link Calendar} object accordingly.
+ * @param value the formatted date/time value as String
+ * @param facets additional constraints for parsing (optional)
* @param dateTimeValue the Calendar object to be set to the parsed value
* @throws EdmSimpleTypeException
*/
- protected static void parseLiteral(final String value, final EdmFacets facets, final Calendar dateTimeValue) throws EdmSimpleTypeException {
+ protected static void parseLiteral(final String value, final EdmFacets facets, final Calendar dateTimeValue)
+ throws EdmSimpleTypeException {
final Matcher matcher = PATTERN.matcher(value);
if (!matcher.matches()) {
throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT.addContent(value));
@@ -137,7 +138,7 @@ public class EdmDateTime extends AbstractSimpleType {
// The Calendar class does not check any values until a get method is called,
// so we do just that to validate the fields set above, not because we want
- // to return something else. For strict checks, the lenient mode is switched
+ // to return something else. For strict checks, the lenient mode is switched
// off temporarily.
dateTimeValue.setLenient(false);
try {
@@ -149,7 +150,8 @@ public class EdmDateTime extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
long timeInMillis;
if (value instanceof Date) {
timeInMillis = ((Date) value).getTime();
@@ -203,7 +205,8 @@ public class EdmDateTime extends AbstractSimpleType {
result.append((char) ('0' + number % 10));
}
- protected static void appendMilliseconds(final StringBuilder result, final long milliseconds, final EdmFacets facets) throws IllegalArgumentException {
+ protected static void appendMilliseconds(final StringBuilder result, final long milliseconds, final EdmFacets facets)
+ throws IllegalArgumentException {
final int digits = milliseconds % 1000 == 0 ? 0 : milliseconds % 100 == 0 ? 1 : milliseconds % 10 == 0 ? 2 : 3;
if (digits > 0) {
result.append('.');
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
index bb3295b..6c01ac0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -31,9 +31,10 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type DateTimeOffset.
*
- * Details about parsing of time strings to {@link EdmDateTimeOffset} objects can be found in {@link org.apache.olingo.odata2.api.edm.EdmSimpleType} documentation.
+ * Details about parsing of time strings to {@link EdmDateTimeOffset} objects can be found in
+ * {@link org.apache.olingo.odata2.api.edm.EdmSimpleType} documentation.
+ *
*
- *
*/
public class EdmDateTimeOffset extends AbstractSimpleType {
@@ -55,10 +56,12 @@ public class EdmDateTimeOffset extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
if (literalKind == EdmLiteralKind.URI) {
if (value.length() > 16 && value.startsWith("datetimeoffset'") && value.endsWith("'")) {
- return internalValueOfString(value.substring(15, value.length() - 1), EdmLiteralKind.DEFAULT, facets, returnType);
+ return internalValueOfString(value.substring(15, value.length() - 1), EdmLiteralKind.DEFAULT, facets,
+ returnType);
} else {
throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT.addContent(value));
}
@@ -100,13 +103,16 @@ public class EdmDateTimeOffset extends AbstractSimpleType {
throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT.addContent(value));
}
- final String timeZoneOffset = matcher.group(1) != null && matcher.group(2) != null && !matcher.group(2).matches("[-+]0+:0+") ? matcher.group(2) : null;
+ final String timeZoneOffset =
+ matcher.group(1) != null && matcher.group(2) != null && !matcher.group(2).matches("[-+]0+:0+") ? matcher
+ .group(2) : null;
dateTimeValue = Calendar.getInstance(TimeZone.getTimeZone("GMT" + timeZoneOffset));
if (dateTimeValue.get(Calendar.ZONE_OFFSET) == 0 && timeZoneOffset != null) {
throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT.addContent(value));
}
dateTimeValue.clear();
- EdmDateTime.parseLiteral(value.substring(0, matcher.group(1) == null ? value.length() : matcher.start(1)), facets, dateTimeValue);
+ EdmDateTime.parseLiteral(value.substring(0, matcher.group(1) == null ? value.length() : matcher.start(1)),
+ facets, dateTimeValue);
}
if (returnType.isAssignableFrom(Calendar.class)) {
@@ -121,7 +127,8 @@ public class EdmDateTimeOffset extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
Long milliSeconds; // number of milliseconds since 1970-01-01T00:00:00Z
int offset; // offset in milliseconds from GMT to the requested time zone
if (value instanceof Date) {
@@ -150,7 +157,8 @@ public class EdmDateTimeOffset extends AbstractSimpleType {
return "/Date(" + milliSeconds + (offset == 0 ? "" : String.format("%+05d", offsetInMinutes)) + ")/";
} else {
- final String localTimeString = EdmDateTime.getInstance().valueToString(milliSeconds, EdmLiteralKind.DEFAULT, facets);
+ final String localTimeString =
+ EdmDateTime.getInstance().valueToString(milliSeconds, EdmLiteralKind.DEFAULT, facets);
final int offsetHours = offsetInMinutes / 60;
final int offsetMinutes = Math.abs(offsetInMinutes % 60);
final String offsetString = offset == 0 ? "Z" : String.format("%+03d:%02d", offsetHours, offsetMinutes);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
index dfec75a..91178a0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -30,14 +30,15 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Decimal.
- *
+ *
*/
public class EdmDecimal extends AbstractSimpleType {
// value-range limitation according to the CSDL document
private static final int MAX_DIGITS = 29;
- private static final Pattern PATTERN = Pattern.compile("(?:\\+|-)?(?:0*(\\p{Digit}{1,29}?))(?:\\.(\\p{Digit}{1,29}?)0*)?(M|m)?");
+ private static final Pattern PATTERN = Pattern
+ .compile("(?:\\+|-)?(?:0*(\\p{Digit}{1,29}?))(?:\\.(\\p{Digit}{1,29}?)0*)?(M|m)?");
private static final EdmDecimal instance = new EdmDecimal();
public static EdmDecimal getInstance() {
@@ -96,7 +97,8 @@ public class EdmDecimal extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
if (!validateLiteral(value, literalKind)) {
throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT.addContent(value));
}
@@ -113,13 +115,15 @@ public class EdmDecimal extends AbstractSimpleType {
if (BigDecimal.valueOf(valueBigDecimal.doubleValue()).compareTo(valueBigDecimal) == 0) {
return returnType.cast(valueBigDecimal.doubleValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (returnType.isAssignableFrom(Float.class)) {
if (BigDecimal.valueOf(valueBigDecimal.floatValue()).compareTo(valueBigDecimal) == 0) {
return returnType.cast(valueBigDecimal.floatValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else {
try {
@@ -137,15 +141,18 @@ public class EdmDecimal extends AbstractSimpleType {
throw new EdmSimpleTypeException(EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED.addContent(returnType));
}
} catch (final ArithmeticException e) {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType), e);
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType), e);
}
}
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
String result;
- if (value instanceof Long || value instanceof Integer || value instanceof Short || value instanceof Byte || value instanceof BigInteger) {
+ if (value instanceof Long || value instanceof Integer || value instanceof Short || value instanceof Byte
+ || value instanceof BigInteger) {
result = value.toString();
final int digits = result.startsWith("-") ? result.length() - 1 : result.length();
if (digits > MAX_DIGITS) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
index 824e1c5..cbf60b6 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Double.
- *
+ *
*/
public class EdmDouble extends AbstractSimpleType {
@@ -65,7 +65,8 @@ public class EdmDouble extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
String valueString = value;
Double result = null;
// Handle special values first.
@@ -102,10 +103,12 @@ public class EdmDouble extends AbstractSimpleType {
if (result.floatValue() == result) {
return returnType.cast(result.floatValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (result.isInfinite() || result.isNaN()) {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
} else {
try {
final BigDecimal valueBigDecimal = new BigDecimal(valueString);
@@ -124,13 +127,15 @@ public class EdmDouble extends AbstractSimpleType {
}
} catch (final ArithmeticException e) {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType), e);
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType), e);
}
}
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof Long) {
if (Math.abs((Long) value) < Math.pow(10, MAX_PRECISION)) {
return value.toString();
@@ -141,10 +146,12 @@ public class EdmDouble extends AbstractSimpleType {
return value.toString();
} else if (value instanceof Double) {
final String result = value.toString();
- return ((Double) value).isInfinite() ? result.toUpperCase(Locale.ROOT).substring(0, value.toString().length() - 5) : result;
+ return ((Double) value).isInfinite() ? result.toUpperCase(Locale.ROOT)
+ .substring(0, value.toString().length() - 5) : result;
} else if (value instanceof Float) {
final String result = value.toString();
- return ((Float) value).isInfinite() ? result.toUpperCase(Locale.ROOT).substring(0, value.toString().length() - 5) : result;
+ return ((Float) value).isInfinite() ? result.toUpperCase(Locale.ROOT).substring(0, value.toString().length() - 5)
+ : result;
} else if (value instanceof BigDecimal) {
if (((BigDecimal) value).precision() <= MAX_PRECISION && Math.abs(((BigDecimal) value).scale()) <= MAX_SCALE) {
return ((BigDecimal) value).toString();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java
index d60815a..dadd3b6 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Guid.
- *
+ *
*/
public class EdmGuid extends AbstractSimpleType {
@@ -54,7 +54,8 @@ public class EdmGuid extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
UUID result;
if (validateLiteral(value, literalKind)) {
result = UUID.fromString(
@@ -71,7 +72,8 @@ public class EdmGuid extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof UUID) {
return ((UUID) value).toString();
} else {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java
index 1de243e..eae2bde 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -68,11 +68,12 @@ public abstract class EdmImpl implements Edm {
edmEntityContainer = createEntityContainer(name);
if (edmEntityContainer != null) {
if (name == null && edmEntityContainers.containsKey(edmEntityContainer.getName())) {
- //ensure that the same default entity container is stored in the HashMap under null and its name
+ // ensure that the same default entity container is stored in the HashMap under null and its name
edmEntityContainer = edmEntityContainers.get(edmEntityContainer.getName());
edmEntityContainers.put(name, edmEntityContainer);
- } else if (edmEntityContainers.containsKey(null) && edmEntityContainers.get(null) != null && name.equals(edmEntityContainers.get(null).getName())) {
- //ensure that the same default entity container is stored in the HashMap under null and its name
+ } else if (edmEntityContainers.containsKey(null) && edmEntityContainers.get(null) != null
+ && name.equals(edmEntityContainers.get(null).getName())) {
+ // ensure that the same default entity container is stored in the HashMap under null and its name
edmEntityContainer = edmEntityContainers.get(null);
edmEntityContainers.put(name, edmEntityContainer);
} else {
[36/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHandlerImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHandlerImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHandlerImpl.java
index 8869a33..d2d4cee 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHandlerImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHandlerImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -66,8 +66,10 @@ public class BatchHandlerImpl implements BatchHandler {
}
ODataRequest request = batchPart.getRequests().get(0);
ODataRequestHandler handler = createHandler(request);
- String mimeHeaderContentId = request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH));
- String requestHeaderContentId = request.getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH));
+ String mimeHeaderContentId =
+ request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH));
+ String requestHeaderContentId =
+ request.getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH));
ODataResponse response = setContentIdHeader(handler.handle(request), mimeHeaderContentId, requestHeaderContentId);
List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
responses.add(response);
@@ -78,8 +80,10 @@ public class BatchHandlerImpl implements BatchHandler {
@Override
public ODataResponse handleRequest(final ODataRequest suppliedRequest) throws ODataException {
ODataRequest request;
- String mimeHeaderContentId = suppliedRequest.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH));
- String requestHeaderContentId = suppliedRequest.getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH));
+ String mimeHeaderContentId =
+ suppliedRequest.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH));
+ String requestHeaderContentId =
+ suppliedRequest.getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH));
List<PathSegment> odataSegments = suppliedRequest.getPathInfo().getODataSegments();
if (!odataSegments.isEmpty() && odataSegments.get(0).getPath().matches("\\$.*")) {
@@ -109,7 +113,8 @@ public class BatchHandlerImpl implements BatchHandler {
contentIdMap.put("$" + contentId, relLocation);
}
- private ODataRequest modifyRequest(final ODataRequest request, final List<PathSegment> odataSegments) throws ODataException {
+ private ODataRequest modifyRequest(final ODataRequest request, final List<PathSegment> odataSegments)
+ throws ODataException {
String contentId = contentIdMap.get(odataSegments.get(0).getPath());
PathInfoImpl pathInfo = new PathInfoImpl();
try {
@@ -139,15 +144,20 @@ public class BatchHandlerImpl implements BatchHandler {
return modifiedRequest;
}
- private ODataResponse setContentIdHeader(final ODataResponse response, final String mimeHeaderContentId, final String requestHeaderContentId) {
+ private ODataResponse setContentIdHeader(final ODataResponse response, final String mimeHeaderContentId,
+ final String requestHeaderContentId) {
ODataResponse modifiedResponse;
if (requestHeaderContentId != null && mimeHeaderContentId != null) {
- modifiedResponse = ODataResponse.fromResponse(response).header(BatchHelper.REQUEST_HEADER_CONTENT_ID, requestHeaderContentId)
- .header(BatchHelper.MIME_HEADER_CONTENT_ID, mimeHeaderContentId).build();
+ modifiedResponse =
+ ODataResponse.fromResponse(response).header(BatchHelper.REQUEST_HEADER_CONTENT_ID, requestHeaderContentId)
+ .header(BatchHelper.MIME_HEADER_CONTENT_ID, mimeHeaderContentId).build();
} else if (requestHeaderContentId != null) {
- modifiedResponse = ODataResponse.fromResponse(response).header(BatchHelper.REQUEST_HEADER_CONTENT_ID, requestHeaderContentId).build();
+ modifiedResponse =
+ ODataResponse.fromResponse(response).header(BatchHelper.REQUEST_HEADER_CONTENT_ID, requestHeaderContentId)
+ .build();
} else if (mimeHeaderContentId != null) {
- modifiedResponse = ODataResponse.fromResponse(response).header(BatchHelper.MIME_HEADER_CONTENT_ID, mimeHeaderContentId).build();
+ modifiedResponse =
+ ODataResponse.fromResponse(response).header(BatchHelper.MIME_HEADER_CONTENT_ID, mimeHeaderContentId).build();
} else {
return response;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHelper.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHelper.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHelper.java
index 38d02ae..3a64288 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHelper.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchHelper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchQueryPartImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchQueryPartImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchQueryPartImpl.java
index e22a3b3..4833f9f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchQueryPartImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchQueryPartImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
index e223a6e..2404ad8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -61,15 +61,23 @@ public class BatchRequestParser {
private static final String ANY_CHARACTERS = ".*";
private static final Pattern REG_EX_BLANK_LINE = Pattern.compile("(|" + REG_EX_ZERO_OR_MORE_WHITESPACES + ")");
- private static final Pattern REG_EX_HEADER = Pattern.compile("([a-zA-Z\\-]+):" + REG_EX_OPTIONAL_WHITESPACE + "(.*)" + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ private static final Pattern REG_EX_HEADER = Pattern.compile("([a-zA-Z\\-]+):" + REG_EX_OPTIONAL_WHITESPACE + "(.*)"
+ + REG_EX_ZERO_OR_MORE_WHITESPACES);
private static final Pattern REG_EX_VERSION = Pattern.compile("(?:HTTP/[0-9]\\.[0-9])");
- private static final Pattern REG_EX_ANY_BOUNDARY_STRING = Pattern.compile("--" + ANY_CHARACTERS + REG_EX_ZERO_OR_MORE_WHITESPACES);
- private static final Pattern REG_EX_REQUEST_LINE = Pattern.compile("(GET|POST|PUT|DELETE|MERGE|PATCH)\\s(.*)\\s?" + REG_EX_VERSION + REG_EX_ZERO_OR_MORE_WHITESPACES);
- private static final Pattern REG_EX_BOUNDARY_PARAMETER = Pattern.compile(REG_EX_OPTIONAL_WHITESPACE + "boundary=(\".*\"|.*)" + REG_EX_ZERO_OR_MORE_WHITESPACES);
- private static final Pattern REG_EX_CONTENT_TYPE = Pattern.compile(REG_EX_OPTIONAL_WHITESPACE + HttpContentType.MULTIPART_MIXED);
+ private static final Pattern REG_EX_ANY_BOUNDARY_STRING = Pattern.compile("--" + ANY_CHARACTERS
+ + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ private static final Pattern REG_EX_REQUEST_LINE = Pattern.compile("(GET|POST|PUT|DELETE|MERGE|PATCH)\\s(.*)\\s?"
+ + REG_EX_VERSION + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ private static final Pattern REG_EX_BOUNDARY_PARAMETER = Pattern.compile(REG_EX_OPTIONAL_WHITESPACE
+ + "boundary=(\".*\"|.*)" + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ private static final Pattern REG_EX_CONTENT_TYPE = Pattern.compile(REG_EX_OPTIONAL_WHITESPACE
+ + HttpContentType.MULTIPART_MIXED);
private static final Pattern REG_EX_QUERY_PARAMETER = Pattern.compile("((?:\\$|)[^=]+)=([^=]+)");
- private static final String REG_EX_BOUNDARY = "([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+\\s\\(\\),/:=\\?]{1,69}[a-zA-Z0-9_\\-\\.'\\+\\(\\),/:=\\?])\""; // See RFC 2046
+ private static final String REG_EX_BOUNDARY =
+ "([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+\\s\\" +
+ "(\\),/:=\\?]{1,69}[a-zA-Z0-9_\\-\\.'\\+\\(\\),/:=\\?])\""; // See RFC 2046
+
private String baseUri;
private PathInfo batchRequestPathInfo;
private String contentTypeMime;
@@ -137,7 +145,7 @@ public class BatchRequestParser {
return requests;
}
- //The method parses additional information prior to the first boundary delimiter line
+ // The method parses additional information prior to the first boundary delimiter line
private void parsePreamble(final Scanner scanner) {
while (scanner.hasNext() && !scanner.hasNext(REG_EX_ANY_BOUNDARY_STRING)) {
scanner.next();
@@ -145,7 +153,8 @@ public class BatchRequestParser {
}
}
- private BatchRequestPart parseMultipart(final Scanner scanner, final String boundary, final boolean isChangeSet) throws BatchException {
+ private BatchRequestPart parseMultipart(final Scanner scanner, final String boundary, final boolean isChangeSet)
+ throws BatchException {
Map<String, String> mimeHeaders = new HashMap<String, String>();
BatchRequestPart multipart = null;
List<ODataRequest> requests = new ArrayList<ODataRequest>();
@@ -182,7 +191,8 @@ public class BatchRequestParser {
}
List<ODataRequest> changeSetRequests = new LinkedList<ODataRequest>();
parseNewLine(scanner);// mandatory
- Pattern changeSetCloseDelimiter = Pattern.compile("--" + changeSetBoundary + "--" + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ Pattern changeSetCloseDelimiter =
+ Pattern.compile("--" + changeSetBoundary + "--" + REG_EX_ZERO_OR_MORE_WHITESPACES);
while (!scanner.hasNext(changeSetCloseDelimiter)) {
BatchRequestPart part = parseMultipart(scanner, changeSetBoundary, true);
changeSetRequests.addAll(part.getRequests());
@@ -191,7 +201,8 @@ public class BatchRequestParser {
currentLineNumber++;
multipart = new BatchRequestPartImpl(true, changeSetRequests);
} else {
- throw new BatchException(BatchException.INVALID_CONTENT_TYPE.addContent(HttpContentType.MULTIPART_MIXED + " or " + HttpContentType.APPLICATION_HTTP));
+ throw new BatchException(BatchException.INVALID_CONTENT_TYPE.addContent(HttpContentType.MULTIPART_MIXED
+ + " or " + HttpContentType.APPLICATION_HTTP));
}
}
} else if (scanner.hasNext(boundary + REG_EX_ZERO_OR_MORE_WHITESPACES)) {
@@ -199,7 +210,8 @@ public class BatchRequestParser {
throw new BatchException(BatchException.INVALID_BOUNDARY_DELIMITER.addContent(currentLineNumber));
} else if (scanner.hasNext(REG_EX_ANY_BOUNDARY_STRING)) {
currentLineNumber++;
- throw new BatchException(BatchException.NO_MATCH_WITH_BOUNDARY_STRING.addContent(boundary).addContent(currentLineNumber));
+ throw new BatchException(BatchException.NO_MATCH_WITH_BOUNDARY_STRING.addContent(boundary).addContent(
+ currentLineNumber));
} else {
currentLineNumber++;
throw new BatchException(BatchException.MISSING_BOUNDARY_DELIMITER.addContent(currentLineNumber));
@@ -220,7 +232,8 @@ public class BatchRequestParser {
uri = result.group(2).trim();
} else {
currentLineNumber++;
- throw new BatchException(BatchException.INVALID_REQUEST_LINE.addContent(scanner.next()).addContent(currentLineNumber));
+ throw new BatchException(BatchException.INVALID_REQUEST_LINE.addContent(scanner.next()).addContent(
+ currentLineNumber));
}
PathInfo pathInfo = parseRequestUri(uri);
Map<String, String> queryParameters = parseQueryParameters(uri);
@@ -264,7 +277,8 @@ public class BatchRequestParser {
return requestBuilder.build();
} else {
currentLineNumber++;
- throw new BatchException(BatchException.INVALID_REQUEST_LINE.addContent(scanner.next()).addContent(currentLineNumber));
+ throw new BatchException(BatchException.INVALID_REQUEST_LINE.addContent(scanner.next()).addContent(
+ currentLineNumber));
}
}
@@ -301,7 +315,8 @@ public class BatchRequestParser {
}
} else {
currentLineNumber++;
- throw new BatchException(BatchException.INVALID_HEADER.addContent(scanner.next()).addContent(currentLineNumber));
+ throw new BatchException(BatchException.INVALID_HEADER.addContent(scanner.next())
+ .addContent(currentLineNumber));
}
}
return headers;
@@ -497,7 +512,8 @@ public class BatchRequestParser {
} else {
currentLineNumber++;
if (scanner.hasNext()) {
- throw new BatchException(BatchException.MISSING_BLANK_LINE.addContent(scanner.next()).addContent(currentLineNumber));
+ throw new BatchException(BatchException.MISSING_BLANK_LINE.addContent(scanner.next()).addContent(
+ currentLineNumber));
} else {
throw new BatchException(BatchException.TRUNCATED_BODY.addContent(currentLineNumber));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestPartImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestPartImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestPartImpl.java
index 80e5cd8..bbf0c03 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestPartImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestPartImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java
index 3eda8e1..4622d37 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -31,7 +31,10 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
public class BatchRequestWriter {
- private static final String REG_EX_BOUNDARY = "([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+\\s\\(\\),/:=\\?]{1,69}[a-zA-Z0-9_\\-\\.'\\+\\(\\),/:=\\?])\""; // See RFC 2046
+ private static final String REG_EX_BOUNDARY =
+ "([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+\\s\\" +
+ "(\\),/:=\\?]{1,69}[a-zA-Z0-9_\\-\\.'\\+\\(\\),/:=\\?])\""; // See RFC 2046
+
private static final String COLON = ":";
private static final String SP = " ";
private static final String LF = "\r\n";
@@ -50,8 +53,8 @@ public class BatchRequestWriter {
appendChangeSet((BatchChangeSet) batchPart);
} else if (batchPart instanceof BatchQueryPart) {
BatchQueryPart request = (BatchQueryPart) batchPart;
- appendRequestBodyPart(request.getMethod(), request.getUri(), null, request.getHeaders(), request.getContentId());
-
+ appendRequestBodyPart(request.getMethod(), request.getUri(), null, request.getHeaders(),
+ request.getContentId());
}
}
writer.append("--").append(boundary).append("--").append(LF).append(LF);
@@ -65,17 +68,21 @@ public class BatchRequestWriter {
while (boundary.equals(batchBoundary) || !boundary.matches(REG_EX_BOUNDARY)) {
boundary = BatchHelper.generateBoundary("changeset");
}
- writer.append(HttpHeaders.CONTENT_TYPE).append(COLON).append(SP).append(HttpContentType.MULTIPART_MIXED + "; boundary=" + boundary).append(LF).append(LF);
+ writer.append(HttpHeaders.CONTENT_TYPE).append(COLON).append(SP).append(
+ HttpContentType.MULTIPART_MIXED + "; boundary=" + boundary).append(LF).append(LF);
for (BatchChangeSetPart request : batchChangeSet.getChangeSetParts()) {
writer.append("--").append(boundary).append(LF);
- appendRequestBodyPart(request.getMethod(), request.getUri(), request.getBody(), request.getHeaders(), request.getContentId());
+ appendRequestBodyPart(request.getMethod(), request.getUri(), request.getBody(), request.getHeaders(), request
+ .getContentId());
}
writer.append("--").append(boundary).append("--").append(LF).append(LF);
}
- private void appendRequestBodyPart(final String method, final String uri, final String body, final Map<String, String> headers, final String contentId) {
+ private void appendRequestBodyPart(final String method, final String uri, final String body,
+ final Map<String, String> headers, final String contentId) {
boolean isContentLengthPresent = false;
- writer.append(HttpHeaders.CONTENT_TYPE).append(COLON).append(SP).append(HttpContentType.APPLICATION_HTTP).append(LF);
+ writer.append(HttpHeaders.CONTENT_TYPE).append(COLON).append(SP).append(HttpContentType.APPLICATION_HTTP)
+ .append(LF);
writer.append(BatchHelper.HTTP_CONTENT_TRANSFER_ENCODING).append(COLON).append(SP).append("binary").append(LF);
if (contentId != null) {
writer.append(BatchHelper.HTTP_CONTENT_ID).append(COLON).append(SP).append(contentId).append(LF);
@@ -89,7 +96,8 @@ public class BatchRequestWriter {
writer.append(LF);
if (!isContentLengthPresent && body != null && !body.isEmpty()) {
- writer.append(HttpHeaders.CONTENT_LENGTH).append(COLON).append(SP).append(BatchHelper.getBytes(body).length).append(LF);
+ writer.append(HttpHeaders.CONTENT_LENGTH).append(COLON).append(SP).append(BatchHelper.getBytes(body).length)
+ .append(LF);
}
appendHeader(headers);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseParser.java
index 15ce60c..84b90b0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -44,14 +44,21 @@ public class BatchResponseParser {
private static final String ANY_CHARACTERS = ".*";
private static final Pattern REG_EX_BLANK_LINE = Pattern.compile("(|" + REG_EX_ZERO_OR_MORE_WHITESPACES + ")");
- private static final Pattern REG_EX_HEADER = Pattern.compile("([a-zA-Z\\-]+):" + REG_EX_OPTIONAL_WHITESPACE + "(.*)" + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ private static final Pattern REG_EX_HEADER = Pattern.compile("([a-zA-Z\\-]+):" + REG_EX_OPTIONAL_WHITESPACE + "(.*)"
+ + REG_EX_ZERO_OR_MORE_WHITESPACES);
private static final Pattern REG_EX_VERSION = Pattern.compile("(?:HTTP/[0-9]\\.[0-9])");
- private static final Pattern REG_EX_ANY_BOUNDARY_STRING = Pattern.compile("--" + ANY_CHARACTERS + REG_EX_ZERO_OR_MORE_WHITESPACES);
- private static final Pattern REG_EX_STATUS_LINE = Pattern.compile(REG_EX_VERSION + "\\s" + "([0-9]{3})\\s([\\S ]+)" + REG_EX_ZERO_OR_MORE_WHITESPACES);
- private static final Pattern REG_EX_BOUNDARY_PARAMETER = Pattern.compile(REG_EX_OPTIONAL_WHITESPACE + "boundary=(\".*\"|.*)" + REG_EX_ZERO_OR_MORE_WHITESPACES);
- private static final Pattern REG_EX_CONTENT_TYPE = Pattern.compile(REG_EX_OPTIONAL_WHITESPACE + HttpContentType.MULTIPART_MIXED);
+ private static final Pattern REG_EX_ANY_BOUNDARY_STRING = Pattern.compile("--" + ANY_CHARACTERS
+ + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ private static final Pattern REG_EX_STATUS_LINE = Pattern.compile(REG_EX_VERSION + "\\s" + "([0-9]{3})\\s([\\S ]+)"
+ + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ private static final Pattern REG_EX_BOUNDARY_PARAMETER = Pattern.compile(REG_EX_OPTIONAL_WHITESPACE
+ + "boundary=(\".*\"|.*)" + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ private static final Pattern REG_EX_CONTENT_TYPE = Pattern.compile(REG_EX_OPTIONAL_WHITESPACE
+ + HttpContentType.MULTIPART_MIXED);
- private static final String REG_EX_BOUNDARY = "([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+ \\(\\),/:=\\?]{1,69}[a-zA-Z0-9_\\-\\.'\\+\\(\\),/:=\\?])\""; // See RFC 2046
+ private static final String REG_EX_BOUNDARY =
+ "([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+ \\(\\)" +
+ ",/:=\\?]{1,69}[a-zA-Z0-9_\\-\\.'\\+\\(\\),/:=\\?])\""; // See RFC 2046
private String contentTypeMime;
private String boundary;
@@ -100,7 +107,7 @@ public class BatchResponseParser {
}
- //The method parses additional information prior to the first boundary delimiter line
+ // The method parses additional information prior to the first boundary delimiter line
private void parsePreamble(final Scanner scanner) {
while (scanner.hasNext() && !scanner.hasNext(REG_EX_ANY_BOUNDARY_STRING)) {
scanner.next();
@@ -108,7 +115,8 @@ public class BatchResponseParser {
}
}
- private List<BatchSingleResponse> parseMultipart(final Scanner scanner, final String boundary, final boolean isChangeSet) throws BatchException {
+ private List<BatchSingleResponse> parseMultipart(final Scanner scanner, final String boundary,
+ final boolean isChangeSet) throws BatchException {
Map<String, String> mimeHeaders = new HashMap<String, String>();
List<BatchSingleResponse> responses = new ArrayList<BatchSingleResponse>();
if (scanner.hasNext("--" + boundary + REG_EX_ZERO_OR_MORE_WHITESPACES)) {
@@ -142,7 +150,8 @@ public class BatchResponseParser {
throw new BatchException(BatchException.INVALID_CHANGESET_BOUNDARY.addContent(currentLineNumber));
}
parseNewLine(scanner);// mandatory
- Pattern changeSetCloseDelimiter = Pattern.compile("--" + changeSetBoundary + "--" + REG_EX_ZERO_OR_MORE_WHITESPACES);
+ Pattern changeSetCloseDelimiter =
+ Pattern.compile("--" + changeSetBoundary + "--" + REG_EX_ZERO_OR_MORE_WHITESPACES);
while (!scanner.hasNext(changeSetCloseDelimiter)) {
responses.addAll(parseMultipart(scanner, changeSetBoundary, true));
}
@@ -150,7 +159,8 @@ public class BatchResponseParser {
currentLineNumber++;
parseNewLine(scanner);
} else {
- throw new BatchException(BatchException.INVALID_CONTENT_TYPE.addContent(HttpContentType.MULTIPART_MIXED + " or " + HttpContentType.APPLICATION_HTTP));
+ throw new BatchException(BatchException.INVALID_CONTENT_TYPE.addContent(HttpContentType.MULTIPART_MIXED
+ + " or " + HttpContentType.APPLICATION_HTTP));
}
}
} else if (scanner.hasNext(boundary + REG_EX_ZERO_OR_MORE_WHITESPACES)) {
@@ -158,7 +168,8 @@ public class BatchResponseParser {
throw new BatchException(BatchException.INVALID_BOUNDARY_DELIMITER.addContent(currentLineNumber));
} else if (scanner.hasNext(REG_EX_ANY_BOUNDARY_STRING)) {
currentLineNumber++;
- throw new BatchException(BatchException.NO_MATCH_WITH_BOUNDARY_STRING.addContent(boundary).addContent(currentLineNumber));
+ throw new BatchException(BatchException.NO_MATCH_WITH_BOUNDARY_STRING.addContent(boundary).addContent(
+ currentLineNumber));
} else {
currentLineNumber++;
throw new BatchException(BatchException.MISSING_BOUNDARY_DELIMITER.addContent(currentLineNumber));
@@ -167,7 +178,8 @@ public class BatchResponseParser {
}
- private BatchSingleResponseImpl parseResponse(final Scanner scanner, final boolean isChangeSet) throws BatchException {
+ private BatchSingleResponseImpl parseResponse(final Scanner scanner, final boolean isChangeSet)
+ throws BatchException {
BatchSingleResponseImpl response = new BatchSingleResponseImpl();
if (scanner.hasNext(REG_EX_STATUS_LINE)) {
scanner.next(REG_EX_STATUS_LINE);
@@ -180,13 +192,16 @@ public class BatchResponseParser {
statusInfo = result.group(2);
} else {
currentLineNumber++;
- throw new BatchException(BatchException.INVALID_STATUS_LINE.addContent(scanner.next()).addContent(currentLineNumber));
+ throw new BatchException(BatchException.INVALID_STATUS_LINE.addContent(scanner.next()).addContent(
+ currentLineNumber));
}
Map<String, String> headers = parseResponseHeaders(scanner);
parseNewLine(scanner);
String contentLengthHeader = getHeaderValue(headers, HttpHeaders.CONTENT_LENGTH);
- String body = (contentLengthHeader != null) ? parseBody(scanner, Integer.parseInt(contentLengthHeader)) : parseBody(scanner);
+ String body =
+ (contentLengthHeader != null) ? parseBody(scanner, Integer.parseInt(contentLengthHeader))
+ : parseBody(scanner);
response.setStatusCode(statusCode);
response.setStatusInfo(statusInfo);
response.setHeaders(headers);
@@ -194,7 +209,8 @@ public class BatchResponseParser {
response.setBody(body);
} else {
currentLineNumber++;
- throw new BatchException(BatchException.INVALID_STATUS_LINE.addContent(scanner.next()).addContent(currentLineNumber));
+ throw new BatchException(BatchException.INVALID_STATUS_LINE.addContent(scanner.next()).addContent(
+ currentLineNumber));
}
return response;
}
@@ -244,7 +260,8 @@ public class BatchResponseParser {
}
} else {
currentLineNumber++;
- throw new BatchException(BatchException.INVALID_HEADER.addContent(scanner.next()).addContent(currentLineNumber));
+ throw new BatchException(BatchException.INVALID_HEADER.addContent(scanner.next())
+ .addContent(currentLineNumber));
}
}
return headers;
@@ -332,7 +349,8 @@ public class BatchResponseParser {
} else {
currentLineNumber++;
if (scanner.hasNext()) {
- throw new BatchException(BatchException.MISSING_BLANK_LINE.addContent(scanner.next()).addContent(currentLineNumber));
+ throw new BatchException(BatchException.MISSING_BLANK_LINE.addContent(scanner.next()).addContent(
+ currentLineNumber));
} else {
throw new BatchException(BatchException.TRUNCATED_BODY.addContent(currentLineNumber));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponsePartImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponsePartImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponsePartImpl.java
index 486bbdf..3d6e6db 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponsePartImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponsePartImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseWriter.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseWriter.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseWriter.java
index ae0c07b..be189d3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseWriter.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchResponseWriter.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -57,7 +57,8 @@ public class BatchResponseWriter {
writer.append("--").append(boundary).append("--").append(LF).append(LF);
}
- private void appendResponsePart(final List<BatchResponsePart> batchResponseParts, final String boundary) throws BatchException {
+ private void appendResponsePart(final List<BatchResponsePart> batchResponseParts, final String boundary)
+ throws BatchException {
for (BatchResponsePart batchResponsePart : batchResponseParts) {
writer.append("--").append(boundary).append(LF);
if (batchResponsePart.isChangeSet()) {
@@ -100,7 +101,8 @@ public class BatchResponseWriter {
private void appendHeader(final ODataResponse response) {
for (String name : response.getHeaderNames()) {
- if (!BatchHelper.MIME_HEADER_CONTENT_ID.equalsIgnoreCase(name) && !BatchHelper.REQUEST_HEADER_CONTENT_ID.equalsIgnoreCase(name)) {
+ if (!BatchHelper.MIME_HEADER_CONTENT_ID.equalsIgnoreCase(name)
+ && !BatchHelper.REQUEST_HEADER_CONTENT_ID.equalsIgnoreCase(name)) {
writer.append(name).append(COLON).append(SP).append(response.getHeader(name)).append(LF);
} else if (BatchHelper.REQUEST_HEADER_CONTENT_ID.equalsIgnoreCase(name)) {
writer.append(BatchHelper.HTTP_CONTENT_ID).append(COLON).append(SP)
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchSingleResponseImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchSingleResponseImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchSingleResponseImpl.java
index 337b550..85c09ca 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchSingleResponseImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchSingleResponseImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
index 5a174e2..6a797ad 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.commons;
@@ -36,42 +36,43 @@ import java.util.regex.Pattern;
/**
* Internally used {@link ContentType} for OData library.
*
- * For more details on format and content of a {@link ContentType} see
- * <code>Media Type</code> format as defined in <code>RFC 2616 chapter 3.7 (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html)</code>.
+ * For more details on format and content of a {@link ContentType} see
+ * <code>Media Type</code> format as defined in <code>RFC 2616 chapter 3.7
+ * (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html)</code>.
* <pre>
* <code>
- * media-type = type "/" subtype *( ";" parameter )
- * type = token
- * subtype = token
+ * media-type = type "/" subtype *( ";" parameter )
+ * type = token
+ * subtype = token
* </code>
* </pre>
*
- * Especially for <code>Accept</code> Header as defined in
+ * Especially for <code>Accept</code> Header as defined in
* <code>RFC 2616 chapter 14.1 (http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html)</code>:
* <pre>
* <code>
* Accept = "Accept" ":"
- * #( media-range [ accept-params ] )
- * media-range = ( "* /*"
- * | ( type "/" "*" )
- * | ( type "/" subtype )
- * ) *( ";" parameter )
- * accept-params = ";" "q" "=" qvalue *( accept-extension )
- * accept-extension = ";" token [ "=" ( token | quoted-string ) ]
+ * #( media-range [ accept-params ] )
+ * media-range = ( "* /*"
+ * | ( type "/" "*" )
+ * | ( type "/" subtype )
+ * ) *( ";" parameter )
+ * accept-params = ";" "q" "=" qvalue *( accept-extension )
+ * accept-extension = ";" token [ "=" ( token | quoted-string ) ]
* </code>
* </pre>
*
- * Especially for <code>Content-Type</code> Header as defined in
+ * Especially for <code>Content-Type</code> Header as defined in
* <code>RFC 2616 chapter 14.7 (http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html)</code>:
* <pre>
* <code>
- * Content-Type = "Content-Type" ":" media-type
+ * Content-Type = "Content-Type" ":" media-type
* </code>
* </pre>
*
* Once created a {@link ContentType} is <b>IMMUTABLE</b>.
*
- *
+ *
*/
public class ContentType {
@@ -87,17 +88,16 @@ public class ContentType {
KNOWN_MIME_TYPES.add("multipart");
KNOWN_MIME_TYPES.add("text");
}
-
+
private static final Comparator<String> Q_PARAMETER_COMPARATOR = new Comparator<String>() {
@Override
- public int compare(String o1, String o2) {
+ public int compare(final String o1, final String o2) {
Float f1 = parseQParameterValue(o1);
Float f2 = parseQParameterValue(o2);
return f2.compareTo(f1);
}
};
-
private static final char WHITESPACE_CHAR = ' ';
private static final String PARAMETER_SEPARATOR = ";";
private static final String PARAMETER_KEY_VALUE_SEPARATOR = "=";
@@ -116,21 +116,32 @@ public class ContentType {
public static final ContentType WILDCARD = new ContentType(MEDIA_TYPE_WILDCARD, MEDIA_TYPE_WILDCARD);
public static final ContentType APPLICATION_XML = new ContentType("application", "xml", ODataFormat.XML);
- public static final ContentType APPLICATION_XML_CS_UTF_8 = ContentType.create(APPLICATION_XML, PARAMETER_CHARSET, CHARSET_UTF_8);
+ public static final ContentType APPLICATION_XML_CS_UTF_8 = ContentType.create(APPLICATION_XML, PARAMETER_CHARSET,
+ CHARSET_UTF_8);
public static final ContentType APPLICATION_ATOM_XML = new ContentType("application", "atom+xml", ODataFormat.ATOM);
- public static final ContentType APPLICATION_ATOM_XML_CS_UTF_8 = ContentType.create(APPLICATION_ATOM_XML, PARAMETER_CHARSET, CHARSET_UTF_8);
- public static final ContentType APPLICATION_ATOM_XML_ENTRY = new ContentType("application", "atom+xml", ODataFormat.ATOM, parameterMap(PARAMETER_TYPE, "entry"));
- public static final ContentType APPLICATION_ATOM_XML_ENTRY_CS_UTF_8 = ContentType.create(APPLICATION_ATOM_XML_ENTRY, PARAMETER_CHARSET, CHARSET_UTF_8);
- public static final ContentType APPLICATION_ATOM_XML_FEED = new ContentType("application", "atom+xml", ODataFormat.ATOM, parameterMap(PARAMETER_TYPE, "feed"));
- public static final ContentType APPLICATION_ATOM_XML_FEED_CS_UTF_8 = ContentType.create(APPLICATION_ATOM_XML_FEED, PARAMETER_CHARSET, CHARSET_UTF_8);
- public static final ContentType APPLICATION_ATOM_SVC = new ContentType("application", "atomsvc+xml", ODataFormat.ATOM);
- public static final ContentType APPLICATION_ATOM_SVC_CS_UTF_8 = ContentType.create(APPLICATION_ATOM_SVC, PARAMETER_CHARSET, CHARSET_UTF_8);
+ public static final ContentType APPLICATION_ATOM_XML_CS_UTF_8 = ContentType.create(APPLICATION_ATOM_XML,
+ PARAMETER_CHARSET, CHARSET_UTF_8);
+ public static final ContentType APPLICATION_ATOM_XML_ENTRY = new ContentType("application", "atom+xml",
+ ODataFormat.ATOM, parameterMap(PARAMETER_TYPE, "entry"));
+ public static final ContentType APPLICATION_ATOM_XML_ENTRY_CS_UTF_8 = ContentType.create(APPLICATION_ATOM_XML_ENTRY,
+ PARAMETER_CHARSET, CHARSET_UTF_8);
+ public static final ContentType APPLICATION_ATOM_XML_FEED = new ContentType("application", "atom+xml",
+ ODataFormat.ATOM, parameterMap(PARAMETER_TYPE, "feed"));
+ public static final ContentType APPLICATION_ATOM_XML_FEED_CS_UTF_8 = ContentType.create(APPLICATION_ATOM_XML_FEED,
+ PARAMETER_CHARSET, CHARSET_UTF_8);
+ public static final ContentType APPLICATION_ATOM_SVC =
+ new ContentType("application", "atomsvc+xml", ODataFormat.ATOM);
+ public static final ContentType APPLICATION_ATOM_SVC_CS_UTF_8 = ContentType.create(APPLICATION_ATOM_SVC,
+ PARAMETER_CHARSET, CHARSET_UTF_8);
public static final ContentType APPLICATION_JSON = new ContentType("application", "json", ODataFormat.JSON);
- public static final ContentType APPLICATION_JSON_ODATA_VERBOSE = ContentType.create(APPLICATION_JSON, PARAMETER_ODATA, VERBOSE);
- public static final ContentType APPLICATION_JSON_CS_UTF_8 = ContentType.create(APPLICATION_JSON, PARAMETER_CHARSET, CHARSET_UTF_8);
+ public static final ContentType APPLICATION_JSON_ODATA_VERBOSE = ContentType.create(APPLICATION_JSON,
+ PARAMETER_ODATA, VERBOSE);
+ public static final ContentType APPLICATION_JSON_CS_UTF_8 = ContentType.create(APPLICATION_JSON, PARAMETER_CHARSET,
+ CHARSET_UTF_8);
public static final ContentType APPLICATION_OCTET_STREAM = new ContentType("application", "octet-stream");
public static final ContentType TEXT_PLAIN = new ContentType("text", "plain");
- public static final ContentType TEXT_PLAIN_CS_UTF_8 = ContentType.create(TEXT_PLAIN, PARAMETER_CHARSET, CHARSET_UTF_8);
+ public static final ContentType TEXT_PLAIN_CS_UTF_8 = ContentType
+ .create(TEXT_PLAIN, PARAMETER_CHARSET, CHARSET_UTF_8);
public static final ContentType MULTIPART_MIXED = new ContentType("multipart", "mixed");
private final String type;
@@ -142,10 +153,10 @@ public class ContentType {
if (type == null) {
throw new IllegalArgumentException("Type parameter MUST NOT be null.");
}
- this.odataFormat = ODataFormat.CUSTOM;
+ odataFormat = ODataFormat.CUSTOM;
this.type = validateType(type);
- this.subtype = null;
- this.parameters = Collections.emptyMap();
+ subtype = null;
+ parameters = Collections.emptyMap();
}
private ContentType(final String type, final String subtype) {
@@ -156,7 +167,8 @@ public class ContentType {
this(type, subtype, odataFormat, null);
}
- private ContentType(final String type, final String subtype, final ODataFormat odataFormat, final Map<String, String> parameters) {
+ private ContentType(final String type, final String subtype, final ODataFormat odataFormat,
+ final Map<String, String> parameters) {
if ((type == null || MEDIA_TYPE_WILDCARD.equals(type)) && !MEDIA_TYPE_WILDCARD.equals(subtype)) {
throw new IllegalArgumentException("Illegal combination of WILDCARD type with NONE WILDCARD subtype.");
}
@@ -192,8 +204,7 @@ public class ContentType {
}
/**
- * Validates if given <code>format</code> is parseable and can be used as input for
- * {@link #create(String)} method.
+ * Validates if given <code>format</code> is parseable and can be used as input for {@link #create(String)} method.
* @param format to be validated string
* @return <code>true</code> if format is parseable otherwise <code>false</code>
*/
@@ -206,8 +217,7 @@ public class ContentType {
}
/**
- * Validates if given <code>format</code> is parseable and can be used as input for
- * {@link #create(String)} method.
+ * Validates if given <code>format</code> is parseable and can be used as input for {@link #create(String)} method.
* @param format to be validated string
* @return <code>true</code> if format is parseable otherwise <code>false</code>
*/
@@ -247,8 +257,10 @@ public class ContentType {
* @param parameterValue
* @return a new <code>ContentType</code> object
*/
- public static ContentType create(final ContentType contentType, final String parameterKey, final String parameterValue) {
- ContentType ct = new ContentType(contentType.type, contentType.subtype, contentType.odataFormat, contentType.parameters);
+ public static ContentType
+ create(final ContentType contentType, final String parameterKey, final String parameterValue) {
+ ContentType ct =
+ new ContentType(contentType.type, contentType.subtype, contentType.odataFormat, contentType.parameters);
ct.parameters.put(parameterKey, parameterValue);
return ct;
}
@@ -259,7 +271,7 @@ public class ContentType {
* Supported format is <code>Media Type</code> format as defined in <code>RFC 2616 chapter 3.7</code>.
* This format is used as
* <code>HTTP Accept HEADER</code> format as defined in <code>RFC 2616 chapter 14.1</code>
- * and
+ * and
* <code>HTTP Content-Type HEADER</code> format as defined in <code>RFC 2616 chapter 14.17</code>
*
* @param format a string in format as defined in <code>RFC 2616 section 3.7</code>
@@ -281,9 +293,9 @@ public class ContentType {
if (types.contains(TYPE_SUBTYPE_SEPARATOR)) {
String[] tokens = types.split(TYPE_SUBTYPE_SEPARATOR);
if (tokens.length == 2) {
- if(tokens[0] == null || tokens[0].isEmpty()) {
+ if (tokens[0] == null || tokens[0].isEmpty()) {
throw new IllegalArgumentException("No type found in format '" + format + "'.");
- } else if(tokens[1] == null || tokens[1].isEmpty()) {
+ } else if (tokens[1] == null || tokens[1].isEmpty()) {
throw new IllegalArgumentException("No subtype found in format '" + format + "'.");
} else {
return create(tokens[0], tokens[1], parametersMap);
@@ -291,10 +303,11 @@ public class ContentType {
} else {
throw new IllegalArgumentException("Too many '" + TYPE_SUBTYPE_SEPARATOR + "' in format '" + format + "'.");
}
- } else if(MEDIA_TYPE_WILDCARD.equals(types)) {
+ } else if (MEDIA_TYPE_WILDCARD.equals(types)) {
return ContentType.WILDCARD;
} else {
- throw new IllegalArgumentException("No separator '" + TYPE_SUBTYPE_SEPARATOR + "' was found in format '" + format + "'.");
+ throw new IllegalArgumentException("No separator '" + TYPE_SUBTYPE_SEPARATOR + "' was found in format '" + format
+ + "'.");
}
}
@@ -306,10 +319,12 @@ public class ContentType {
*
* The <code>Media Type</code> format can be used as
* <code>HTTP Accept HEADER</code> format as defined in <code>RFC 2616 chapter 14.1</code>
- * and
+ * and
* <code>HTTP Content-Type HEADER</code> format as defined in <code>RFC 2616 chapter 14.17</code>.
- * The {@link ContentType} with {@link ODataFormat#CUSTOM} can only be used as <code>$format</code> system query option
- * (as defined http://www.odata.org/documentation/odata-v2-documentation/uri-conventions/#47_Format_System_Query_Option_format).
+ * The {@link ContentType} with {@link ODataFormat#CUSTOM} can only be used as <code>$format</code> system query
+ * option
+ * (as defined
+ * http://www.odata.org/documentation/odata-v2-documentation/uri-conventions/#47_Format_System_Query_Option_format).
*
* @param format a string in format as defined in <code>RFC 2616 section 3.7</code>
* @return a new <code>ContentType</code> object
@@ -317,22 +332,23 @@ public class ContentType {
*/
public static ContentType createAsCustom(final String format) {
ContentType parsedContentType = parse(format);
- if(parsedContentType == null) {
+ if (parsedContentType == null) {
return new ContentType(format);
}
return parsedContentType;
}
-
+
/**
* Create a list of {@link ContentType} based on given input strings (<code>contentTypes</code>).
*
* Supported format is <code>Media Type</code> format as defined in <code>RFC 2616 chapter 3.7</code>.
* This format is used as
* <code>HTTP Accept HEADER</code> format as defined in <code>RFC 2616 chapter 14.1</code>
- * and
+ * and
* <code>HTTP Content-Type HEADER</code> format as defined in <code>RFC 2616 chapter 14.17</code>.
* <p>
- * If one of the given strings can not be parsed an exception is thrown (hence no list is returned with the parseable strings).
+ * If one of the given strings can not be parsed an exception is thrown (hence no list is returned with the parseable
+ * strings).
* </p>
*
* @param contentTypeStrings a list of strings in format as defined in <code>RFC 2616 section 3.7</code>
@@ -355,13 +371,16 @@ public class ContentType {
*
* The <code>Media Type</code> format can be used as
* <code>HTTP Accept HEADER</code> format as defined in <code>RFC 2616 chapter 14.1</code>
- * and
+ * and
* <code>HTTP Content-Type HEADER</code> format as defined in <code>RFC 2616 chapter 14.17</code>.
- * The {@link ContentType} with {@link ODataFormat#CUSTOM} can only be used as <code>$format</code> system query option
- * (as defined http://www.odata.org/documentation/odata-v2-documentation/uri-conventions/#47_Format_System_Query_Option_format).
- *
- * @param contentTypeStrings a list of strings in format as defined in <code>RFC 2616 section 3.7</code> or
- * as defined http://www.odata.org/documentation/odata-v2-documentation/uri-conventions/#47_Format_System_Query_Option_format
+ * The {@link ContentType} with {@link ODataFormat#CUSTOM} can only be used as <code>$format</code> system query
+ * option
+ * (as defined
+ * http://www.odata.org/documentation/odata-v2-documentation/uri-conventions/#47_Format_System_Query_Option_format).
+ *
+ * @param contentTypeStrings a list of strings in format as defined in <code>RFC 2616 section 3.7</code> or
+ * as defined
+ * http://www.odata.org/documentation/odata-v2-documentation/uri-conventions/#47_Format_System_Query_Option_format
* @return a list of new <code>ContentType</code> object
* @throws IllegalArgumentException if one of the given input string is not parseable this exceptions is thrown
*/
@@ -374,8 +393,8 @@ public class ContentType {
}
/**
- * Parses the given input string (<code>format</code>) and returns created
- * {@link ContentType} if input was valid or return <code>NULL</code> if
+ * Parses the given input string (<code>format</code>) and returns created {@link ContentType} if input was valid or
+ * return <code>NULL</code> if
* input was not parseable.
*
* For the definition of the supported format see {@link #create(String)}.
@@ -393,17 +412,17 @@ public class ContentType {
/**
* Sort given list (which must contains content type formated string) for their {@value #PARAMETER_Q} value
- * as defined in <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC 2616 section 4.1</a> and
+ * as defined in <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC 2616 section 4.1</a> and
* <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.9">RFC 2616 Section 3.9</a>.
*
* <b>Attention:</b> For invalid values a {@value #PARAMETER_Q} value from <code>-1</code> is used for sorting.
*
* @param toSort list which is sorted and hence re-arranged
*/
- public static void sortForQParameter(List<String> toSort) {
+ public static void sortForQParameter(final List<String> toSort) {
Collections.sort(toSort, ContentType.Q_PARAMETER_COMPARATOR);
}
-
+
/**
* Map combination of type/subtype to corresponding {@link ODataFormat}.
*
@@ -428,10 +447,10 @@ public class ContentType {
}
/**
- * Maps content of array into map.
+ * Maps content of array into map.
* Therefore it must be an combination of <code>key</code> followed by the <code>value</code> in the array.
*
- * @param content content which is added to {@link Map}.
+ * @param content content which is added to {@link Map}.
* @return a new <code>ContentType</code> object
*/
private static Map<String, String> parameterMap(final String... content) {
@@ -445,16 +464,16 @@ public class ContentType {
}
/**
- * Valid input are <code>;</code> separated <code>key=value</code> pairs
+ * Valid input are <code>;</code> separated <code>key=value</code> pairs
* without spaces between key and value.
* <b>Attention:</b> <code>q</code> parameter is validated but not added to result map
*
* <p>
* See RFC 2616:
- * The type, subtype, and parameter attribute names are case-insensitive.
- * Parameter values might or might not be case-sensitive, depending on the
- * semantics of the parameter name. <b>Linear white space (LWS) MUST NOT be used
- * between the type and subtype, nor between an attribute and its value</b>.
+ * The type, subtype, and parameter attribute names are case-insensitive.
+ * Parameter values might or might not be case-sensitive, depending on the
+ * semantics of the parameter name. <b>Linear white space (LWS) MUST NOT be used
+ * between the type and subtype, nor between an attribute and its value</b>.
* </p>
*
* @param parameters
@@ -469,12 +488,13 @@ public class ContentType {
String key = keyValue[0].trim().toLowerCase(Locale.ENGLISH);
String value = keyValue.length > 1 ? keyValue[1] : null;
if (value != null && isLws(value.charAt(0))) {
- throw new IllegalArgumentException("Value of parameter '" + key + "' starts with a LWS ('" + parameters + "').");
+ throw new IllegalArgumentException("Value of parameter '" + key + "' starts with a LWS ('" + parameters
+ + "').");
}
- if(PARAMETER_Q.equals(key.toLowerCase(Locale.US))) {
+ if (PARAMETER_Q.equals(key.toLowerCase(Locale.US))) {
// q parameter is only validated but not added
- if(!Q_PARAMETER_VALUE_PATTERN.matcher(value).matches()) {
- throw new IllegalArgumentException("Value of 'q' parameter is not valid (q='" + value + "').");
+ if (!Q_PARAMETER_VALUE_PATTERN.matcher(value).matches()) {
+ throw new IllegalArgumentException("Value of 'q' parameter is not valid (q='" + value + "').");
}
} else {
parameterMap.put(key, value);
@@ -499,7 +519,7 @@ public class ContentType {
for (String parameter : splittedParameters) {
String[] keyValue = parameter.split(PARAMETER_KEY_VALUE_SEPARATOR);
String key = keyValue[0].trim().toLowerCase(Locale.ENGLISH);
- if(PARAMETER_Q.equalsIgnoreCase(key)) {
+ if (PARAMETER_Q.equalsIgnoreCase(key)) {
String value = keyValue.length > 1 ? keyValue[1] : null;
if (Q_PARAMETER_VALUE_PATTERN.matcher(value).matches()) {
return Float.valueOf(value);
@@ -521,8 +541,9 @@ public class ContentType {
return key != null && !PARAMETER_Q.equals(key.toLowerCase(Locale.US));
}
- /**
- * Validate if given character is a linear whitepace (includes <code>horizontal-tab, linefeed, carriage return and space</code>).
+ /**
+ * Validate if given character is a linear whitepace (includes <code>horizontal-tab, linefeed, carriage return and
+ * space</code>).
*
* @param character to be checked
* @return <code>true</code> if character is a LWS, otherwise <code>false</code>.
@@ -539,12 +560,12 @@ public class ContentType {
}
}
-
/**
* Ensure that charset parameter ({@link #PARAMETER_CHARSET}) is set on returned content type
- * if this {@link ContentType} is a <code>odata text related</code> content type (@see {@link #isContentTypeODataTextRelated()}).
- * If <code>this</code> {@link ContentType} has no charset parameter set a new {@link ContentType}
- * with given <code>defaultCharset</code> is created.
+ * if this {@link ContentType} is a <code>odata text related</code> content type (@see
+ * {@link #isContentTypeODataTextRelated()}).
+ * If <code>this</code> {@link ContentType} has no charset parameter set a new {@link ContentType} with given
+ * <code>defaultCharset</code> is created.
* Otherwise if charset parameter is already set nothing is done.
*
* @param defaultCharset
@@ -592,10 +613,11 @@ public class ContentType {
}
/**
- * {@link ContentType}s are equal
+ * {@link ContentType}s are equal
* <ul>
* <li>if <code>type</code>, <code>subtype</code> and all <code>parameters</code> have the same value.</li>
- * <li>if <code>type</code> and/or <code>subtype</code> is set to "*" (in such a case the <code>parameters</code> are ignored).</li>
+ * <li>if <code>type</code> and/or <code>subtype</code> is set to "*" (in such a case the <code>parameters</code> are
+ * ignored).</li>
* </ul>
*
* @return <code>true</code> if both instances are equal (see definition above), otherwise <code>false</code>.
@@ -638,12 +660,13 @@ public class ContentType {
}
/**
- * {@link ContentType}s are <b>compatible</b>
+ * {@link ContentType}s are <b>compatible</b>
* <ul>
* <li>if <code>type</code>, <code>subtype</code> have the same value.</li>
* <li>if <code>type</code> and/or <code>subtype</code> is set to "*"</li>
* </ul>
- * The set <code>parameters</code> are <b>always</b> ignored (for compare with parameters see {@link #equals(Object)}).
+ * The set <code>parameters</code> are <b>always</b> ignored (for compare with parameters see {@link #equals(Object)}
+ * ).
*
* @return <code>true</code> if both instances are equal (see definition above), otherwise <code>false</code>.
*/
@@ -657,11 +680,12 @@ public class ContentType {
/**
* Check equal without parameters.
- * It is possible that no decision about <code>equal/none equal</code> can be determined a <code>NULL</code> is returned.
+ * It is possible that no decision about <code>equal/none equal</code> can be determined a <code>NULL</code> is
+ * returned.
*
* @param obj to checked object
- * @return <code>true</code> if both instances are equal (see definition above), otherwise <code>false</code>
- * or <code>NULL</code> if no decision about <code>equal/none equal</code> could be determined.
+ * @return <code>true</code> if both instances are equal (see definition above), otherwise <code>false</code>
+ * or <code>NULL</code> if no decision about <code>equal/none equal</code> could be determined.
*/
private Boolean isEqualWithoutParameters(final Object obj) {
// basic checks
@@ -683,7 +707,7 @@ public class ContentType {
return false;
}
} else if (!subtype.equals(other.subtype)) {
- if(other.subtype == null) {
+ if (other.subtype == null) {
return false;
} else if (!subtype.equals(MEDIA_TYPE_WILDCARD) && !other.subtype.equals(MEDIA_TYPE_WILDCARD)) {
return false;
@@ -714,7 +738,8 @@ public class ContentType {
*
* @param first first string
* @param second second string
- * @return <code>true</code> if both strings are equal (by ignoring the case), otherwise <code>false</code> is returned
+ * @return <code>true</code> if both strings are equal (by ignoring the case), otherwise <code>false</code> is
+ * returned
*/
private static boolean areEqual(final String first, final String second) {
if (first == null) {
@@ -728,19 +753,20 @@ public class ContentType {
}
/**
- * Get {@link ContentType} as string as defined in RFC 2616 (http://www.ietf.org/rfc/rfc2616.txt - chapter 14.17: Content-Type)
+ * Get {@link ContentType} as string as defined in RFC 2616 (http://www.ietf.org/rfc/rfc2616.txt - chapter 14.17:
+ * Content-Type)
*
* @return string representation of <code>ContentType</code> object
*/
public String toContentTypeString() {
StringBuilder sb = new StringBuilder();
-
- if(odataFormat == ODataFormat.CUSTOM && subtype == null) {
+
+ if (odataFormat == ODataFormat.CUSTOM && subtype == null) {
sb.append(type);
} else {
sb.append(type).append(TYPE_SUBTYPE_SEPARATOR).append(subtype);
}
-
+
for (String key : parameters.keySet()) {
if (isParameterAllowed(key)) {
String value = parameters.get(key);
@@ -761,13 +787,15 @@ public class ContentType {
/**
* Find best match between this {@link ContentType} and the {@link ContentType} in the list.
- * If a match (this {@link ContentType} is equal to a {@link ContentType} in list) is found either this or the {@link ContentType}
- * from the list is returned based on which {@link ContentType} has less "**" characters set
+ * If a match (this {@link ContentType} is equal to a {@link ContentType} in list) is found either this or the
+ * {@link ContentType} from the list is returned based on which {@link ContentType} has less "**" characters set
* (checked with {@link #compareWildcardCounts(ContentType)}.
- * If no match (none {@link ContentType} in list is equal to this {@link ContentType}) is found <code>NULL</code> is returned.
+ * If no match (none {@link ContentType} in list is equal to this {@link ContentType}) is found <code>NULL</code> is
+ * returned.
*
* @param toMatchContentTypes list of {@link ContentType}s which are matches against this {@link ContentType}
- * @return best matched content type in list or <code>NULL</code> if none content type match to this content type instance
+ * @return best matched content type in list or <code>NULL</code> if none content type match to this content type
+ * instance
*/
public ContentType match(final List<ContentType> toMatchContentTypes) {
for (ContentType supportedContentType : toMatchContentTypes) {
@@ -783,14 +811,17 @@ public class ContentType {
}
/**
- * Find best match between this {@link ContentType} and the {@link ContentType} in the list ignoring all set parameters.
- * If a match (this {@link ContentType} is equal to a {@link ContentType} in list) is found either this or the {@link ContentType}
- * from the list is returned based on which {@link ContentType} has less "**" characters set
+ * Find best match between this {@link ContentType} and the {@link ContentType} in the list ignoring all set
+ * parameters.
+ * If a match (this {@link ContentType} is equal to a {@link ContentType} in list) is found either this or the
+ * {@link ContentType} from the list is returned based on which {@link ContentType} has less "**" characters set
* (checked with {@link #compareWildcardCounts(ContentType)}.
- * If no match (none {@link ContentType} in list is equal to this {@link ContentType}) is found <code>NULL</code> is returned.
+ * If no match (none {@link ContentType} in list is equal to this {@link ContentType}) is found <code>NULL</code> is
+ * returned.
*
* @param toMatchContentTypes list of {@link ContentType}s which are matches against this {@link ContentType}
- * @return best matched content type in list or <code>NULL</code> if none content type match to this content type instance
+ * @return best matched content type in list or <code>NULL</code> if none content type match to this content type
+ * instance
*/
public ContentType matchCompatible(final List<ContentType> toMatchContentTypes) {
for (ContentType supportedContentType : toMatchContentTypes) {
@@ -811,8 +842,8 @@ public class ContentType {
* For more detail what a valid match is see {@link #matchCompatible(List)}.
*
* @param toMatchContentTypes list of {@link ContentType}s which are matches against this {@link ContentType}
- * @return <code>true</code> if a compatible content type was found in given list
- * or <code>false</code> if none compatible content type match was found
+ * @return <code>true</code> if a compatible content type was found in given list
+ * or <code>false</code> if none compatible content type match was found
*/
public boolean hasCompatible(final List<ContentType> toMatchContentTypes) {
return matchCompatible(toMatchContentTypes) != null;
@@ -823,8 +854,8 @@ public class ContentType {
* For more detail what a valid match is see {@link #match(List)}.
*
* @param toMatchContentTypes list of {@link ContentType}s which are matches against this {@link ContentType}
- * @return <code>true</code> if a matching content type was found in given list
- * or <code>false</code> if none matching content type match was found
+ * @return <code>true</code> if a matching content type was found in given list
+ * or <code>false</code> if none matching content type match was found
*/
public boolean hasMatch(final List<ContentType> toMatchContentTypes) {
return match(toMatchContentTypes) != null;
@@ -887,10 +918,12 @@ public class ContentType {
*
* For more detail in general see {@link #hasMatch(List)} and for what a valid match is see {@link #match(List)}.
*
- * @param toMatch content type formated string (<code>toMatch</code>) for which is checked if a match exists in given list
- * @param matchExamples list of {@link ContentType}s which are matches against content type formated string (<code>toMatch</code>)
- * @return <code>true</code> if a matching content type was found in given list
- * or <code>false</code> if none matching content type match was found
+ * @param toMatch content type formated string (<code>toMatch</code>) for which is checked if a match exists in given
+ * list
+ * @param matchExamples list of {@link ContentType}s which are matches against content type formated string
+ * (<code>toMatch</code>)
+ * @return <code>true</code> if a matching content type was found in given list
+ * or <code>false</code> if none matching content type match was found
*/
public static boolean match(final String toMatch, final ContentType... matchExamples) {
ContentType toMatchContentType = ContentType.create(toMatch);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java
index ddf3586..c725a2f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.commons;
@@ -23,7 +23,7 @@ import java.io.UnsupportedEncodingException;
/**
* Decodes a Java String containing a percent-encoded UTF-8 String value
* into a Java String (in its internal UTF-16 encoding).
- *
+ *
*/
public class Decoder {
@@ -33,9 +33,9 @@ public class Decoder {
* @param value the encoded String
* @return the Java String
* @throws IllegalArgumentException if value contains characters not representing UTF-8 bytes
- * or ends with an unfinished percent-encoded character
- * @throws NumberFormatException if the two characters after a percent character
- * are not hexadecimal digits
+ * or ends with an unfinished percent-encoded character
+ * @throws NumberFormatException if the two characters after a percent character
+ * are not hexadecimal digits
*/
public static String decode(final String value) throws IllegalArgumentException, NumberFormatException {
if (value == null) {
@@ -44,8 +44,8 @@ public class Decoder {
// Use a tiny finite-state machine to handle decoding on byte level.
// There are only three states:
- // -2: normal bytes
- // -1: a byte representing the percent character has been read
+ // -2: normal bytes
+ // -1: a byte representing the percent character has been read
// >= 0: a byte representing the first half-byte of a percent-encoded byte has been read
// The variable holding the state is also used to store the value of the first half-byte.
byte[] result = new byte[value.length()];
[13/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
index b2ef4a0..5c97db2 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
@@ -54,7 +54,7 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void allNull() throws Exception {
- //{"all":true,"properties":[],"links":[]}
+ // {"all":true,"properties":[],"links":[]}
String expected = "{\"all\":true,\"properties\":[],\"links\":[]}";
String actual = getExpandSelectTree(null, null).toJsonString();
assertEquals(expected, actual);
@@ -62,10 +62,10 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void oneProperty() throws Exception {
- //{"all":false,"properties":["Age"],"links":[]}
+ // {"all":false,"properties":["Age"],"links":[]}
String expected = "{\"all\":false,\"properties\":[\"Age\"],\"links\":[]}";
- //$select=Age
+ // $select=Age
String actual = getExpandSelectTree("Age", null).toJsonString();
assertEquals(expected, actual);
}
@@ -82,10 +82,10 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void onlyPropertyAndExpandLink() throws Exception {
- //{"all":false,"properties":["Age"],"links":[]}
+ // {"all":false,"properties":["Age"],"links":[]}
String expected = "{\"all\":false,\"properties\":[\"Age\"],\"links\":[]}";
- //$select=Age&$expand=ne_Room
+ // $select=Age&$expand=ne_Room
String actual = getExpandSelectTree("Age", "ne_Room").toJsonString();
assertEquals(expected, actual);
@@ -93,79 +93,86 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void starAndExpandLink() throws Exception {
- //{"all":true,"properties":[],"links":[]}
+ // {"all":true,"properties":[],"links":[]}
String expected = "{\"all\":true,\"properties\":[],\"links\":[]}";
- //$select=*&$expand=ne_Room
+ // $select=*&$expand=ne_Room
String actual = getExpandSelectTree("*", "ne_Room").toJsonString();
assertEquals(expected, actual);
- //$select=*,EmployeeId&$expand=ne_Room
+ // $select=*,EmployeeId&$expand=ne_Room
actual = getExpandSelectTree("*,EmployeeId", "ne_Room").toJsonString();
assertEquals(expected, actual);
- //$select=EmployeeId,*&$expand=ne_Room
+ // $select=EmployeeId,*&$expand=ne_Room
actual = getExpandSelectTree("EmployeeId,*", "ne_Room").toJsonString();
assertEquals(expected, actual);
}
@Test
public void oneSelectLink() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Room":null}]}
+ // {"all":false,"properties":[],"links":[{"ne_Room":null}]}
String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Room\":null}]}";
- //$select=ne_Room
+ // $select=ne_Room
String actual = getExpandSelectTree("ne_Room", null).toJsonString();
assertEquals(expected, actual);
}
@Test
public void starAndNavPropInSelectAndExpand() throws Exception {
- //{"all":false,"properties":[],"links":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}
- String expected = "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
+ // {"all":false,"properties":[],"links":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}
+ String expected =
+ "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
- //$select=ne_Room,* $expand=ne_Room
+ // $select=ne_Room,* $expand=ne_Room
String actual = getExpandSelectTree("ne_Room,*", "ne_Room").toJsonString();
assertEquals(expected, actual);
- //$select=*,ne_Room $expand=ne_Room
+ // $select=*,ne_Room $expand=ne_Room
actual = getExpandSelectTree("*,ne_Room", "ne_Room").toJsonString();
assertEquals(expected, actual);
- //$select=*,ne_Room,ne_Manager $expand=ne_Room
+ // $select=*,ne_Room,ne_Manager $expand=ne_Room
actual = getExpandSelectTree("*,ne_Room,ne_Manager", "ne_Room").toJsonString();
assertEquals(expected, actual);
- //$select=ne_Room,*,ne_Manager $expand=ne_Room
+ // $select=ne_Room,*,ne_Manager $expand=ne_Room
actual = getExpandSelectTree("ne_Room,*,ne_Manager", "ne_Room").toJsonString();
assertEquals(expected, actual);
- //$select=ne_Room,ne_Manager,* $expand=ne_Room
+ // $select=ne_Room,ne_Manager,* $expand=ne_Room
actual = getExpandSelectTree("ne_Room,ne_Manager,*", "ne_Room").toJsonString();
assertEquals(expected, actual);
}
@Test
public void sameLinkInSelectAndExpand() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
- String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
+ // {"all":false,"properties":[],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
+ String expected =
+ "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
- //$select=ne_Room&$expand=ne_Room
+ // $select=ne_Room&$expand=ne_Room
String actual = getExpandSelectTree("ne_Room", "ne_Room").toJsonString();
assertEquals(expected, actual);
- //$select=ne_Room/*&$expand=ne_Room
+ // $select=ne_Room/*&$expand=ne_Room
actual = getExpandSelectTree("ne_Room/*", "ne_Room").toJsonString();
assertEquals(expected, actual);
}
@Test
public void deepLinkInSelectAndExpand() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Room":{"all":false,"properties":[],"links":[{"nr_Employees":{"all":true,"properties":[],"links":[]}}]}}]}
- String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":false,\"properties\":[],\"links\":[{\"nr_Employees\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
+ // {"all":false,"properties":[],"links":[{"ne_Room":{"all":false,"properties":[],
+ //"links":[{"nr_Employees":{"all":true,"properties":[],"links":[]}}]}}]}
+ String expected =
+ "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":false," +
+ "\"properties\":[],\"links\":[{\"nr_Employees\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
- //$select=ne_Room/nr_Employees&$expand=ne_Room,ne_Manager,ne_Room/nr_Employees,ne_Room/nr_Building
- String actual = getExpandSelectTree("ne_Room/nr_Employees", "ne_Room,ne_Manager,ne_Room/nr_Employees,ne_Room/nr_Building").toJsonString();
+ // $select=ne_Room/nr_Employees&$expand=ne_Room,ne_Manager,ne_Room/nr_Employees,ne_Room/nr_Building
+ String actual =
+ getExpandSelectTree("ne_Room/nr_Employees", "ne_Room,ne_Manager,ne_Room/nr_Employees,ne_Room/nr_Building")
+ .toJsonString();
assertEquals(expected, actual);
}
@@ -175,22 +182,26 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
+ "{\"ne_Team\":{\"all\":false,\"properties\":[],\"links\":["
+ "{\"nt_Employees\":{\"all\":false,\"properties\":[],\"links\":["
+ "{\"ne_Manager\":{\"all\":false,\"properties\":[\"EmployeeId\"],\"links\":[]}}]}}]}}]}",
- getExpandSelectTree("ne_Team/nt_Employees/ne_Manager/EmployeeId", "ne_Team/nt_Employees/ne_Manager").toJsonString());
+ getExpandSelectTree("ne_Team/nt_Employees/ne_Manager/EmployeeId", "ne_Team/nt_Employees/ne_Manager")
+ .toJsonString());
}
@Test
public void expandOneLink() throws Exception {
- //{"all":true,"properties":[],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
- String expected = "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
+ // {"all":true,"properties":[],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
+ String expected =
+ "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
- //$expand=ne_Room
+ // $expand=ne_Room
String actual = getExpandSelectTree(null, "ne_Room").toJsonString();
assertEquals(expected, actual);
}
@Test
public void complexSelectExpand() throws Exception {
- //{"all":false,"properties":["Age"],"links":[{"ne_Room":{"all":false,"properties":["Seats"],"links":[]}},{"ne_Team":null},{"ne_Manager":{"all":true,"properties":[],"links":[{"ne_Team":{"all":true,"properties":[],"links":[{"nt_Employees":{"all":true,"properties":[],"links":[]}}]}}]}}]}
+ // {"all":false,"properties":["Age"],"links":[{"ne_Room":{"all":false,"properties":["Seats"],
+ //"links":[]}},{"ne_Team":null},{"ne_Manager":{"all":true,"properties":[],"links":[{"ne_Team":{"all":true,
+ //"properties":[],"links":[{"nt_Employees":{"all":true,"properties":[],"links":[]}}]}}]}}]}
String select = "Age,ne_Room/Seats,ne_Team/Name,ne_Manager/*,ne_Manager/ne_Team,ne_Team";
String expand = "ne_Room/nr_Building,ne_Manager/ne_Team/nt_Employees,ne_Manager/ne_Room";
@@ -212,7 +223,9 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
assertNull(links.get(navPropertyName));
} else if ("ne_Manager".equals(navPropertyName)) {
ExpandSelectTreeNodeImpl managerNode = (ExpandSelectTreeNodeImpl) links.get(navPropertyName);
- String expected = "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Team\":{\"all\":true,\"properties\":[],\"links\":[{\"nt_Employees\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
+ String expected =
+ "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Team\":{\"all\":true,\"properties\":[]," +
+ "\"links\":[{\"nt_Employees\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
String actualString = managerNode.toJsonString();
assertEquals(expected, actualString);
} else {
@@ -223,100 +236,104 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void twoProperties() throws Exception {
- //{"all":false,"properties":["Age","EmployeeId"],"links":[]}
+ // {"all":false,"properties":["Age","EmployeeId"],"links":[]}
String expected = "{\"all\":false,\"properties\":[\"Age\",\"EmployeeId\"],\"links\":[]}";
- //$select=Age,EmployeeId
+ // $select=Age,EmployeeId
String actual = getExpandSelectTree("Age,EmployeeId", null).toJsonString();
assertEquals(expected, actual);
}
@Test
public void sameProperties() throws Exception {
- //{"all":false,"properties":["EmployeeId","Age"],"links":[]}
+ // {"all":false,"properties":["EmployeeId","Age"],"links":[]}
String expected = "{\"all\":false,\"properties\":[\"EmployeeId\",\"Age\"],\"links\":[]}";
- //$select=EmployeeId,Age,EmployeeId
+ // $select=EmployeeId,Age,EmployeeId
String actual = getExpandSelectTree("EmployeeId,Age,EmployeeId", null).toJsonString();
assertEquals(expected, actual);
}
@Test
public void propertiesAndStar() throws Exception {
- //{"all":true,"properties":[],"links":[]}
+ // {"all":true,"properties":[],"links":[]}
String expected = "{\"all\":true,\"properties\":[],\"links\":[]}";
- //$select=Age,EmployeeId,*
+ // $select=Age,EmployeeId,*
String actual = getExpandSelectTree("Age,EmployeeId,*", null).toJsonString();
assertEquals(expected, actual);
- //$select=*,Age,EmployeeId
+ // $select=*,Age,EmployeeId
actual = getExpandSelectTree("*,Age,EmployeeId", null).toJsonString();
assertEquals(expected, actual);
}
@Test
public void multiSelectLinkWithoutExpand() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Manager":null}]}
+ // {"all":false,"properties":[],"links":[{"ne_Manager":null}]}
String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":null}]}";
- //$select=ne_Manager
+ // $select=ne_Manager
String actual = getExpandSelectTree("ne_Manager", null).toJsonString();
assertEquals(expected, actual);
- //$select=ne_Manager/ne_Manager
+ // $select=ne_Manager/ne_Manager
actual = getExpandSelectTree("ne_Manager/ne_Manager", null).toJsonString();
assertEquals(expected, actual);
- //$select=ne_Manager/ne_Manager,ne_Manager
+ // $select=ne_Manager/ne_Manager,ne_Manager
actual = getExpandSelectTree("ne_Manager/ne_Manager,ne_Manager", null).toJsonString();
assertEquals(expected, actual);
- //$select=ne_Manager/ne_Manager/ne_Manager/ne_Manager,ne_Manager
+ // $select=ne_Manager/ne_Manager/ne_Manager/ne_Manager,ne_Manager
actual = getExpandSelectTree("ne_Manager/ne_Manager/ne_Manager/ne_Manager,ne_Manager", null).toJsonString();
assertEquals(expected, actual);
- //$select=ne_Manager,ne_Manager/ne_Manager/ne_Manager/ne_Manager
+ // $select=ne_Manager,ne_Manager/ne_Manager/ne_Manager/ne_Manager
actual = getExpandSelectTree("ne_Manager,ne_Manager/ne_Manager/ne_Manager/ne_Manager", null).toJsonString();
assertEquals(expected, actual);
}
@Test
public void sameSelectLinks() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Manager":null}]}
+ // {"all":false,"properties":[],"links":[{"ne_Manager":null}]}
String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":null}]}";
- //$select=ne_Manager,ne_Manager
+ // $select=ne_Manager,ne_Manager
String actual = getExpandSelectTree("ne_Manager,ne_Manager", null).toJsonString();
assertEquals(expected, actual);
}
@Test
public void sameExpandLinks() throws Exception {
- //{"all":true,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[]}}]}
- String expected = "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
+ // {"all":true,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[]}}]}
+ String expected =
+ "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
- //$expand=ne_Manager,ne_Manager
+ // $expand=ne_Manager,ne_Manager
String actual = getExpandSelectTree(null, "ne_Manager,ne_Manager").toJsonString();
assertEquals(expected, actual);
}
@Test
public void multiExpandLinkWithoutSelect() throws Exception {
- //{"all":true,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[]}}]}}]}
- String expected = "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
+ // {"all":true,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],
+ //"links":[{"ne_Manager":{"all":true,"properties":[],"links":[]}}]}}]}
+ String expected =
+ "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[]," +
+ "\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
- //$expand=ne_Manager/ne_Manager,ne_Manager
+ // $expand=ne_Manager/ne_Manager,ne_Manager
String actual = getExpandSelectTree(null, "ne_Manager/ne_Manager,ne_Manager").toJsonString();
assertEquals(expected, actual);
}
@Test
public void twoSelectLinks() throws Exception {
- //One of the two is expected but the order of links is not defined
+ // One of the two is expected but the order of links is not defined
String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":null},{\"ne_Room\":null}]}";
String expected2 = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Room\":null},{\"ne_Manager\":null}]}";
- //$select=ne_Manager,ne_Room
+ // $select=ne_Manager,ne_Room
String actual = getExpandSelectTree("ne_Manager,ne_Room", null).toJsonString();
if (!expected.equals(actual) && !expected2.equals(actual)) {
@@ -326,22 +343,26 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void oneSelectDeepExpand() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[{"ne_Room":{"all":true,"properties":[],"links":[{"nr_Building":{"all":true,"properties":[],"links":[]}}]}}]}}]}
- String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}}]}";
-
- //$select=ne_Manager $expand=ne_Manager/ne_Room/nr_Building
+ // {"all":false,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[{
+ //"ne_Room":{"all":true,"properties":[],"links":[{"nr_Building":{"all":true,"properties":[],"links":[]}}]}}]}}]}
+ String expected =
+ "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[]," +
+ "\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true," +
+ "\"properties\":[],\"links\":[]}}]}}]}}]}";
+
+ // $select=ne_Manager $expand=ne_Manager/ne_Room/nr_Building
String actual = getExpandSelectTree("ne_Manager", "ne_Manager/ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
- //$select=ne_Manager,ne_Manager/EmployeeId $expand=ne_Manager/ne_Room/nr_Building
+ // $select=ne_Manager,ne_Manager/EmployeeId $expand=ne_Manager/ne_Room/nr_Building
actual = getExpandSelectTree("ne_Manager,ne_Manager/EmployeeId", "ne_Manager/ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
- //$select=ne_Manager/EmployeeId,ne_Manager $expand=ne_Manager/ne_Room/nr_Building
+ // $select=ne_Manager/EmployeeId,ne_Manager $expand=ne_Manager/ne_Room/nr_Building
actual = getExpandSelectTree("ne_Manager/EmployeeId,ne_Manager", "ne_Manager/ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
- //$select=ne_Manager,ne_Manager $expand=ne_Manager/ne_Room/nr_Building
+ // $select=ne_Manager,ne_Manager $expand=ne_Manager/ne_Room/nr_Building
actual = getExpandSelectTree("ne_Manager,ne_Manager", "ne_Manager/ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
}
@@ -349,14 +370,16 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void starAtEndWithExpand() throws Exception {
- //{"all":false,"properties":["EmployeeId"],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
- String expected = "{\"all\":false,\"properties\":[\"EmployeeId\"],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
+ // {"all":false,"properties":["EmployeeId"],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
+ String expected =
+ "{\"all\":false,\"properties\":[\"EmployeeId\"],\"links\":[{\"ne_Room\":{\"all\":true," +
+ "\"properties\":[],\"links\":[]}}]}";
- //$select=EmployeeId,ne_Room/* $expand=ne_Room/nr_Building
+ // $select=EmployeeId,ne_Room/* $expand=ne_Room/nr_Building
String actual = getExpandSelectTree("EmployeeId,ne_Room/*", "ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
- //$select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
+ // $select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
actual = getExpandSelectTree("EmployeeId,ne_Room/*", "ne_Room/nr_Building/nb_Rooms").toJsonString();
assertEquals(expected, actual);
}
@@ -364,14 +387,16 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void propertyAtEndWithExpand() throws Exception {
- //{"all":false,"properties":["EmployeeId"],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
- String expected = "{\"all\":false,\"properties\":[\"EmployeeId\"],\"links\":[{\"ne_Room\":{\"all\":false,\"properties\":[\"Id\"],\"links\":[]}}]}";
+ // {"all":false,"properties":["EmployeeId"],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
+ String expected =
+ "{\"all\":false,\"properties\":[\"EmployeeId\"],\"links\":[{\"ne_Room\":{\"all\":false," +
+ "\"properties\":[\"Id\"],\"links\":[]}}]}";
- //$select=EmployeeId,ne_Room/* $expand=ne_Room/nr_Building
+ // $select=EmployeeId,ne_Room/* $expand=ne_Room/nr_Building
String actual = getExpandSelectTree("EmployeeId,ne_Room/Id", "ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
- //$select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
+ // $select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
actual = getExpandSelectTree("EmployeeId,ne_Room/Id", "ne_Room/nr_Building/nb_Rooms").toJsonString();
assertEquals(expected, actual);
}
@@ -379,14 +404,15 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void starTest() throws Exception {
- //{"all":false,"properties":["EmployeeId"],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
- String expected = "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
+ // {"all":false,"properties":["EmployeeId"],"links":[{"ne_Room":{"all":true,"properties":[],"links":[]}}]}
+ String expected =
+ "{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[]}}]}";
- //$select=EmployeeId,ne_Room/* $expand=ne_Room/nr_Building
+ // $select=EmployeeId,ne_Room/* $expand=ne_Room/nr_Building
String actual = getExpandSelectTree("*,ne_Room/*", "ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
- //$select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
+ // $select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
actual = getExpandSelectTree("ne_Room/*,*", "ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
}
@@ -394,45 +420,67 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void twoExpandsTwoSelects() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Manager":{"all":false,"properties":["EmployeeId"],"links":[{"ne_Room":{"all":true,"properties":[],"links":[{"nr_Building":{"all":true,"properties":[],"links":[]}}]}}]}}]}
- String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":false,\"properties\":[\"EmployeeId\"],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}}]}";
+ // {"all":false,"properties":[],"links":[{"ne_Manager":{"all":false,"properties":["EmployeeId"],
+ //"links":[{"ne_Room":{"all":true,"properties":[],"links":[{"nr_Building":{"all":true,"properties":[],
+ //"links":[]}}]}}]}}]}
+ String expected =
+ "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":false,\"properties\":[\"EmployeeId\"]," +
+ "\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true," +
+ "\"properties\":[],\"links\":[]}}]}}]}}]}";
- //$select=ne_Manager/EmployeeId,ne_Manager/ne_Room $expand=ne_Manager/ne_Room/nr_Building
- String actual = getExpandSelectTree("ne_Manager/ne_Room,ne_Manager/EmployeeId", "ne_Manager/ne_Room/nr_Building").toJsonString();
+ // $select=ne_Manager/EmployeeId,ne_Manager/ne_Room $expand=ne_Manager/ne_Room/nr_Building
+ String actual =
+ getExpandSelectTree("ne_Manager/ne_Room,ne_Manager/EmployeeId", "ne_Manager/ne_Room/nr_Building")
+ .toJsonString();
assertEquals(expected, actual);
- //$select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
- actual = getExpandSelectTree("ne_Manager/EmployeeId,ne_Manager/ne_Room", "ne_Manager/ne_Room/nr_Building").toJsonString();
+ // $select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
+ actual =
+ getExpandSelectTree("ne_Manager/EmployeeId,ne_Manager/ne_Room", "ne_Manager/ne_Room/nr_Building")
+ .toJsonString();
assertEquals(expected, actual);
}
@Test
public void twoExpandsTest() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[{"ne_Room":{"all":true,"properties":[],"links":[{"nr_Building":{"all":true,"properties":[],"links":[]}}]}},{"ne_Team":{"all":true,"properties":[],"links":[]}}]}}]}
- String expected1 = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true,\"properties\":[],\"links\":[]}}]}},{\"ne_Team\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
- String expected2 = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[{\"ne_Team\":{\"all\":true,\"properties\":[],\"links\":[]}},{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}}]}";
-
- //$select=ne_Manager $expand=ne_Manager/ne_Room/nr_Building,ne_Manager/ne_Team
- String actual = getExpandSelectTree("ne_Manager", "ne_Manager/ne_Room/nr_Building,ne_Manager/ne_Team").toJsonString();
+ // {"all":false,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],
+ //"links":[{"ne_Room":{"all":true,"properties":[],"links":[{"nr_Building":{"all":true,"properties":[],
+ //"links":[]}}]}},{"ne_Team":{"all":true,"properties":[],"links":[]}}]}}]}
+ String expected1 =
+ "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[]," +
+ "\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true," +
+ "\"properties\":[],\"links\":[]}}]}},{\"ne_Team\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
+ String expected2 =
+ "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[]," +
+ "\"links\":[{\"ne_Team\":{\"all\":true,\"properties\":[],\"links\":[]}},{\"ne_Room\":{\"all\":true," +
+ "\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}}]}";
+
+ // $select=ne_Manager $expand=ne_Manager/ne_Room/nr_Building,ne_Manager/ne_Team
+ String actual =
+ getExpandSelectTree("ne_Manager", "ne_Manager/ne_Room/nr_Building,ne_Manager/ne_Team").toJsonString();
if (!expected1.equals(actual) && !expected2.equals(actual)) {
fail("Either " + expected1 + " or " + expected2 + " expected but was: " + actual);
}
- //$select=ne_Manager $expand=ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building
+ // $select=ne_Manager $expand=ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building
actual = getExpandSelectTree("ne_Manager", "ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building").toJsonString();
if (!expected1.equals(actual) && !expected2.equals(actual)) {
fail("Either " + expected1 + " or " + expected2 + " expected but was: " + actual);
}
- //$select=ne_Manager,ne_Manager/ne_Team/Id $expand=ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building
- actual = getExpandSelectTree("ne_Manager,ne_Manager/ne_Team/Id", "ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building").toJsonString();
+ // $select=ne_Manager,ne_Manager/ne_Team/Id $expand=ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building
+ actual =
+ getExpandSelectTree("ne_Manager,ne_Manager/ne_Team/Id", "ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building")
+ .toJsonString();
if (!expected1.equals(actual) && !expected2.equals(actual)) {
fail("Either " + expected1 + " or " + expected2 + " expected but was: " + actual);
}
- //$select=ne_Manager/ne_Team/Id,ne_Manager $expand=ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building
- actual = getExpandSelectTree("ne_Manager/ne_Team/Id,ne_Manager", "ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building").toJsonString();
+ // $select=ne_Manager/ne_Team/Id,ne_Manager $expand=ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building
+ actual =
+ getExpandSelectTree("ne_Manager/ne_Team/Id,ne_Manager", "ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building")
+ .toJsonString();
if (!expected1.equals(actual) && !expected2.equals(actual)) {
fail("Either " + expected1 + " or " + expected2 + " expected but was: " + actual);
}
@@ -441,16 +489,25 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
@Test
public void oneExpandsFourSelects() throws Exception {
- //{"all":false,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[{"ne_Room":{"all":true,"properties":[],"links":[{"nr_Building":{"all":true,"properties":[],"links":[]}}]}}]}}]}
- String expected = "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}}]}";
+ // {"all":false,"properties":[],"links":[{"ne_Manager":{"all":true,"properties":[],"links":[{"ne_Room":
+ //{"all":true,"properties":[],"links":[{"nr_Building":{"all":true,"properties":[],"links":[]}}]}}]}}]}
+ String expected =
+ "{\"all\":false,\"properties\":[],\"links\":[{\"ne_Manager\":{\"all\":true,\"properties\":[],\"links\":" +
+ "[{\"ne_Room\":{\"all\":true,\"properties\":[],\"links\":[{\"nr_Building\":{\"all\":true,\"properties\":" +
+ "[],\"links\":[]}}]}}]}}]}";
- //$select=ne_Manager/EmployeeId,ne_Manager/ne_Room/Id,ne_Manager/ne_Room/nr_Building/Id,ne_Manager $expand=ne_Manager/ne_Room/nr_Building
- String actual = getExpandSelectTree("ne_Manager/EmployeeId,ne_Manager/ne_Room/Id,ne_Manager/ne_Room/nr_Building/Id,ne_Manager", "ne_Manager/ne_Room/nr_Building").toJsonString();
+ // $select=ne_Manager/EmployeeId,ne_Manager/ne_Room/Id,ne_Manager/ne_Room/nr_Building/Id,ne_Manager
+ // $expand=ne_Manager/ne_Room/nr_Building
+ String actual =
+ getExpandSelectTree("ne_Manager/EmployeeId,ne_Manager/ne_Room/Id,ne_Manager/ne_Room/nr_Building/Id,ne_Manager",
+ "ne_Manager/ne_Room/nr_Building").toJsonString();
assertEquals(expected, actual);
}
- private ExpandSelectTreeNodeImpl getExpandSelectTree(final String selectString, final String expandString) throws Exception {
- final List<PathSegment> pathSegments = MockFacade.getPathSegmentsAsODataPathSegmentMock(Arrays.asList("Employees('1')"));
+ private ExpandSelectTreeNodeImpl getExpandSelectTree(final String selectString, final String expandString)
+ throws Exception {
+ final List<PathSegment> pathSegments =
+ MockFacade.getPathSegmentsAsODataPathSegmentMock(Arrays.asList("Employees('1')"));
Map<String, String> queryParameters = new HashMap<String, String>();
if (selectString != null) {
@@ -462,7 +519,8 @@ public class ExpandSelectTreeCreatorImplTest extends BaseTest {
final UriInfo uriInfo = UriParser.parse(edm, pathSegments, queryParameters);
- ExpandSelectTreeCreator expandSelectTreeCreator = new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
+ ExpandSelectTreeCreator expandSelectTreeCreator =
+ new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
ExpandSelectTreeNode expandSelectTree = expandSelectTreeCreator.create();
assertNotNull(expandSelectTree);
return (ExpandSelectTreeNodeImpl) expandSelectTree;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java
index 8790880..9e7f0a6 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java
index 54a3ec2..97fe846 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
@@ -56,11 +56,11 @@ public class UriInfoTest extends BaseTest {
}
/**
- * Parse the URI part after an OData service root, given as string.
- * Query parameters can be included.
- * @param uri the URI part
- * @return a {@link UriInfoImpl} instance containing the parsed information
- */
+ * Parse the URI part after an OData service root, given as string.
+ * Query parameters can be included.
+ * @param uri the URI part
+ * @return a {@link UriInfoImpl} instance containing the parsed information
+ */
private UriInfoImpl parse(final String uri) throws UriSyntaxException, UriNotMatchingException, EdmException {
final String[] path = uri.split("\\?", -1);
if (path.length > 2) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java
index 242c3d9..e608d9b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java
index 9ec3c51..b914347 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
@@ -54,7 +54,7 @@ import org.junit.Test;
/**
* Tests for OData URI parsing.
- *
+ *
*/
public class UriParserTest extends BaseTest {
@@ -66,11 +66,11 @@ public class UriParserTest extends BaseTest {
}
/**
- * Parse the URI part after an OData service root, given as string.
- * Query parameters can be included.
- * @param uri the URI part
- * @return a {@link UriInfoImpl} instance containing the parsed information
- */
+ * Parse the URI part after an OData service root, given as string.
+ * Query parameters can be included.
+ * @param uri the URI part
+ * @return a {@link UriInfoImpl} instance containing the parsed information
+ */
private UriInfoImpl parse(final String uri) throws UriSyntaxException, UriNotMatchingException, EdmException {
final String[] path = uri.split("\\?", -1);
if (path.length > 2) {
@@ -135,7 +135,9 @@ public class UriParserTest extends BaseTest {
result = parse("");
assertEquals(UriType.URI0, result.getUriType());
- result = (UriInfoImpl) new UriParserImpl(edm).parse(Collections.<PathSegment> emptyList(), Collections.<String, String> emptyMap());
+ result =
+ (UriInfoImpl) new UriParserImpl(edm).parse(Collections.<PathSegment> emptyList(), Collections
+ .<String, String> emptyMap());
assertEquals(UriType.URI0, result.getUriType());
}
@@ -599,7 +601,8 @@ public class UriParserTest extends BaseTest {
UriInfoImpl result = parse("EmployeeSearch?q='Hugo'¬aparameter=2");
assertEquals("EmployeeSearch", result.getFunctionImport().getName());
assertEquals(1, result.getFunctionImportParameters().size());
- assertEquals(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance(), result.getFunctionImportParameters().get("q").getType());
+ assertEquals(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance(), result.getFunctionImportParameters().get("q")
+ .getType());
assertEquals("Hugo", result.getFunctionImportParameters().get("q").getLiteral());
}
@@ -773,8 +776,10 @@ public class UriParserTest extends BaseTest {
@Test
public void parseInCompatibleSystemQueryOptions() throws Exception {
parseWrongUri("$metadata?$top=1", UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
- parseWrongUri("Employees('1')?$format=json&$inlinecount=allpages&$skiptoken=abc&$skip=2&$top=1", UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
- parseWrongUri("/Employees('1')/Location/Country/$value?$format=json", UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
+ parseWrongUri("Employees('1')?$format=json&$inlinecount=allpages&$skiptoken=abc&$skip=2&$top=1",
+ UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
+ parseWrongUri("/Employees('1')/Location/Country/$value?$format=json",
+ UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
parseWrongUri("/Employees('1')/Location/Country/$value?$skip=2", UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
parseWrongUri("/Employees('1')/EmployeeName/$value?$format=json", UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
parseWrongUri("/Employees('1')/EmployeeName/$value?$skip=2", UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
@@ -813,7 +818,8 @@ public class UriParserTest extends BaseTest {
assertEquals(UriType.URI1, result.getUriType());
assertEquals(1, result.getSelect().size());
assertEquals(1, result.getSelect().get(0).getNavigationPropertySegments().size());
- assertEquals("Managers", result.getSelect().get(0).getNavigationPropertySegments().get(0).getTargetEntitySet().getName());
+ assertEquals("Managers", result.getSelect().get(0).getNavigationPropertySegments().get(0).getTargetEntitySet()
+ .getName());
assertNull(result.getSelect().get(0).getProperty());
result = parse("Teams?$select=nt_Employees/ne_Manager/*");
@@ -839,7 +845,8 @@ public class UriParserTest extends BaseTest {
assertEquals("EmployeeName", result.getSelect().get(1).getProperty().getName());
assertEquals("Location", result.getSelect().get(2).getProperty().getName());
assertEquals(1, result.getSelect().get(0).getNavigationPropertySegments().size());
- assertEquals("Managers", result.getSelect().get(0).getNavigationPropertySegments().get(0).getTargetEntitySet().getName());
+ assertEquals("Managers", result.getSelect().get(0).getNavigationPropertySegments().get(0).getTargetEntitySet()
+ .getName());
result = parse("Managers('1')?$select=nm_Employees/EmployeeName,nm_Employees/Location");
assertEquals("Managers", result.getTargetEntitySet().getName());
@@ -848,7 +855,8 @@ public class UriParserTest extends BaseTest {
assertEquals("EmployeeName", result.getSelect().get(0).getProperty().getName());
assertEquals("Location", result.getSelect().get(1).getProperty().getName());
assertEquals(1, result.getSelect().get(0).getNavigationPropertySegments().size());
- assertEquals("Employees", result.getSelect().get(0).getNavigationPropertySegments().get(0).getTargetEntitySet().getName());
+ assertEquals("Employees", result.getSelect().get(0).getNavigationPropertySegments().get(0).getTargetEntitySet()
+ .getName());
}
@Test
@@ -876,7 +884,8 @@ public class UriParserTest extends BaseTest {
assertEquals(1, result.getExpand().size());
assertEquals(1, result.getExpand().get(0).size());
assertEquals("Employees", result.getExpand().get(0).get(0).getTargetEntitySet().getName());
- assertEquals(result.getTargetEntitySet().getEntityType().getProperty("nm_Employees"), result.getExpand().get(0).get(0).getNavigationProperty());
+ assertEquals(result.getTargetEntitySet().getEntityType().getProperty("nm_Employees"), result.getExpand().get(0)
+ .get(0).getNavigationProperty());
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
index 203344b..87f42ed 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -37,33 +37,38 @@ public class FilterParserImplTool extends FilterParserImpl {
public void addTestfunctions() {
Map<String, InfoMethod> lAvailableMethods = new HashMap<String, InfoMethod>(availableMethods);
ParameterSetCombination combination = null;
- //create type helpers
+ // create type helpers
- //TESTING
+ // TESTING
combination = new ParameterSetCombination.PSCflex();
- lAvailableMethods.put("testingMINMAX1", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX1", -1, -1, combination));
+ lAvailableMethods.put("testingMINMAX1",
+ new InfoMethod(MethodOperator.CONCAT, "testingMINMAX1", -1, -1, combination));
- //TESTING
+ // TESTING
combination = new ParameterSetCombination.PSCflex();
- lAvailableMethods.put("testingMINMAX2", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX2", 0, -1, combination));
+ lAvailableMethods
+ .put("testingMINMAX2", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX2", 0, -1, combination));
- //TESTING
+ // TESTING
combination = new ParameterSetCombination.PSCflex();
- lAvailableMethods.put("testingMINMAX3", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX3", 2, -1, combination));
+ lAvailableMethods
+ .put("testingMINMAX3", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX3", 2, -1, combination));
- //TESTING
+ // TESTING
combination = new ParameterSetCombination.PSCflex();
- lAvailableMethods.put("testingMINMAX4", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX4", -1, 0, combination));
+ lAvailableMethods
+ .put("testingMINMAX4", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX4", -1, 0, combination));
- //TESTING
+ // TESTING
combination = new ParameterSetCombination.PSCflex();
- lAvailableMethods.put("testingMINMAX5", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX5", -1, 2, combination));
+ lAvailableMethods
+ .put("testingMINMAX5", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX5", -1, 2, combination));
- //TESTING
+ // TESTING
combination = new ParameterSetCombination.PSCflex();
lAvailableMethods.put("testingMINMAX6", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX6", 1, 2, combination));
- //TESTING
+ // TESTING
combination = new ParameterSetCombination.PSCflex();
lAvailableMethods.put("testingMINMAX7", new InfoMethod(MethodOperator.CONCAT, "testingMINMAX7", 1, 1, combination));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
index 7274a6c..17e62e9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -183,7 +183,8 @@ public class FilterToJsonTest {
checkProperty(path, null, "PostalCode");
}
- private void checkUnary(final StringMap<Object> unary, final UnaryOperator expectedOperator, final String expectedType) {
+ private void
+ checkUnary(final StringMap<Object> unary, final UnaryOperator expectedOperator, final String expectedType) {
assertEquals(ExpressionKind.UNARY.toString(), unary.get(NODETYPE));
assertEquals(expectedOperator.toString(), unary.get(OPERATOR));
assertEquals(expectedType, unary.get(TYPE));
@@ -197,7 +198,8 @@ public class FilterToJsonTest {
assertNotNull(member.get(PATH));
}
- private void checkMethod(final StringMap<Object> method, final MethodOperator expectedOperator, final String expectedType) {
+ private void checkMethod(final StringMap<Object> method, final MethodOperator expectedOperator,
+ final String expectedType) {
assertEquals(ExpressionKind.METHOD.toString(), method.get(NODETYPE));
assertEquals(expectedOperator.toString(), method.get(OPERATOR));
assertEquals(expectedType, method.get(TYPE));
@@ -216,7 +218,8 @@ public class FilterToJsonTest {
assertEquals(expectedValue, literal.get(VALUE));
}
- private void checkBinary(final StringMap<Object> binary, final String expectedOperator, final String expectedType) throws Exception {
+ private void checkBinary(final StringMap<Object> binary, final String expectedOperator, final String expectedType)
+ throws Exception {
assertEquals(ExpressionKind.BINARY.toString(), binary.get(NODETYPE));
assertEquals(expectedOperator, binary.get(OPERATOR));
assertEquals(expectedType, binary.get(TYPE));
@@ -224,7 +227,8 @@ public class FilterToJsonTest {
assertNotNull(binary.get(RIGHT));
}
- private static String toJson(final FilterExpression expression) throws ExceptionVisitExpression, ODataApplicationException {
+ private static String toJson(final FilterExpression expression) throws ExceptionVisitExpression,
+ ODataApplicationException {
return (String) expression.accept(new JsonVisitor());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
index 86c9e2e..1c7d08b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -72,7 +72,8 @@ public class ParserTool {
ParserTool.log.debug(out);
}
- public ParserTool(final String expression, final boolean isOrder, final boolean addTestfunctions, final boolean allowOnlyBinary) {
+ public ParserTool(final String expression, final boolean isOrder, final boolean addTestfunctions,
+ final boolean allowOnlyBinary) {
dout("ParserTool - Testing: " + expression);
this.expression = expression;
@@ -96,7 +97,8 @@ public class ParserTool {
curNode = tree;
}
- public ParserTool(final String expression, final boolean isOrder, final boolean addTestfunctions, final boolean allowOnlyBinary, final EdmEntityType resourceEntityType) {
+ public ParserTool(final String expression, final boolean isOrder, final boolean addTestfunctions,
+ final boolean allowOnlyBinary, final EdmEntityType resourceEntityType) {
dout("ParserTool - Testing: " + expression);
this.expression = expression;
@@ -140,7 +142,7 @@ public class ParserTool {
* Verifies that the thrown exception is of {@paramref expected}
*
* @param expected
- * Expected Exception class
+ * Expected Exception class
* @return ParserTool
*/
public ParserTool aExType(final Class<? extends Exception> expected) {
@@ -159,11 +161,10 @@ public class ParserTool {
}
/**
- * Verifies that the message text of the thrown exception serialized is
- * {@paramref messageText}
+ * Verifies that the message text of the thrown exception serialized is {@paramref messageText}
*
* @param messageText
- * Expected message text
+ * Expected message text
* @return this
*/
public ParserTool aExMsgText(final String messageText) {
@@ -384,7 +385,9 @@ public class ParserTool {
String info = "GetExpr(" + expression + ")-->";
if ((curNode.getKind() != ExpressionKind.ORDER) && (curNode.getKind() != ExpressionKind.FILTER)) {
- String out = info + "Expected: " + ExpressionKind.ORDER + " or " + ExpressionKind.FILTER + " Actual: " + curNode.getKind().toString();
+ String out =
+ info + "Expected: " + ExpressionKind.ORDER + " or " + ExpressionKind.FILTER + " Actual: "
+ + curNode.getKind().toString();
dout(" " + out);
fail(out);
}
@@ -411,7 +414,8 @@ public class ParserTool {
PropertyExpressionImpl propertyExpression = (PropertyExpressionImpl) curNode;
try {
- dout(" " + info + "Expected: Property'" + string.getName() + "' Actual: " + propertyExpression.getEdmProperty().getName());
+ dout(" " + info + "Expected: Property'" + string.getName() + "' Actual: "
+ + propertyExpression.getEdmProperty().getName());
} catch (EdmException e) {
fail("Error in aEdmProperty:" + e.getLocalizedMessage());
}
@@ -457,7 +461,9 @@ public class ParserTool {
case METHOD:
case PROPERTY:
String info = "param(" + expression + ")-->";
- info = " " + info + "Expected: " + ExpressionKind.BINARY.toString() + " or " + ExpressionKind.MEMBER.toString() + " Actual: " + curNode.getKind();
+ info =
+ " " + info + "Expected: " + ExpressionKind.BINARY.toString() + " or " + ExpressionKind.MEMBER.toString()
+ + " Actual: " + curNode.getKind();
dout(info);
fail(info);
break;
@@ -482,7 +488,9 @@ public class ParserTool {
case METHOD:
case PROPERTY:
String info = "param(" + expression + ")-->";
- info = " " + info + "Expected: " + ExpressionKind.BINARY.toString() + " or " + ExpressionKind.MEMBER.toString() + " Actual: " + curNode.getKind();
+ info =
+ " " + info + "Expected: " + ExpressionKind.BINARY.toString() + " or " + ExpressionKind.MEMBER.toString()
+ + " Actual: " + curNode.getKind();
dout(info);
fail(info);
break;
@@ -527,7 +535,8 @@ public class ParserTool {
MethodExpressionImpl methodExpressionImpl = (MethodExpressionImpl) curNode;
if (i >= methodExpressionImpl.getParameterCount()) {
String info = "param(" + expression + ")-->";
- info = " " + info + "Too wrong index! Expected max: " + methodExpressionImpl.getParameterCount() + " Actual: " + i;
+ info =
+ " " + info + "Too wrong index! Expected max: " + methodExpressionImpl.getParameterCount() + " Actual: " + i;
dout(info);
fail(info);
}
[59/59] [abbrv] git commit: cleanup jpa ref web
Posted by ch...@apache.org.
cleanup jpa ref web
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/da0e0f68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/da0e0f68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/da0e0f68
Branch: refs/heads/master
Commit: da0e0f682b82e94023f80c8dec438563f300f104
Parents: b31ec84
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 15:26:59 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 15:26:59 2013 +0200
----------------------------------------------------------------------
.../ref/extension/SalesOrderHeaderProcessor.java | 16 +++++++++-------
.../extension/SalesOrderProcessingExtension.java | 10 +++++-----
.../ref/web/JPAReferenceServiceFactory.java | 10 +++++-----
3 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da0e0f68/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java
----------------------------------------------------------------------
diff --git a/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java b/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java
index 71e29d8..a212d23 100644
--- a/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java
+++ b/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -47,7 +47,8 @@ public class SalesOrderHeaderProcessor {
}
@SuppressWarnings("unchecked")
- @FunctionImport(name = "FindAllSalesOrders", entitySet = "SalesOrders", returnType = ReturnType.ENTITY_TYPE, multiplicity = Multiplicity.MANY)
+ @FunctionImport(name = "FindAllSalesOrders", entitySet = "SalesOrders", returnType = ReturnType.ENTITY_TYPE,
+ multiplicity = Multiplicity.MANY)
public List<SalesOrderHeader> findAllSalesOrders(
@Parameter(name = "DeliveryStatusCode", facets = @Facets(maxLength = 2)) final String status) {
@@ -59,7 +60,8 @@ public class SalesOrderHeaderProcessor {
return soList;
}
- @FunctionImport(name = "CheckATP", returnType = ReturnType.SCALAR, multiplicity = Multiplicity.ONE, httpMethod = @HttpMethod(name = Name.GET))
+ @FunctionImport(name = "CheckATP", returnType = ReturnType.SCALAR, multiplicity = Multiplicity.ONE,
+ httpMethod = @HttpMethod(name = Name.GET))
public boolean checkATP(
@Parameter(name = "SoID", facets = @Facets(nullable = false), mode = Mode.IN) final Long soID,
@Parameter(name = "LiId", facets = @Facets(nullable = false), mode = Mode.IN) final Long lineItemID) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da0e0f68/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderProcessingExtension.java
----------------------------------------------------------------------
diff --git a/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderProcessingExtension.java b/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderProcessingExtension.java
index de73088..6b82899 100644
--- a/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderProcessingExtension.java
+++ b/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderProcessingExtension.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da0e0f68/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/web/JPAReferenceServiceFactory.java
----------------------------------------------------------------------
diff --git a/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/web/JPAReferenceServiceFactory.java b/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/web/JPAReferenceServiceFactory.java
index ac4638e..2452db0 100644
--- a/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/web/JPAReferenceServiceFactory.java
+++ b/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/web/JPAReferenceServiceFactory.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
[11/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
index 683861c..933bbb1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -32,40 +32,46 @@ public class TestParserExceptions extends TestBase {
public void testOPMparseOrderByString() {
EdmEntityType edmEtAllTypes = edmInfo.getTypeEtAllTypes();
- //CASE 1
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20ascc
- //-->Syntax error at position 10.
- GetPTO(edmEtAllTypes, "String ascc").aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String ascc\".");
+ // CASE 1
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20ascc
+ // -->Syntax error at position 10.
+ GetPTO(edmEtAllTypes, "String ascc").aExMsgText(
+ "Invalid sort order in OData orderby parser at position 8 in \"String ascc\".");
- //CASE 2
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20asc,
- //-->Expression expected at position 12.
+ // CASE 2
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20asc,
+ // -->Expression expected at position 12.
GetPTO(edmEtAllTypes, "String asc,").aExMsgText("Expression expected after position 11 in \"String asc,\".");
- //CASE 3
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20asc%20d
- //-->Syntax error at position 14.
- GetPTO(edmEtAllTypes, "String asc a").aExMsgText("Comma or end of expression expected at position 12 in \"String asc a\".");
-
- //CASE 4
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice b
- //-->Syntax error at position 10.
- GetPTO(edmEtAllTypes, "String b").aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String b\".");
-
- //CASE 5
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice, UnitPrice b
- //-->Syntax error at position 21.
- GetPTO(edmEtAllTypes, "String, String b").aExMsgText("Invalid sort order in OData orderby parser at position 16 in \"String, String b\".");
-
- //CASE 6
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice a, UnitPrice desc
- //-->Syntax error at position 10.
- GetPTO(edmEtAllTypes, "String a, String desc").aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String a, String desc\".");
-
- //CASE 7
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice asc, UnitPrice b
- //-->Syntax error at position 25.
- GetPTO(edmEtAllTypes, "String asc, String b").aExMsgText("Invalid sort order in OData orderby parser at position 20 in \"String asc, String b\".");
+ // CASE 3
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20asc%20d
+ // -->Syntax error at position 14.
+ GetPTO(edmEtAllTypes, "String asc a").aExMsgText(
+ "Comma or end of expression expected at position 12 in \"String asc a\".");
+
+ // CASE 4
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice b
+ // -->Syntax error at position 10.
+ GetPTO(edmEtAllTypes, "String b").aExMsgText(
+ "Invalid sort order in OData orderby parser at position 8 in \"String b\".");
+
+ // CASE 5
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice, UnitPrice b
+ // -->Syntax error at position 21.
+ GetPTO(edmEtAllTypes, "String, String b").aExMsgText(
+ "Invalid sort order in OData orderby parser at position 16 in \"String, String b\".");
+
+ // CASE 6
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice a, UnitPrice desc
+ // -->Syntax error at position 10.
+ GetPTO(edmEtAllTypes, "String a, String desc").aExMsgText(
+ "Invalid sort order in OData orderby parser at position 8 in \"String a, String desc\".");
+
+ // CASE 7
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice asc, UnitPrice b
+ // -->Syntax error at position 25.
+ GetPTO(edmEtAllTypes, "String asc, String b").aExMsgText(
+ "Invalid sort order in OData orderby parser at position 20 in \"String asc, String b\".");
}
@@ -73,214 +79,321 @@ public class TestParserExceptions extends TestBase {
public void testPMvalidateEdmProperty() {
EdmEntityType edmEtAllTypes = edmInfo.getTypeEtAllTypes();
- //OK
+ // OK
GetPTF(edmEtAllTypes, "'text' eq String").aKind(ExpressionKind.BINARY).aSerialized("{'text' eq String}");
- //CASE 1
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=NotAProperty
- //-->No property 'NotAProperty' exists in type 'ODataWeb.Northwind.Model.Product' at position 10.
- GetPTF(edmEtAllTypes, "NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.EtAllTypes\" at position 1 in \"NotAProperty\".");
-
- //CASE 2
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='text'%20eq%20NotAProperty
- //-->No property 'NotAProperty' exists in type 'ODataWeb.Northwind.Model.Product' at position 10.
- GetPTF(edmEtAllTypes, "'text' eq NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.EtAllTypes\" at position 11 in \"'text' eq NotAProperty\".");
-
- //CASE 3
- GetPTF(edmEtAllTypes, "Complex/NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.CtAllTypes\" at position 9 in \"Complex/NotAProperty\".");
-
- //CASE 4
- GetPTF(edmEtAllTypes, "'text' eq Complex/NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.CtAllTypes\" at position 19 in \"'text' eq Complex/NotAProperty\".");
-
- //CASE 5
- GetPTF(edmEtAllTypes, "String/NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"Edm.String\" at position 8 in \"String/NotAProperty\".");
-
- //CASE 6
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='aText'/NotAProperty
- //-->Exception Stack
- GetPTF(edmEtAllTypes, "'aText'/NotAProperty").aExMsgText("Leftside of method operator at position 8 is not a property in \"'aText'/NotAProperty\".");
-
- //CASE 7
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='Hong Kong' eq ProductName/city
- //--> No property 'city' exists in type 'System.String' at position 27.
- GetPTF(edmEtAllTypes, "'Hong Kong' eq DateTime/city").aExMsgText("No property \"city\" exists in type \"Edm.DateTime\" at position 25 in \"'Hong Kong' eq DateTime/city\".");
-
- //CASE 8
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='Hong Kong' eq ProductName/city
- //--> No property 'city' exists in type 'System.String' at position 27.
- GetPTF(edmEtAllTypes, "'Hong Kong' eq String/city").aExMsgText("No property \"city\" exists in type \"Edm.String\" at position 23 in \"'Hong Kong' eq String/city\".");
+ // CASE 1
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=NotAProperty
+ // -->No property 'NotAProperty' exists in type 'ODataWeb.Northwind.Model.Product' at position 10.
+ GetPTF(edmEtAllTypes, "NotAProperty").aExMsgText(
+ "No property \"NotAProperty\" exists in type \"TecRefScenario.EtAllTypes\" at position 1 in \"NotAProperty\".");
+
+ // CASE 2
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='text'%20eq%20NotAProperty
+ // -->No property 'NotAProperty' exists in type 'ODataWeb.Northwind.Model.Product' at position 10.
+ GetPTF(edmEtAllTypes, "'text' eq NotAProperty")
+ .aExMsgText(
+ "No property \"NotAProperty\" exists in type \"TecRefScenario.EtAllTypes\" at" +
+ " position 11 in \"'text' eq NotAProperty\".");
+
+ // CASE 3
+ GetPTF(edmEtAllTypes, "Complex/NotAProperty")
+ .aExMsgText(
+ "No property \"NotAProperty\" exists in type \"TecRefScenario.CtAllTypes\" at" +
+ " position 9 in \"Complex/NotAProperty\".");
+
+ // CASE 4
+ GetPTF(edmEtAllTypes, "'text' eq Complex/NotAProperty")
+ .aExMsgText(
+ "No property \"NotAProperty\" exists in type \"TecRefScenario.CtAllTypes\" at " +
+ "position 19 in \"'text' eq Complex/NotAProperty\".");
+
+ // CASE 5
+ GetPTF(edmEtAllTypes, "String/NotAProperty").aExMsgText(
+ "No property \"NotAProperty\" exists in type \"Edm.String\" at position 8 in \"String/NotAProperty\".");
+
+ // CASE 6
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='aText'/NotAProperty
+ // -->Exception Stack
+ GetPTF(edmEtAllTypes, "'aText'/NotAProperty").aExMsgText(
+ "Leftside of method operator at position 8 is not a property in \"'aText'/NotAProperty\".");
+
+ // CASE 7
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='Hong Kong' eq ProductName/city
+ // --> No property 'city' exists in type 'System.String' at position 27.
+ GetPTF(edmEtAllTypes, "'Hong Kong' eq DateTime/city").aExMsgText(
+ "No property \"city\" exists in type \"Edm.DateTime\" at position 25 in \"'Hong Kong' eq DateTime/city\".");
+
+ // CASE 8
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='Hong Kong' eq ProductName/city
+ // --> No property 'city' exists in type 'System.String' at position 27.
+ GetPTF(edmEtAllTypes, "'Hong Kong' eq String/city").aExMsgText(
+ "No property \"city\" exists in type \"Edm.String\" at position 23 in \"'Hong Kong' eq String/city\".");
}
@Test
public void testPMreadParameters() {
- //OK
+ // OK
GetPTF("concat('A','B')").aSerialized("{concat('A','B')}");
- //CASE 12
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith()
- //-->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions considered are: startswith(System.String, System.String).
- GetPTF("startswith()").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith()\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
-
- //CASE 13
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A')
- //-->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions considered are: startswith(System.String, System.String).
- GetPTF("startswith('A')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith('A')\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
-
- //CASE 14
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A','B')
- //-->Resource not found for the segment 'Supplier'.
+ // CASE 12
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith()
+ // -->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions
+ // considered are: startswith(System.String, System.String).
+ GetPTF("startswith()")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"startswith\" at position 1 in \"startswith()\" with the specified " +
+ "arguments. Method \"startswith\" requires exact 2 argument(s).");
+
+ // CASE 13
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A')
+ // -->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions
+ // considered are: startswith(System.String, System.String).
+ GetPTF("startswith('A')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"startswith\" at position 1 in \"startswith('A')\" with the specified " +
+ "arguments. Method \"startswith\" requires exact 2 argument(s).");
+
+ // CASE 14
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A','B')
+ // -->Resource not found for the segment 'Supplier'.
GetPTF("startswith('A','B')").aSerialized("{startswith('A','B')}");
- //CASE 15
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A','B','C')
- //-->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions considered are: startswith(System.String, System.String).
- GetPTF("startswith('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith('A','B','C')\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
-
- //CASE 16
- GetPTF("concat()").aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat()\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
- //CASE 17
- GetPTF("concat('A')").aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
- //CASE 18
+ // CASE 15
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A','B','C')
+ // -->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions
+ // considered are: startswith(System.String, System.String).
+ GetPTF("startswith('A','B','C')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"startswith\" at position 1 in \"startswith('A','B','C')\" with the" +
+ " specified arguments. Method \"startswith\" requires exact 2 argument(s).");
+
+ // CASE 16
+ GetPTF("concat()")
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"concat()\" with the specified arguments." +
+ " Method \"concat\" requires 2 or more arguments.");
+ // CASE 17
+ GetPTF("concat('A')")
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"concat('A')\" with the specified " +
+ "arguments. Method \"concat\" requires 2 or more arguments.");
+ // CASE 18
GetPTF("concat('A','B')").aSerialized("{concat('A','B')}");
- //CASE 19
+ // CASE 19
GetPTF("concat('A','B','C')").aSerialized("{concat('A','B','C')}");
- //CASE 20
- GetPTF("'A' and concat('A')").aExMsgText("No applicable method found for \"concat\" at position 9 in \"'A' and concat('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
-
- //CASE 1
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(
- //-->Expression expected at position 7.
- GetPTF("concat(").aExType(ExpressionParserException.class).aExMsgText("Expression expected after position 7 in \"concat(\".");
-
- //CASE 2
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(123
- //-->')' or ',' expected at position 10.
- GetPTF("concat(123").aExType(ExpressionParserException.class).aExMsgText("\")\" or \",\" expected after position 10 in \"concat(123\".");
- //.aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 7 in \"concat(\".");
-
- //CASE 3
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(,
- //Expression expected at position 7.
- GetPTF("concat(,").aExType(ExpressionParserException.class).aExMsgText("Expression expected at position 8 in \"concat(,\".");
-
- //CASE 4
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(123,
- //-->Expression expected at position 11.
- GetPTF("concat(123,").aExType(ExpressionParserException.class).aExMsgText("Expression expected after position 11 in \"concat(123,\".");
-
- //CASE 5
- //min = -1, max = -1,
+ // CASE 20
+ GetPTF("'A' and concat('A')")
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 9 in \"'A' and concat('A')\" with the specified " +
+ "arguments. Method \"concat\" requires 2 or more arguments.");
+
+ // CASE 1
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(
+ // -->Expression expected at position 7.
+ GetPTF("concat(").aExType(ExpressionParserException.class).aExMsgText(
+ "Expression expected after position 7 in \"concat(\".");
+
+ // CASE 2
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(123
+ // -->')' or ',' expected at position 10.
+ GetPTF("concat(123").aExType(ExpressionParserException.class).aExMsgText(
+ "\")\" or \",\" expected after position 10 in \"concat(123\".");
+ // .aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 7 in \"concat(\".");
+
+ // CASE 3
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(,
+ // Expression expected at position 7.
+ GetPTF("concat(,").aExType(ExpressionParserException.class).aExMsgText(
+ "Expression expected at position 8 in \"concat(,\".");
+
+ // CASE 4
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(123,
+ // -->Expression expected at position 11.
+ GetPTF("concat(123,").aExType(ExpressionParserException.class).aExMsgText(
+ "Expression expected after position 11 in \"concat(123,\".");
+
+ // CASE 5
+ // min = -1, max = -1,
GetPTF("testingMINMAX1()").aSerialized("{concat()}");
GetPTF("testingMINMAX1('A')").aSerialized("{concat('A')}");
GetPTF("testingMINMAX1('A','B')").aSerialized("{concat('A','B')}");
GetPTF("testingMINMAX1('A','B','C')").aSerialized("{concat('A','B','C')}");
- //CASE 6
- //min = 0, max = -1,
+ // CASE 6
+ // min = 0, max = -1,
GetPTF("testingMINMAX2()").aSerialized("{concat()}");
GetPTF("testingMINMAX2('A')").aSerialized("{concat('A')}");
GetPTF("testingMINMAX2('A','B')").aSerialized("{concat('A','B')}");
GetPTF("testingMINMAX2('A','B','C')").aSerialized("{concat('A','B','C')}");
- //CASE 7
- //min = 2, max = -1,
- GetPTF("testingMINMAX3()").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX3()\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
- GetPTF("testingMINMAX3('A')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX3('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
+ // CASE 7
+ // min = 2, max = -1,
+ GetPTF("testingMINMAX3()")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX3()\" with the specified " +
+ "arguments. Method \"concat\" requires 2 or more arguments.");
+ GetPTF("testingMINMAX3('A')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX3('A')\" with the specified " +
+ "arguments. Method \"concat\" requires 2 or more arguments.");
GetPTF("testingMINMAX3('A','B')").aSerialized("{concat('A','B')}");
GetPTF("testingMINMAX3('A','B','C')").aSerialized("{concat('A','B','C')}");
- //CASE 8
- //min =-1, max = 0,
+ // CASE 8
+ // min =-1, max = 0,
GetPTF("testingMINMAX4()").aSerialized("{concat()}");
- GetPTF("testingMINMAX4('A')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
- GetPTF("testingMINMAX4('A','B')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A','B')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
- GetPTF("testingMINMAX4('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A','B','C')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
-
- //CASE 9
- //min =-1, max = 2,
+ GetPTF("testingMINMAX4('A')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A')\" with the specified " +
+ "arguments. Method \"concat\" requires maximal 0 arguments.");
+ GetPTF("testingMINMAX4('A','B')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A','B')\" with the " +
+ "specified arguments. Method \"concat\" requires maximal 0 arguments.");
+ GetPTF("testingMINMAX4('A','B','C')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A','B','C')\" with the " +
+ "specified arguments. Method \"concat\" requires maximal 0 arguments.");
+
+ // CASE 9
+ // min =-1, max = 2,
GetPTF("testingMINMAX5()").aSerialized("{concat()}");
GetPTF("testingMINMAX5('A')").aSerialized("{concat('A')}");
GetPTF("testingMINMAX5('A','B')").aSerialized("{concat('A','B')}");
- GetPTF("testingMINMAX5('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX5('A','B','C')\" with the specified arguments. Method \"concat\" requires maximal 2 arguments.");
-
- //CASE 10
- // min =1, max = 2,
- GetPTF("testingMINMAX6()").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX6()\" with the specified arguments. Method \"concat\" requires between 1 and 2 arguments.");
+ GetPTF("testingMINMAX5('A','B','C')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX5('A','B','C')\" with the " +
+ "specified arguments. Method \"concat\" requires maximal 2 arguments.");
+
+ // CASE 10
+ // min =1, max = 2,
+ GetPTF("testingMINMAX6()")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX6()\" with the specified " +
+ "arguments. Method \"concat\" requires between 1 and 2 arguments.");
GetPTF("testingMINMAX6('A')").aSerialized("{concat('A')}");
GetPTF("testingMINMAX6('A','B')").aSerialized("{concat('A','B')}");
- GetPTF("testingMINMAX6('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX6('A','B','C')\" with the specified arguments. Method \"concat\" requires between 1 and 2 arguments.");
-
- //CASE 11
- // min =1, max = 2,
- GetPTF("testingMINMAX7()").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7()\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
+ GetPTF("testingMINMAX6('A','B','C')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX6('A','B','C')\" with the " +
+ "specified arguments. Method \"concat\" requires between 1 and 2 arguments.");
+
+ // CASE 11
+ // min =1, max = 2,
+ GetPTF("testingMINMAX7()")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX7()\" with the specified " +
+ "arguments. Method \"concat\" requires exact 1 argument(s).");
GetPTF("testingMINMAX7('A')").aSerialized("{concat('A')}");
- GetPTF("testingMINMAX7('A','B')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7('A','B')\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
- GetPTF("testingMINMAX7('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7('A','B','C')\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
-
- //CASE 12
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat('a' 'b')
- //-->')' or ',' expected at position 11.
+ GetPTF("testingMINMAX7('A','B')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX7('A','B')\" with the " +
+ "specified arguments. Method \"concat\" requires exact 1 argument(s).");
+ GetPTF("testingMINMAX7('A','B','C')")
+ .aExType(ExpressionParserException.class)
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"testingMINMAX7('A','B','C')\" with " +
+ "the specified arguments. Method \"concat\" requires exact 1 argument(s).");
+
+ // CASE 12
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat('a' 'b')
+ // -->')' or ',' expected at position 11.
GetPTF("concat('a' 'b')").aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
}
@Test
public void testPMreadParenthesis() {
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=(123
- //-->')' or operator expected at position 4.
- GetPTF("(123").aExType(ExpressionParserException.class).aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 1 in \"(123\".");
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=(123
+ // -->')' or operator expected at position 4.
+ GetPTF("(123").aExType(ExpressionParserException.class).aExMsgText(
+ "Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 1 in \"(123\".");
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=(123 add (456
- //-->')' or operator expected at position 13.
- GetPTF("(123 add (456").aExType(ExpressionParserException.class).aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 10 in \"(123 add (456\".");
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=(123 add (456
+ // -->')' or operator expected at position 13.
+ GetPTF("(123 add (456").aExType(ExpressionParserException.class).aExMsgText(
+ "Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 10 in \"(123 add (456\".");
}
@Test
- public void testPMvalidateBinaryOperator() {/*PM = Parsermethod*/
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123 add 'abc'
- //-->Operator 'add' incompatible with operand types 'System.Int32' and 'System.String' at position 4.
- GetPTF("123 add 'abc'").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.INVALID_TYPES_FOR_BINARY_OPERATOR).aExMsgText("Operator \"add\" incompatible with operand types \"System.Uint7\" and \"Edm.String\" at position 5 in \"123 add 'abc'\".");
+ public void testPMvalidateBinaryOperator() {/* PM = Parsermethod */
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123 add 'abc'
+ // -->Operator 'add' incompatible with operand types 'System.Int32' and 'System.String' at position 4.
+ GetPTF("123 add 'abc'")
+ .aExType(ExpressionParserException.class)
+ .aExKey(ExpressionParserException.INVALID_TYPES_FOR_BINARY_OPERATOR)
+ .aExMsgText(
+ "Operator \"add\" incompatible with operand types \"System.Uint7\" and \"Edm.String\" at " +
+ "position 5 in \"123 add 'abc'\".");
}
@Test
- public void testPMvalidateMethodTypes() /*PM = Parsermethod*/{
- //CASE 1
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=year(327686)
- //-->No applicable function found for 'year' at position 0 with the specified arguments. The functions considered are: year(System.DateTime).
+ public void testPMvalidateMethodTypes() /* PM = Parsermethod */{
+ // CASE 1
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=year(327686)
+ // -->No applicable function found for 'year' at position 0 with the specified arguments. The functions considered
+ // are: year(System.DateTime).
String aInt32 = "327686";
- GetPTF("year(" + aInt32 + ")").aExMsgText("No applicable method found for \"year\" at position 1 in \"year(327686)\" for the specified argument types.");
+ GetPTF("year(" + aInt32 + ")").aExMsgText(
+ "No applicable method found for \"year\" at position 1 in \"year(327686)\" for the specified argument types.");
}
@Test
- public void testPMparseFilterString() { /*PM = Parsermethod*/
-
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter='123
- //-->Unterminated string literal at position 4 in ''123'.
- GetPTF("'123").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText("Unterminated string literal at position 1 in \"'123\".");
-
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add%20'123
- //-->Unterminated string literal at position 10 in '1 add '123'.
- GetPTF("1 add '123").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText("Unterminated string literal at position 7 in \"1 add '123\".");
-
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=datetime'123
- //-->Unterminated literal at position 12 in 'datetime'123'.
- GetPTF("datetime'123").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText("Unterminated string literal at position 9 in \"datetime'123\".");
-
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123%20456
- //-->Expression of type 'System.Boolean' expected at position 0.
- GetPTF("123 456").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText("Invalid token \"456\" detected after parsing at position 5 in \"123 456\".");
-
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123%20456
- //-->Expression of type 'System.Boolean' expected at position 0.
- GetPTF("123 456 789").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText("Invalid token \"456\" detected after parsing at position 5 in \"123 456 789\".");
-
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=abc%20abc
- //-->No property 'abc' exists in type 'ODataWeb.Northwind.Model.Supplier' at position 0.
- GetPTF("abc abc").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText("Invalid token \"abc\" detected after parsing at position 5 in \"abc abc\".");
+ public void testPMparseFilterString() { /* PM = Parsermethod */
+
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter='123
+ // -->Unterminated string literal at position 4 in ''123'.
+ GetPTF("'123").aExType(ExpressionParserException.class).aExKey(
+ ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText(
+ "Unterminated string literal at position 1 in \"'123\".");
+
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add%20'123
+ // -->Unterminated string literal at position 10 in '1 add '123'.
+ GetPTF("1 add '123").aExType(ExpressionParserException.class).aExKey(
+ ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText(
+ "Unterminated string literal at position 7 in \"1 add '123\".");
+
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=datetime'123
+ // -->Unterminated literal at position 12 in 'datetime'123'.
+ GetPTF("datetime'123").aExType(ExpressionParserException.class).aExKey(
+ ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText(
+ "Unterminated string literal at position 9 in \"datetime'123\".");
+
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123%20456
+ // -->Expression of type 'System.Boolean' expected at position 0.
+ GetPTF("123 456").aExType(ExpressionParserException.class).aExKey(
+ ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText(
+ "Invalid token \"456\" detected after parsing at position 5 in \"123 456\".");
+
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123%20456
+ // -->Expression of type 'System.Boolean' expected at position 0.
+ GetPTF("123 456 789").aExType(ExpressionParserException.class).aExKey(
+ ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText(
+ "Invalid token \"456\" detected after parsing at position 5 in \"123 456 789\".");
+
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=abc%20abc
+ // -->No property 'abc' exists in type 'ODataWeb.Northwind.Model.Supplier' at position 0.
+ GetPTF("abc abc").aExType(ExpressionParserException.class).aExKey(
+ ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText(
+ "Invalid token \"abc\" detected after parsing at position 5 in \"abc abc\".");
}
@Test
@@ -290,49 +403,55 @@ public class TestParserExceptions extends TestBase {
GetPTF("( 1 mul 2 )/X eq TEST").aSerialized("{{{1 mul 2}/X} eq TEST}");
- //CASE 1
+ // CASE 1
EdmEntityType edmEtAllTypes = edmInfo.getTypeEtAllTypes();
- GetPTF(edmEtAllTypes, "( 1 mul 2 )/X eq TEST").aExMsgText("Leftside of method operator at position 12 is not a property in \"( 1 mul 2 )/X eq TEST\".");
-
- //CASE 2
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=notsupportedfunction('a')
- //-->Unknown function 'notsupportedfunction' at position 0.
- GetPTF("notsupportedfunction('a')").aExMsgText("Unknown function \"notsupportedfunction\" at position 1 in \"notsupportedfunction('a')\".");
-
- //CASE 3
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=notsupportedfunction('a')
- //-->Unknown function 'notsupportedfunction' at position 0.
- GetPTF("notsupportedfunction ('a')").aExMsgText("Unknown function \"notsupportedfunction\" at position 1 in \"notsupportedfunction ('a')\".");
-
- //CASE 4
- //Use \ instead of /
- GetPTF("Address\\NotAProperty").aExMsgText("Error while tokenizing a ODATA expression on token \"\\\" at position 8 in \"Address\\NotAProperty\".");
-
- //CASE 5
+ GetPTF(edmEtAllTypes, "( 1 mul 2 )/X eq TEST").aExMsgText(
+ "Leftside of method operator at position 12 is not a property in \"( 1 mul 2 )/X eq TEST\".");
+
+ // CASE 2
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=notsupportedfunction('a')
+ // -->Unknown function 'notsupportedfunction' at position 0.
+ GetPTF("notsupportedfunction('a')").aExMsgText(
+ "Unknown function \"notsupportedfunction\" at position 1 in \"notsupportedfunction('a')\".");
+
+ // CASE 3
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=notsupportedfunction('a')
+ // -->Unknown function 'notsupportedfunction' at position 0.
+ GetPTF("notsupportedfunction ('a')").aExMsgText(
+ "Unknown function \"notsupportedfunction\" at position 1 in \"notsupportedfunction ('a')\".");
+
+ // CASE 4
+ // Use \ instead of /
+ GetPTF("Address\\NotAProperty").aExMsgText(
+ "Error while tokenizing a ODATA expression on token \"\\\" at position 8 in \"Address\\NotAProperty\".");
+
+ // CASE 5
GetPTF("-(-(- 2d)))").aExMsgText("Invalid token \")\" detected after parsing at position 11 in \"-(-(- 2d)))\".");
- //CASE 6
+ // CASE 6
GetPTF("a b").aExMsgText("Invalid token \"b\" detected after parsing at position 3 in \"a b\".");
- //CASE 7
+ // CASE 7
GetPTF("a eq b b").aExMsgText("Invalid token \"b\" detected after parsing at position 8 in \"a eq b b\".");
- //CASE 8
- GetPTF(edmEtAllTypes, "year(Complex)").aExMsgText("No applicable method found for \"year\" at position 1 in \"year(Complex)\" for the specified argument types.");
+ // CASE 8
+ GetPTF(edmEtAllTypes, "year(Complex)").aExMsgText(
+ "No applicable method found for \"year\" at position 1 in \"year(Complex)\" for the specified argument types.");
- //CASE 9
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add%202
- //-->Expression of type 'System.Boolean' expected at position 0.
- GetPTF_onlyBinary("1 add 2").aExMsgText("Expression of type \"Edm.Boolean\" expected at position 1 in \"1 add 2\" (actual type is \"Edm.SByte\").");
+ // CASE 9
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add%202
+ // -->Expression of type 'System.Boolean' expected at position 0.
+ GetPTF_onlyBinary("1 add 2").aExMsgText(
+ "Expression of type \"Edm.Boolean\" expected at position 1 in \"1 add 2\" (actual type is \"Edm.SByte\").");
- //CASE 10
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add
- //-->Expression expected at position 5.
+ // CASE 10
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add
+ // -->Expression expected at position 5.
GetPTF_onlyBinary("1 add").aExMsgText("Expression expected after position 5 in \"1 add\".");
- //CASE 11
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add
- //-->Expression expected at position 5.
+ // CASE 11
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add
+ // -->Expression expected at position 5.
GetPTF_onlyBinary("1 add ").aExMsgText("Expression expected after position 5 in \"1 add \".");
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
index 3c7b6ba..b507fd1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -89,7 +89,7 @@ public class TestSpec extends TestBase {
@Test
public void testMinimumSpecReq() {
- //ADD
+ // ADD
GetPTF(aDecimal + " add " + aDecimal).aEdmType(decimalInst).aSerialized("{" + aDecimal + " add " + aDecimal + "}");
GetPTF(aDouble + " add " + aDouble).aEdmType(doubleInst).aSerialized("{" + aDouble + " add " + aDouble + "}");
;
@@ -97,48 +97,48 @@ public class TestSpec extends TestBase {
GetPTF(aInt64 + " add " + aInt64).aEdmType(int64Inst).aSerialized("{" + aInt64 + " add " + aInt64 + "}");
GetPTF(aInt32 + " add " + aInt32).aEdmType(int32Inst).aSerialized("{" + aInt32 + " add " + aInt32 + "}");
- //ADD
+ // ADD
GetPTF(aDecimal + " sub " + aDecimal).aEdmType(decimalInst).aSerialized("{" + aDecimal + " sub " + aDecimal + "}");
GetPTF(aDouble + " sub " + aDouble).aEdmType(doubleInst).aSerialized("{" + aDouble + " sub " + aDouble + "}");
GetPTF(aSingle + " sub " + aSingle).aEdmType(singleInst).aSerialized("{" + aSingle + " sub " + aSingle + "}");
GetPTF(aInt64 + " sub " + aInt64).aEdmType(int64Inst).aSerialized("{" + aInt64 + " sub " + aInt64 + "}");
GetPTF(aInt32 + " sub " + aInt32).aEdmType(int32Inst).aSerialized("{" + aInt32 + " sub " + aInt32 + "}");
- //MUL
+ // MUL
GetPTF(aDecimal + " mul " + aDecimal).aEdmType(decimalInst).aSerialized("{" + aDecimal + " mul " + aDecimal + "}");
GetPTF(aDouble + " mul " + aDouble).aEdmType(doubleInst).aSerialized("{" + aDouble + " mul " + aDouble + "}");
GetPTF(aSingle + " mul " + aSingle).aEdmType(singleInst).aSerialized("{" + aSingle + " mul " + aSingle + "}");
GetPTF(aInt64 + " mul " + aInt64).aEdmType(int64Inst).aSerialized("{" + aInt64 + " mul " + aInt64 + "}");
GetPTF(aInt32 + " mul " + aInt32).aEdmType(int32Inst).aSerialized("{" + aInt32 + " mul " + aInt32 + "}");
- //DIV
+ // DIV
GetPTF(aDecimal + " div " + aDecimal).aEdmType(decimalInst).aSerialized("{" + aDecimal + " div " + aDecimal + "}");
GetPTF(aDouble + " div " + aDouble).aEdmType(doubleInst).aSerialized("{" + aDouble + " div " + aDouble + "}");
GetPTF(aSingle + " div " + aSingle).aEdmType(singleInst).aSerialized("{" + aSingle + " div " + aSingle + "}");
GetPTF(aInt64 + " div " + aInt64).aEdmType(int64Inst).aSerialized("{" + aInt64 + " div " + aInt64 + "}");
GetPTF(aInt32 + " div " + aInt32).aEdmType(int32Inst).aSerialized("{" + aInt32 + " div " + aInt32 + "}");
- //MOD
+ // MOD
GetPTF(aDecimal + " mod " + aDecimal).aEdmType(decimalInst).aSerialized("{" + aDecimal + " mod " + aDecimal + "}");
GetPTF(aDouble + " mod " + aDouble).aEdmType(doubleInst).aSerialized("{" + aDouble + " mod " + aDouble + "}");
GetPTF(aSingle + " mod " + aSingle).aEdmType(singleInst).aSerialized("{" + aSingle + " mod " + aSingle + "}");
GetPTF(aInt64 + " mod " + aInt64).aEdmType(int64Inst).aSerialized("{" + aInt64 + " mod " + aInt64 + "}");
GetPTF(aInt32 + " mod " + aInt32).aEdmType(int32Inst).aSerialized("{" + aInt32 + " mod " + aInt32 + "}");
- //NEGATE
+ // NEGATE
GetPTF(" - " + aDecimal).aEdmType(decimalInst).aSerialized("{- " + aDecimal + "}");
GetPTF(" - " + aDouble).aEdmType(doubleInst).aSerialized("{- " + aDouble + "}");
GetPTF(" - " + aSingle).aEdmType(singleInst).aSerialized("{- " + aSingle + "}");
GetPTF(" - " + aInt64).aEdmType(int64Inst).aSerialized("{- " + aInt64 + "}");
GetPTF(" - " + aInt32).aEdmType(int32Inst).aSerialized("{- " + aInt32 + "}");
- //AND
+ // AND
GetPTF(aBoolean + " and " + aBoolean).aEdmType(boolInst).aSerialized("{" + aBoolean + " and " + aBoolean + "}");
- //OR
+ // OR
GetPTF(aBoolean + " or " + aBoolean).aEdmType(boolInst).aSerialized("{" + aBoolean + " or " + aBoolean + "}");
- //EQ
+ // EQ
GetPTF(aDecimal + " eq " + aDecimal).aEdmType(boolInst).aSerialized("{" + aDecimal + " eq " + aDecimal + "}");
GetPTF(aDouble + " eq " + aDouble).aEdmType(boolInst).aSerialized("{" + aDouble + " eq " + aDouble + "}");
GetPTF(aSingle + " eq " + aSingle).aEdmType(boolInst).aSerialized("{" + aSingle + " eq " + aSingle + "}");
@@ -149,7 +149,7 @@ public class TestSpec extends TestBase {
GetPTF(aGuid + " eq " + aGuid).aEdmType(boolInst).aSerialized("{" + aGuid + " eq " + aGuid + "}");
GetPTF(aBinary + " eq " + aBinary).aEdmType(boolInst).aSerialized("{" + aBinary + " eq " + aBinary + "}");
- //NE
+ // NE
GetPTF(aDecimal + " ne " + aDecimal).aEdmType(boolInst).aSerialized("{" + aDecimal + " ne " + aDecimal + "}");
GetPTF(aDouble + " ne " + aDouble).aEdmType(boolInst).aSerialized("{" + aDouble + " ne " + aDouble + "}");
GetPTF(aSingle + " ne " + aSingle).aEdmType(boolInst).aSerialized("{" + aSingle + " ne " + aSingle + "}");
@@ -160,7 +160,7 @@ public class TestSpec extends TestBase {
GetPTF(aGuid + " ne " + aGuid).aEdmType(boolInst).aSerialized("{" + aGuid + " ne " + aGuid + "}");
GetPTF(aBinary + " ne " + aBinary).aEdmType(boolInst).aSerialized("{" + aBinary + " ne " + aBinary + "}");
- //LT
+ // LT
GetPTF(aDecimal + " lt " + aDecimal).aEdmType(boolInst).aSerialized("{" + aDecimal + " lt " + aDecimal + "}");
GetPTF(aDouble + " lt " + aDouble).aEdmType(boolInst).aSerialized("{" + aDouble + " lt " + aDouble + "}");
GetPTF(aSingle + " lt " + aSingle).aEdmType(boolInst).aSerialized("{" + aSingle + " lt " + aSingle + "}");
@@ -171,7 +171,7 @@ public class TestSpec extends TestBase {
GetPTF(aGuid + " lt " + aGuid).aEdmType(boolInst).aSerialized("{" + aGuid + " lt " + aGuid + "}");
GetPTF(aBinary + " lt " + aBinary).aEdmType(boolInst).aSerialized("{" + aBinary + " lt " + aBinary + "}");
- //LE
+ // LE
GetPTF(aDecimal + " le " + aDecimal).aEdmType(boolInst).aSerialized("{" + aDecimal + " le " + aDecimal + "}");
GetPTF(aDouble + " le " + aDouble).aEdmType(boolInst).aSerialized("{" + aDouble + " le " + aDouble + "}");
GetPTF(aSingle + " le " + aSingle).aEdmType(boolInst).aSerialized("{" + aSingle + " le " + aSingle + "}");
@@ -182,7 +182,7 @@ public class TestSpec extends TestBase {
GetPTF(aGuid + " le " + aGuid).aEdmType(boolInst).aSerialized("{" + aGuid + " le " + aGuid + "}");
GetPTF(aBinary + " le " + aBinary).aEdmType(boolInst).aSerialized("{" + aBinary + " le " + aBinary + "}");
- //GT
+ // GT
GetPTF(aDecimal + " gt " + aDecimal).aEdmType(boolInst).aSerialized("{" + aDecimal + " gt " + aDecimal + "}");
GetPTF(aDouble + " gt " + aDouble).aEdmType(boolInst).aSerialized("{" + aDouble + " gt " + aDouble + "}");
GetPTF(aSingle + " gt " + aSingle).aEdmType(boolInst).aSerialized("{" + aSingle + " gt " + aSingle + "}");
@@ -193,7 +193,7 @@ public class TestSpec extends TestBase {
GetPTF(aGuid + " gt " + aGuid).aEdmType(boolInst).aSerialized("{" + aGuid + " gt " + aGuid + "}");
GetPTF(aBinary + " gt " + aBinary).aEdmType(boolInst).aSerialized("{" + aBinary + " gt " + aBinary + "}");
- //GE
+ // GE
GetPTF(aDecimal + " ge " + aDecimal).aEdmType(boolInst).aSerialized("{" + aDecimal + " ge " + aDecimal + "}");
GetPTF(aDouble + " ge " + aDouble).aEdmType(boolInst).aSerialized("{" + aDouble + " ge " + aDouble + "}");
GetPTF(aSingle + " ge " + aSingle).aEdmType(boolInst).aSerialized("{" + aSingle + " ge " + aSingle + "}");
@@ -204,77 +204,77 @@ public class TestSpec extends TestBase {
GetPTF(aGuid + " ge " + aGuid).aEdmType(boolInst).aSerialized("{" + aGuid + " ge " + aGuid + "}");
GetPTF(aBinary + " ge " + aBinary).aEdmType(boolInst).aSerialized("{" + aBinary + " ge " + aBinary + "}");
- //NOT
+ // NOT
GetPTF(" not " + aBoolean).aEdmType(boolInst);
- //ISOF is not supported
+ // ISOF is not supported
- //CAST is not supported
+ // CAST is not supported
- //BOOL lit
+ // BOOL lit
GetPTF("true").aEdmType(boolInst);
GetPTF("false").aEdmType(boolInst);
- //endsWith
+ // endsWith
GetPTF("endswith('ABC','C')").aEdmType(boolInst);
- //indexOf
+ // indexOf
GetPTF("indexof('ABC','B')").aEdmType(int32Inst);
- //replace not supported
+ // replace not supported
- //startsWith
+ // startsWith
GetPTF("startswith('ABC','C')").aEdmType(boolInst);
- //toLower
+ // toLower
GetPTF("tolower('ABC')").aEdmType(stringInst);
- //toUpper
+ // toUpper
GetPTF("toupper('ABC')").aEdmType(stringInst);
- //trim
+ // trim
GetPTF("trim('ABC')").aEdmType(stringInst);
- //substring
+ // substring
GetPTF("substring('ABC'," + aInt32 + ',' + aInt32 + ")").aEdmType(stringInst);
- //subStringOf
+ // subStringOf
GetPTF("substringof('ABC','BC')").aEdmType(boolInst);
- //concat
+ // concat
GetPTF("concat('ABC','BC')").aEdmType(stringInst);
- //tested more in deep in other testcases
+ // tested more in deep in other testcases
- //length
+ // length
GetPTF("length('ABC')").aEdmType(int32Inst);
- //year
+ // year
GetPTF("year(" + aDatetime + ")").aEdmType(int32Inst);
- //month
+ // month
GetPTF("month(" + aDatetime + ")").aEdmType(int32Inst);
- //day
+ // day
GetPTF("day(" + aDatetime + ")").aEdmType(int32Inst);
- //hour
+ // hour
GetPTF("hour(" + aDatetime + ")").aEdmType(int32Inst);
- //minute
+ // minute
GetPTF("minute(" + aDatetime + ")").aEdmType(int32Inst);
- //second
+ // second
GetPTF("second(" + aDatetime + ")").aEdmType(int32Inst);
- //round
+ // round
GetPTF("round(" + aDecimal + ")").aEdmType(decimalInst);
GetPTF("round(" + aDouble + ")").aEdmType(doubleInst);
- //floor
+ // floor
GetPTF("floor(" + aDecimal + ")").aEdmType(decimalInst);
GetPTF("floor(" + aDouble + ")").aEdmType(doubleInst);
- //ceiling
+ // ceiling
GetPTF("ceiling(" + aDecimal + ")").aEdmType(decimalInst);
GetPTF("ceiling(" + aDouble + ")").aEdmType(doubleInst);
@@ -299,14 +299,21 @@ public class TestSpec extends TestBase {
GetPTF(edmEtAllTypes, "'text' eq String").root().aKind(ExpressionKind.BINARY);
- GetPTF(edmEtAllTypes, "Complex/String").root().left().aEdmProperty(complex).aEdmType(complexType).root().right().aEdmProperty(complexString).aEdmType(complexStringType).root().aKind(ExpressionKind.MEMBER).aEdmType(complexStringType);
+ GetPTF(edmEtAllTypes, "Complex/String").root().left().aEdmProperty(complex).aEdmType(complexType).root().right()
+ .aEdmProperty(complexString).aEdmType(complexStringType).root().aKind(ExpressionKind.MEMBER).aEdmType(
+ complexStringType);
- GetPTF(edmEtAllTypes, "Complex/Address/City").root().aKind(ExpressionKind.MEMBER).root().left().aKind(ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(complexType).root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(complexAddressType).root().left().aEdmType(complexAddressType).root().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType).root().aEdmType(complexAddressCityType);
+ GetPTF(edmEtAllTypes, "Complex/Address/City").root().aKind(ExpressionKind.MEMBER).root().left().aKind(
+ ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(
+ complexType).root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(
+ complexAddressType).root().left().aEdmType(complexAddressType).root().right().aKind(ExpressionKind.PROPERTY)
+ .aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType).root().aEdmType(complexAddressCityType);
EdmProperty boolean_ = (EdmProperty) edmEtAllTypes.getProperty("Boolean");
EdmSimpleType boolean_Type = (EdmSimpleType) boolean_.getType();
- GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY).aEdmType(boolean_Type).right().aEdmProperty(boolean_).aEdmType(boolean_Type);
+ GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY).aEdmType(boolean_Type).right().aEdmProperty(
+ boolean_).aEdmType(boolean_Type);
} catch (EdmException e) {
fail("Error in testPropertiesWithEdm:" + e.getLocalizedMessage());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java
index 58990b9..5be6fc3 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -29,7 +29,7 @@ public class TestTokenizer {
@Test
public void tokenizeWhiteSpaces() throws Exception {
- //space
+ // space
getTTW(" ").at(0).aKind(TokenKind.WHITESPACE).aUriLiteral(" ").aPosition(0);
getTTW(" ").at(0).aKind(TokenKind.WHITESPACE).aUriLiteral(" ").aPosition(0);
@@ -38,7 +38,8 @@ public class TestTokenizer {
getTTW(" B").at(0).aKind(TokenKind.WHITESPACE).aUriLiteral(" ").aPosition(0);
- getTTW("A B").at(1).aKind(TokenKind.WHITESPACE).aUriLiteral(" ").aPosition(1).at(2).aKind(TokenKind.LITERAL).aUriLiteral("B").aPosition(4);
+ getTTW("A B").at(1).aKind(TokenKind.WHITESPACE).aUriLiteral(" ").aPosition(1).at(2).aKind(TokenKind.LITERAL)
+ .aUriLiteral("B").aPosition(4);
getTTW("A B C").at(3).aKind(TokenKind.WHITESPACE).aUriLiteral(" ").aPosition(5);
}
@@ -46,22 +47,22 @@ public class TestTokenizer {
@Test
public void tokenizeSymbols() throws Exception {
- //parentheses
+ // parentheses
getTT("(").aKind(TokenKind.OPENPAREN).aUriLiteral("(");
getTT("abc(").at(1).aKind(TokenKind.OPENPAREN).aUriLiteral("(").aPosition(3);
getTT(")").aKind(TokenKind.CLOSEPAREN).aUriLiteral(")");
getTT("abc)").at(1).aKind(TokenKind.CLOSEPAREN).aUriLiteral(")").aPosition(3);
- //symbol
+ // symbol
getTT(",").aKind(TokenKind.COMMA).aUriLiteral(",");
getTT("abc,").at(1).aKind(TokenKind.COMMA).aUriLiteral(",").aPosition(3);
- //minus
+ // minus
getTT("-").aKind(TokenKind.SYMBOL).aUriLiteral("-");
getTT("abc -").at(1).aKind(TokenKind.SYMBOL).aUriLiteral("-").aPosition(4);
- //minus after literal belongs to literal
+ // minus after literal belongs to literal
getTT("abc-").at(0).aKind(TokenKind.LITERAL).aUriLiteral("abc-").aPosition(0);
}
@@ -83,24 +84,26 @@ public class TestTokenizer {
getTT("a").aKind(TokenKind.LITERAL).aUriLiteral("a").aPosition(0);
getTT("abc a").at(1).aKind(TokenKind.LITERAL).aUriLiteral("a").aPosition(4);
- //string
+ // string
getTT("'a'").aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'a'").aPosition(0);
getTT("abc 'a'").at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'a'").aPosition(4);
- //"prefixed type
+ // "prefixed type
getTT("X'00'").aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("X'00'").aPosition(0);
getTT("abc X'00'").at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("X'00'").aPosition(4);
- //simple types
+ // simple types
getTT("null").aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("null").aPosition(0);
getTT("abc null").at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("null").aPosition(4);
getTT("128").aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("128").aPosition(0);
getTT("abc 128").at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("128").aPosition(4);
- //do special types
- getTT("datetime'2011-01-12T00:00:00'").aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("datetime'2011-01-12T00:00:00'").aPosition(0);
- getTT("abc datetime'2011-01-12T00:00:00'").at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("datetime'2011-01-12T00:00:00'").aPosition(4);
+ // do special types
+ getTT("datetime'2011-01-12T00:00:00'").aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("datetime'2011-01-12T00:00:00'")
+ .aPosition(0);
+ getTT("abc datetime'2011-01-12T00:00:00'").at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral(
+ "datetime'2011-01-12T00:00:00'").aPosition(4);
}
@Test
@@ -111,33 +114,37 @@ public class TestTokenizer {
@Test
public void testExceptions() throws Exception {
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter='a
- //-->Unterminated string literal at position 2 in ''a'.
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter='a
+ // -->Unterminated string literal at position 2 in ''a'.
getTT("'a").aExMsgText("Unterminated string literal at position 1 in \"'a\".");
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=X'g'
- //-->Unrecognized 'Edm.Binary' literal 'X'g'' in '0'.
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=X'g'
+ // -->Unrecognized 'Edm.Binary' literal 'X'g'' in '0'.
getTT("X'g'").aExMsgText("Type detection error for string like token 'X'g'' at position '1'.");
- //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=\
- //-->Syntax error '\' at position 0.
+ // http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=\
+ // -->Syntax error '\' at position 0.
getTT("\\").aExMsgText("Unknown character '\\' at position '0' detected in \"\\\".");
}
@Test
public void tokenizeFunction() throws Exception {
- getTT("substringof('10')").at(0).aKind(TokenKind.LITERAL).aUriLiteral("substringof").at(2).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'10'");
+ getTT("substringof('10')").at(0).aKind(TokenKind.LITERAL).aUriLiteral("substringof").at(2).aKind(
+ TokenKind.SIMPLE_TYPE).aUriLiteral("'10'");
- getTT("substringof ( '10' ) ").at(0).aKind(TokenKind.LITERAL).aUriLiteral("substringof").at(2).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'10'");
+ getTT("substringof ( '10' ) ").at(0).aKind(TokenKind.LITERAL).aUriLiteral("substringof").at(2).aKind(
+ TokenKind.SIMPLE_TYPE).aUriLiteral("'10'");
}
@Test
public void testEx1111ceptions() throws Exception {
getTT("a 1").at(0).aKind(TokenKind.LITERAL).aUriLiteral("a").at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("1");
- getTT("a eq b").at(0).aKind(TokenKind.LITERAL).aUriLiteral("a").at(1).aKind(TokenKind.LITERAL).aUriLiteral("eq").at(2).aKind(TokenKind.LITERAL).aUriLiteral("b");
+ getTT("a eq b").at(0).aKind(TokenKind.LITERAL).aUriLiteral("a").at(1).aKind(TokenKind.LITERAL).aUriLiteral("eq")
+ .at(2).aKind(TokenKind.LITERAL).aUriLiteral("b");
- getTT("start_date eq datetime'2011-01-12T00:00:00' and end_date eq datetime'2011-12-31T00:00:00'").at(2).aUriLiteral("datetime'2011-01-12T00:00:00'");
+ getTT("start_date eq datetime'2011-01-12T00:00:00' and end_date eq datetime'2011-12-31T00:00:00'").at(2)
+ .aUriLiteral("datetime'2011-01-12T00:00:00'");
getTT("'a%b'").at(0).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'a%b'");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java
index 13729f1..446d22e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -73,10 +73,10 @@ public class TokenTool {
/**
* Checks that the Type of the token matches the <code>kind</code>
- *
+ *
* @param kind Kind to be compared with the token type
* @return Returns <code>this</code>
- * @throws AssertionError
+ * @throws AssertionError
*/
public TokenTool aKind(final TokenKind kind) {
assertEquals(kind, token.getKind());
@@ -98,7 +98,7 @@ public class TokenTool {
/**
* Checks that the Value of the token matches the <code>stringValue</code>
*
- * @param stringValue Value to be compared with the token value
+ * @param stringValue Value to be compared with the token value
* @return Returns <code>this</code>
* @throws AssertionError
*/
@@ -231,9 +231,9 @@ public class TokenTool {
/**
* Verifies that the message text of the thrown exception serialized is {@paramref messageText}
- * @param messageText
- * Expected message text
- * @return this
+ * @param messageText
+ * Expected message text
+ * @return this
*/
public TokenTool aExMsgText(final String messageText) {
String info = "aExMessageText(" + expression + ")-->";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java
index 68a4312..c2b3ced 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -40,12 +40,14 @@ import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
public class VisitorTool implements ExpressionVisitor {
@Override
- public Object visitBinary(final BinaryExpression binaryExpression, final BinaryOperator operator, final Object leftSide, final Object rightSide) {
+ public Object visitBinary(final BinaryExpression binaryExpression, final BinaryOperator operator,
+ final Object leftSide, final Object rightSide) {
return "{" + leftSide.toString() + " " + operator.toUriLiteral() + " " + rightSide.toString() + "}";
}
@Override
- public Object visitFilterExpression(final FilterExpression filterExpression, final String expressionString, final Object expression) {
+ public Object visitFilterExpression(final FilterExpression filterExpression, final String expressionString,
+ final Object expression) {
return expression;
}
@@ -55,7 +57,8 @@ public class VisitorTool implements ExpressionVisitor {
}
@Override
- public Object visitMethod(final MethodExpression methodExpression, final MethodOperator method, final List<Object> retParameters) {
+ public Object visitMethod(final MethodExpression methodExpression, final MethodOperator method,
+ final List<Object> retParameters) {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append(method.toUriLiteral());
@@ -89,7 +92,8 @@ public class VisitorTool implements ExpressionVisitor {
}
@Override
- public Object visitOrderByExpression(final OrderByExpression orderByExpression, final String expressionString, final List<Object> orders) {
+ public Object visitOrderByExpression(final OrderByExpression orderByExpression, final String expressionString,
+ final List<Object> orders) {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("oc");
@@ -108,7 +112,8 @@ public class VisitorTool implements ExpressionVisitor {
}
@Override
- public Object visitOrder(final OrderExpression orderExpression, final Object filterResult, final SortOrder sortOrder) {
+ public Object visitOrder(final OrderExpression orderExpression, final Object filterResult,
+ final SortOrder sortOrder) {
return "{o(" + filterResult + ", " + sortOrder.toString() + ")}";
}
[04/59] [abbrv] Clean up of odata api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
index 759e941..d3f7355 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -27,7 +27,7 @@ package org.apache.olingo.odata2.api.exception;
* <br>To support internationalization and translation of messages, this class
* and its sub classes contain a {@link MessageReference} object which can be
* mapped to a related key and message text in the resource bundles.
- *
+ *
*/
public abstract class ODataMessageException extends ODataException {
@@ -44,18 +44,18 @@ public abstract class ODataMessageException extends ODataException {
/**
* Creates {@link ODataMessageException} with given {@link MessageReference}.
* @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
+ * of this {@link ODataMessageException}
*/
public ODataMessageException(final MessageReference messageReference) {
this(messageReference, null, null);
}
/**
- * Creates {@link ODataMessageException} with given {@link MessageReference}
- * and cause {@link Throwable} which caused this exception.
+ * Creates {@link ODataMessageException} with given {@link MessageReference} and cause {@link Throwable} which caused
+ * this exception.
* @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param cause exception which caused this exception
+ * of this {@link ODataMessageException}
+ * @param cause exception which caused this exception
*/
public ODataMessageException(final MessageReference messageReference, final Throwable cause) {
this(messageReference, cause, null);
@@ -65,9 +65,9 @@ public abstract class ODataMessageException extends ODataException {
* Creates {@link ODataMessageException} with given {@link MessageReference},
* cause {@link Throwable} and error code.
* @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param cause exception which caused this exception
- * @param errorCode a String with a unique code identifying this exception
+ * of this {@link ODataMessageException}
+ * @param cause exception which caused this exception
+ * @param errorCode a String with a unique code identifying this exception
*/
public ODataMessageException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
super(cause);
@@ -78,8 +78,8 @@ public abstract class ODataMessageException extends ODataException {
/**
* Creates {@link ODataMessageException} with given {@link MessageReference} and error code.
* @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param errorCode a String with a unique code identifying this exception
+ * of this {@link ODataMessageException}
+ * @param errorCode a String with a unique code identifying this exception
*/
public ODataMessageException(final MessageReference messageReference, final String errorCode) {
this(messageReference, null, errorCode);
@@ -87,11 +87,12 @@ public abstract class ODataMessageException extends ODataException {
/**
* Creates {@link MessageReference} objects more conveniently.
- * @param clazz exception class for message reference
+ * @param clazz exception class for message reference
* @param messageReferenceKey unique (in exception class) key for message reference
* @return created message-reference instance
*/
- protected static final MessageReference createMessageReference(final Class<? extends ODataMessageException> clazz, final String messageReferenceKey) {
+ protected static final MessageReference createMessageReference(final Class<? extends ODataMessageException> clazz,
+ final String messageReferenceKey) {
return MessageReference.create(clazz, messageReferenceKey);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
index d9250bf..e31b9b8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 405 (method not allowed).
- *
+ *
*/
public class ODataMethodNotAllowedException extends ODataHttpException {
private static final long serialVersionUID = 1L;
- public static final MessageReference DISPATCH = createMessageReference(ODataMethodNotAllowedException.class, "DISPATCH");
+ public static final MessageReference DISPATCH = createMessageReference(ODataMethodNotAllowedException.class,
+ "DISPATCH");
public ODataMethodNotAllowedException(final MessageReference messageReference) {
super(messageReference, HttpStatusCodes.METHOD_NOT_ALLOWED);
@@ -42,7 +43,8 @@ public class ODataMethodNotAllowedException extends ODataHttpException {
super(messageReference, HttpStatusCodes.METHOD_NOT_ALLOWED, errorCode);
}
- public ODataMethodNotAllowedException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
+ public ODataMethodNotAllowedException(final MessageReference messageReference, final Throwable cause,
+ final String errorCode) {
super(messageReference, cause, HttpStatusCodes.METHOD_NOT_ALLOWED, errorCode);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
index cca88ba..1832289 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,15 +22,17 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 406 not acceptable
- *
+ *
*/
public class ODataNotAcceptableException extends ODataHttpException {
private static final long serialVersionUID = 1L;
public static final MessageReference COMMON = createMessageReference(ODataNotAcceptableException.class, "COMMON");
- public static final MessageReference NOT_SUPPORTED_CONTENT_TYPE = createMessageReference(ODataNotAcceptableException.class, "NOT_SUPPORTED_CONTENT_TYPE");
- public static final MessageReference NOT_SUPPORTED_ACCEPT_HEADER = createMessageReference(ODataNotAcceptableException.class, "NOT_SUPPORTED_ACCEPT_HEADER");
+ public static final MessageReference NOT_SUPPORTED_CONTENT_TYPE = createMessageReference(
+ ODataNotAcceptableException.class, "NOT_SUPPORTED_CONTENT_TYPE");
+ public static final MessageReference NOT_SUPPORTED_ACCEPT_HEADER = createMessageReference(
+ ODataNotAcceptableException.class, "NOT_SUPPORTED_ACCEPT_HEADER");
public ODataNotAcceptableException(final MessageReference context) {
super(context, HttpStatusCodes.NOT_ACCEPTABLE);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
index 622c81e..b8fcdb3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 404 not found
- *
+ *
*/
public class ODataNotFoundException extends ODataHttpException {
@@ -43,7 +43,8 @@ public class ODataNotFoundException extends ODataHttpException {
super(messageReference, cause, HttpStatusCodes.NOT_FOUND);
}
- public ODataNotFoundException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
+ public ODataNotFoundException(final MessageReference messageReference, final Throwable cause,
+ final String errorCode) {
super(messageReference, cause, HttpStatusCodes.NOT_FOUND, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
index 798addf..3d802f4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,14 +22,15 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 501 (Not implemented).
- *
+ *
*/
public class ODataNotImplementedException extends ODataHttpException {
private static final long serialVersionUID = 1L;
public static final MessageReference COMMON = createMessageReference(ODataNotImplementedException.class, "COMMON");
- public static final MessageReference TUNNELING = createMessageReference(ODataNotImplementedException.class, "TUNNELING");
+ public static final MessageReference TUNNELING = createMessageReference(ODataNotImplementedException.class,
+ "TUNNELING");
public ODataNotImplementedException(final MessageReference context) {
super(context, HttpStatusCodes.NOT_IMPLEMENTED);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
index 4f40682..eed40d5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP Status 412 Precondition Failed.
- *
+ *
*/
public class ODataPreconditionFailedException extends ODataHttpException {
private static final long serialVersionUID = 1L;
- public static final MessageReference COMMON = createMessageReference(ODataPreconditionFailedException.class, "COMMON");
+ public static final MessageReference COMMON =
+ createMessageReference(ODataPreconditionFailedException.class, "COMMON");
public ODataPreconditionFailedException(final MessageReference context) {
super(context, HttpStatusCodes.PRECONDITION_FAILED);
@@ -42,7 +43,8 @@ public class ODataPreconditionFailedException extends ODataHttpException {
super(context, HttpStatusCodes.PRECONDITION_FAILED, errorCode);
}
- public ODataPreconditionFailedException(final MessageReference context, final Throwable cause, final String errorCode) {
+ public ODataPreconditionFailedException(final MessageReference context, final Throwable cause,
+ final String errorCode) {
super(context, cause, HttpStatusCodes.PRECONDITION_FAILED, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
index c94c8db..5babcae 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 428 precondition required
- *
+ *
*/
public class ODataPreconditionRequiredException extends ODataHttpException {
private static final long serialVersionUID = 1L;
- public static final MessageReference COMMON = createMessageReference(ODataPreconditionRequiredException.class, "COMMON");
+ public static final MessageReference COMMON = createMessageReference(ODataPreconditionRequiredException.class,
+ "COMMON");
public ODataPreconditionRequiredException(final MessageReference context) {
super(context, HttpStatusCodes.PRECONDITION_REQUIRED);
@@ -42,7 +43,8 @@ public class ODataPreconditionRequiredException extends ODataHttpException {
super(context, HttpStatusCodes.PRECONDITION_REQUIRED, errorCode);
}
- public ODataPreconditionRequiredException(final MessageReference context, final Throwable cause, final String errorCode) {
+ public ODataPreconditionRequiredException(final MessageReference context, final Throwable cause,
+ final String errorCode) {
super(context, cause, HttpStatusCodes.PRECONDITION_REQUIRED, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
index 9e8962b..64cd0ff 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 503 service unavailable
- *
+ *
*/
public class ODataServiceUnavailableException extends ODataHttpException {
private static final long serialVersionUID = 1L;
- public static final MessageReference COMMON = createMessageReference(ODataServiceUnavailableException.class, "COMMON");
+ public static final MessageReference COMMON =
+ createMessageReference(ODataServiceUnavailableException.class, "COMMON");
public ODataServiceUnavailableException(final MessageReference context) {
super(context, HttpStatusCodes.SERVICE_UNAVAILABLE);
@@ -42,7 +43,8 @@ public class ODataServiceUnavailableException extends ODataHttpException {
super(context, HttpStatusCodes.SERVICE_UNAVAILABLE, errorCode);
}
- public ODataServiceUnavailableException(final MessageReference context, final Throwable cause, final String errorCode) {
+ public ODataServiceUnavailableException(final MessageReference context, final Throwable cause,
+ final String errorCode) {
super(context, cause, HttpStatusCodes.SERVICE_UNAVAILABLE, errorCode);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
index 64938aa..db9e326 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,18 +22,21 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 415 unsupported media type
- *
+ *
*/
public class ODataUnsupportedMediaTypeException extends ODataHttpException {
private static final long serialVersionUID = 1L;
/** NOT_SUPPORTED requires 1 content value ('media type') */
- public static final MessageReference NOT_SUPPORTED = createMessageReference(ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED");
+ public static final MessageReference NOT_SUPPORTED = createMessageReference(ODataUnsupportedMediaTypeException.class,
+ "NOT_SUPPORTED");
/** NOT_SUPPORTED_CONTENT_TYPE requires 1 content value ('media type') */
- public static final MessageReference NOT_SUPPORTED_CONTENT_TYPE = createMessageReference(ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED_CONTENT_TYPE");
+ public static final MessageReference NOT_SUPPORTED_CONTENT_TYPE = createMessageReference(
+ ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED_CONTENT_TYPE");
/** NOT_SUPPORTED_ACCEPT_HEADER requires 1 content value ('media type') */
- public static final MessageReference NOT_SUPPORTED_ACCEPT_HEADER = createMessageReference(ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED_ACCEPT_HEADER");
+ public static final MessageReference NOT_SUPPORTED_ACCEPT_HEADER = createMessageReference(
+ ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED_ACCEPT_HEADER");
public ODataUnsupportedMediaTypeException(final MessageReference context) {
super(context, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE);
@@ -47,7 +50,8 @@ public class ODataUnsupportedMediaTypeException extends ODataHttpException {
super(context, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE, errorCode);
}
- public ODataUnsupportedMediaTypeException(final MessageReference context, final Throwable cause, final String errorCode) {
+ public ODataUnsupportedMediaTypeException(final MessageReference context, final Throwable cause,
+ final String errorCode) {
super(context, cause, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java
index 61411ee..542a703 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java
@@ -1,61 +1,73 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Exception Classes used in the OData library as well as the implementing application
- * <p>APPLICATION DEVELOPERS: Please use {@link org.apache.olingo.odata2.api.exception.ODataApplicationException} for custom exceptions.
+ * <p>APPLICATION DEVELOPERS: Please use {@link org.apache.olingo.odata2.api.exception.ODataApplicationException} for
+ * custom exceptions.
*
* <p><b>Exception handling:</b>
- * <br>Inside the OData library an ExceptionMapper exists which can transform any exception into an OData error format.
+ * <br>Inside the OData library an ExceptionMapper exists which can transform any exception into an OData error format.
* The ExceptionMapper behaves after the following algorithm:
* <br>1. The cause of the exception will be determined by looking into the stack trace.
- * <br>1.1. If the cause is an ODataApplicationException meaning that somewhere in the stack an ODataApplicationException is found the
- * ExceptionMapper will take the following information from the ApplicationException and transform it into an OData error:
- * message text, Locale, Inner Error and Error Code. There will be no altering of information for the ODataApplicationException.
- * <br>1.2. If no ODataApplicationException is found in the stack the cause can be three different types of exceptions: ODataHttpException, ODataMessageException or an uncaught RuntimeException.
- * <br>The ExceptionMapper will process them in the following order: 1. ODataHttpException, 2. ODataMessageException, 3 Other Exceptions.
- * <br>1.2.1. ODataHttpExceptions will be transformed as follows: If an error code is set it will be displayed. The HTTP status code will be derived from the ODataHttpException. The message text and its language depend on the AcceptLanguageHeaders.
- * The first supported language which is found in the Headers will result in the language of the message and the response.
- * <br>1.2.1. ODataMessageException will be transformed as follows: If an error code is set it will be displayed. The HTTP status code will be 500.
- * The message text and its language depend on the AcceptLanguageHeaders. The first supported language which is found in the Headers will result in the language of the message and the response.
- * <br>1.2.1 Runtime Exceptions will be transformed as follows: No error code will be set. HTTP status will be 500. Message text will be taken from the exception and the language for the response will be English as default.
+ * <br>1.1. If the cause is an ODataApplicationException meaning that somewhere in the stack an
+ * ODataApplicationException is found the
+ * ExceptionMapper will take the following information from the ApplicationException and transform it into an OData
+ * error:
+ * message text, Locale, Inner Error and Error Code. There will be no altering of information for the
+ * ODataApplicationException.
+ * <br>1.2. If no ODataApplicationException is found in the stack the cause can be three different types of exceptions:
+ * ODataHttpException, ODataMessageException or an uncaught RuntimeException.
+ * <br>The ExceptionMapper will process them in the following order: 1. ODataHttpException, 2. ODataMessageException, 3
+ * Other Exceptions.
+ * <br>1.2.1. ODataHttpExceptions will be transformed as follows: If an error code is set it will be displayed. The HTTP
+ * status code will be derived from the ODataHttpException. The message text and its language depend on the
+ * AcceptLanguageHeaders.
+ * The first supported language which is found in the Headers will result in the language of the message and the
+ * response.
+ * <br>1.2.1. ODataMessageException will be transformed as follows: If an error code is set it will be displayed. The
+ * HTTP status code will be 500.
+ * The message text and its language depend on the AcceptLanguageHeaders. The first supported language which is found in
+ * the Headers will result in the language of the message and the response.
+ * <br>1.2.1 Runtime Exceptions will be transformed as follows: No error code will be set. HTTP status will be 500.
+ * Message text will be taken from the exception and the language for the response will be English as default.
* <p><b>Exception Hierarchy</b>
- * <br> {@link org.apache.olingo.odata2.api.exception.ODataException}
- * <br> *{@link org.apache.olingo.odata2.api.exception.ODataApplicationException}
- * <br> *{@link org.apache.olingo.odata2.api.exception.ODataMessageException}
- * <br> ** {@link org.apache.olingo.odata2.api.edm.EdmException}
- * <br> ** {@link org.apache.olingo.odata2.api.ep.EntityProviderException}
- * <br> ** {@link org.apache.olingo.odata2.api.uri.expression.ExceptionVisitExpression}
- * <br> ** {@link org.apache.olingo.odata2.api.exception.ODataHttpException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataConflictException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataForbiddenException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataMethodNotAllowedException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataNotAcceptableException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataNotImplementedException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataPreconditionFailedException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataPreconditionRequiredException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataServiceUnavailableException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataUnsupportedMediaTypeException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataNotFoundException}
- * <br> **** {@link org.apache.olingo.odata2.api.uri.UriNotMatchingException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataBadRequestException}
- * <br> **** {@link org.apache.olingo.odata2.api.uri.expression.ExpressionParserException}
- * <br> **** {@link org.apache.olingo.odata2.api.uri.UriSyntaxException}
+ * <br> {@link org.apache.olingo.odata2.api.exception.ODataException} <br> *
+ * {@link org.apache.olingo.odata2.api.exception.ODataApplicationException} <br> *
+ * {@link org.apache.olingo.odata2.api.exception.ODataMessageException} <br> **
+ * {@link org.apache.olingo.odata2.api.edm.EdmException} <br> **
+ * {@link org.apache.olingo.odata2.api.ep.EntityProviderException} <br> **
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExceptionVisitExpression} <br> **
+ * {@link org.apache.olingo.odata2.api.exception.ODataHttpException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataConflictException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataForbiddenException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataMethodNotAllowedException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataNotAcceptableException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataNotImplementedException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataPreconditionFailedException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataPreconditionRequiredException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataServiceUnavailableException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataUnsupportedMediaTypeException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataNotFoundException} <br> ****
+ * {@link org.apache.olingo.odata2.api.uri.UriNotMatchingException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataBadRequestException} <br> ****
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionParserException} <br> ****
+ * {@link org.apache.olingo.odata2.api.uri.UriSyntaxException}
*/
package org.apache.olingo.odata2.api.exception;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
index 003ed5d..b5cb2bf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
@@ -1,39 +1,40 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* OData Library API
* <p>
- * OData Library is a protocol implementation of the OData V2.0 standard. For details of this standard
+ * OData Library is a protocol implementation of the OData V2.0 standard. For details of this standard
* see <a href="http://odata.org">odata.org</a>.
* <p>
- * This API is intended to implement an OData service. An OData service consists of a metadata provider
+ * This API is intended to implement an OData service. An OData service consists of a metadata provider
* implementation and an OData processor implementation.
* <p>
- * An OData service can be exposed by a web application. For the runntime one JAX-RS
- * implementation is needed and the core implementation library of this API. Apache CXF for example is
+ * An OData service can be exposed by a web application. For the runntime one JAX-RS
+ * implementation is needed and the core implementation library of this API. Apache CXF for example is
* one such JAX-RS implementation.
* <p>
- * Entry point to the service is a JAX-RS servlet. At this servlet init parameters for a <code>ODataServiceFactory</code>
- * is configured. The parameter <code>javax.ws.rs.Application</code> is a default by JAX-RS and has to be present always.
+ * Entry point to the service is a JAX-RS servlet. At this servlet init parameters for a
+ * <code>ODataServiceFactory</code>
+ * is configured. The parameter <code>javax.ws.rs.Application</code> is a default by JAX-RS and has to be present
+ * always.
* <p>
- * <pre>
- * {@code
+ * <pre> {@code
* <?xml version="1.0" encoding="UTF-8"?>
* <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
* xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
@@ -58,13 +59,12 @@
* <url-pattern>/MyService.svc/*</url-pattern>
* </servlet-mapping>
* </web-app>
- * }
- * </pre>
+ * } </pre>
* <p>
- * This factory produces the service, a metadata provider and the data processor. The provider, typically
- * a derivative of the class <code>EdmProvider</code> provides the metadata of the service. The processor implements a
- * variety of service interfaces, and provides the data of the service. The processor is typically
- * a derivative of the class <code>ODataSingleProcessor</code> which can be used together with the class
+ * This factory produces the service, a metadata provider and the data processor. The provider, typically
+ * a derivative of the class <code>EdmProvider</code> provides the metadata of the service. The processor implements a
+ * variety of service interfaces, and provides the data of the service. The processor is typically
+ * a derivative of the class <code>ODataSingleProcessor</code> which can be used together with the class
* <code>ODataSingleService</code>.
*/
package org.apache.olingo.odata2.api;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
index e4a417d..f809cb6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
/**
* Compilation of generic context objects.
- *
+ *
* @org.apache.olingo.odata2.DoNotImplement
*/
public interface ODataContext {
@@ -54,7 +54,7 @@ public interface ODataContext {
PathInfo getPathInfo() throws ODataException;
/**
- * If a request execution is part of batch processing then this method returns the context of the
+ * If a request execution is part of batch processing then this method returns the context of the
* outer batch request.
* @return a batch parent context or null
*/
@@ -138,10 +138,10 @@ public interface ODataContext {
/**
* Gets a list of languages that are acceptable for the response.
- * If no acceptable languages are specified, a read-only list containing
+ * If no acceptable languages are specified, a read-only list containing
* a single wildcard java.util.Locale instance (with language field set to "*") is returned.
* @return a read-only list of acceptable languages sorted according to their q-value,
- * with highest preference first.
+ * with highest preference first.
*/
List<Locale> getAcceptableLanguages();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
index 6552cdd..3236de6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,16 +23,18 @@ import org.apache.olingo.odata2.api.exception.ODataApplicationException;
/**
* This interface is called if an error occurred and is process inside the exception mapper.
- *
- *
+ *
+ *
*/
public interface ODataErrorCallback extends ODataCallback {
/**
- * This method can be used to handle an error differently than the exception mapper would.
+ * This method can be used to handle an error differently than the exception mapper would.
* <br>Any returned Response will be directly transported to the client.
* <br>Any thrown {@link ODataApplicationException} will be transformed into the OData error format.
- * <br>Any thrown runtime exception will result in an 500 Internal Server error with the Text: "Exception during error handling occurred!" No OData formatting will be applied.
- * <br>To serialize an error into the OData format the {@link org.apache.olingo.odata2.api.ep.EntityProvider} writeErrorDocument can be used.
+ * <br>Any thrown runtime exception will result in an 500 Internal Server error with the Text:
+ * "Exception during error handling occurred!" No OData formatting will be applied.
+ * <br>To serialize an error into the OData format the {@link org.apache.olingo.odata2.api.ep.EntityProvider}
+ * writeErrorDocument can be used.
* @param context of this error
* @return the response which will be propagated to the client
* @throws ODataApplicationException
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
index a36a24b..6ae011b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
* Error context information bean. Usually created and in error situations.
* @see org.apache.olingo.odata2.api.ep.EntityProvider EntityProvider
* @see ODataErrorCallback
- *
+ *
*/
public class ODataErrorContext {
@@ -70,7 +70,7 @@ public class ODataErrorContext {
this.exception = exception;
}
- /**
+ /**
* Get the content type which should be used to serialize an error response.
* @return a content type
*/
@@ -103,7 +103,7 @@ public class ODataErrorContext {
}
/**
- * Return OData error code that is returned in error response.
+ * Return OData error code that is returned in error response.
* @return an application defined error code
*/
public String getErrorCode() {
@@ -111,7 +111,7 @@ public class ODataErrorContext {
}
/**
- * Set OData error code that should be returned in error response.
+ * Set OData error code that should be returned in error response.
* @param errorCode an application defined error code
*/
public void setErrorCode(final String errorCode) {
@@ -134,7 +134,7 @@ public class ODataErrorContext {
this.message = message;
}
- /**
+ /**
* Return the locale of the translated message.
* @return a locale
*/
@@ -210,7 +210,8 @@ public class ODataErrorContext {
/**
* Get {@link PathInfo} object.
- * May be <code>NULL</code> if no path info was created/set till error occurred (but may be over written by application).
+ * May be <code>NULL</code> if no path info was created/set till error occurred (but may be over written by
+ * application).
*
* @return {@link PathInfo} or <code>NULL</code>.
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
index 4cefaf6..401891d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
* An <code>ODataProcessor</code> is the root interface for processor implementation.
* A processor handles OData requests like reading or writing entities. All possible
* actions are defined in the {@link org.apache.olingo.odata2.api.processor.feature} package.
- *
+ *
* @org.apache.olingo.odata2.DoNotImplement
*/
public interface ODataProcessor {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
index 1074226..7dfa43e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
index 8701051..345368e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,17 +25,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
/**
- * <p>An <code>ODataResponse</code> is usually created by an {@link ODataProcessor}
- * during request handling.</p>
- * <p>The handler can use a serializer to create an
+ * <p>An <code>ODataResponse</code> is usually created by an {@link ODataProcessor} during request handling.</p>
+ * <p>The handler can use a serializer to create an
* OData body (== response entity) and can set various response headers.
* A response can be created using the builder pattern:
- * <pre>
- * {@code
+ * <pre> {@code
* ODataResponse response = ODataResponse.entity("hello world").setStatus(HttpStatusCodes.OK).build();
- * }
- * </pre>
- *
+ * } </pre>
+ *
*/
public abstract class ODataResponse {
@@ -55,7 +52,8 @@ public abstract class ODataResponse {
public abstract Object getEntity();
/**
- * Close the underlying entity input stream (if such a stream is available) and release all with this repsonse associated resources.
+ * Close the underlying entity input stream (if such a stream is available) and release all with this repsonse
+ * associated resources.
*
* @throws IOException if something goes wrong during close of {@link ODataResponse}
*/
@@ -119,7 +117,7 @@ public abstract class ODataResponse {
}
/**
- * @param name HTTP header name
+ * @param name HTTP header name
* @param value associated value
* @return a builder object
*/
@@ -143,8 +141,8 @@ public abstract class ODataResponse {
}
/**
- * Implementation of the builder pattern to create instances of this type of object.
- *
+ * Implementation of the builder pattern to create instances of this type of object.
+ *
*/
public static abstract class ODataResponseBuilder {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
index 87ed4c3..3c0004c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -68,15 +68,19 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
* <p>A default {@link ODataProcessor} that implements all processor features in a single class.</p>
* <p>It is recommended to derive from this class and it is required by the
- * {@link org.apache.olingo.odata2.api.ODataServiceFactory} to build an {@link org.apache.olingo.odata2.api.ODataService}.</p>
+ * {@link org.apache.olingo.odata2.api.ODataServiceFactory} to build an
+ * {@link org.apache.olingo.odata2.api.ODataService}.</p>
* <p>This abstract class provides a default behavior, returning the correct response
* for requests for the service or the metadata document, respectively, and throwing an
* {@link ODataNotImplementedException} for all other requests.
- * Sub classes have to override only methods they want to support.</p>
+ * Sub classes have to override only methods they want to support.</p>
+ *
*
- *
*/
-public abstract class ODataSingleProcessor implements MetadataProcessor, ServiceDocumentProcessor, EntityProcessor, EntitySetProcessor, EntityComplexPropertyProcessor, EntityLinkProcessor, EntityLinksProcessor, EntityMediaProcessor, EntitySimplePropertyProcessor, EntitySimplePropertyValueProcessor, FunctionImportProcessor, FunctionImportValueProcessor, BatchProcessor, CustomContentType {
+public abstract class ODataSingleProcessor implements MetadataProcessor, ServiceDocumentProcessor, EntityProcessor,
+ EntitySetProcessor, EntityComplexPropertyProcessor, EntityLinkProcessor, EntityLinksProcessor,
+ EntityMediaProcessor, EntitySimplePropertyProcessor, EntitySimplePropertyValueProcessor, FunctionImportProcessor,
+ FunctionImportValueProcessor, BatchProcessor, CustomContentType {
/**
* A request context object usually injected by the OData library.
@@ -103,16 +107,18 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see BatchProcessor
*/
@Override
- public ODataResponse executeBatch(final BatchHandler handler, final String contentType, final InputStream content) throws ODataException {
+ public ODataResponse executeBatch(final BatchHandler handler, final String contentType, final InputStream content)
+ throws ODataException {
throw new ODataNotImplementedException();
}
/**
- * @throws ODataNotImplementedException
+ * @throws ODataNotImplementedException
* @see BatchProcessor
*/
@Override
- public BatchResponsePart executeChangeSet(final BatchHandler handler, final List<ODataRequest> requests) throws ODataException {
+ public BatchResponsePart executeChangeSet(final BatchHandler handler, final List<ODataRequest> requests)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -120,7 +126,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see FunctionImportProcessor
*/
@Override
- public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -128,7 +135,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see FunctionImportValueProcessor
*/
@Override
- public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -136,7 +144,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyValueProcessor
*/
@Override
- public ODataResponse readEntitySimplePropertyValue(final GetSimplePropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySimplePropertyValue(final GetSimplePropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -144,7 +153,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyValueProcessor
*/
@Override
- public ODataResponse updateEntitySimplePropertyValue(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntitySimplePropertyValue(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -152,7 +162,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyValueProcessor
*/
@Override
- public ODataResponse deleteEntitySimplePropertyValue(final DeleteUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse deleteEntitySimplePropertyValue(final DeleteUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -160,7 +171,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyProcessor
*/
@Override
- public ODataResponse readEntitySimpleProperty(final GetSimplePropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySimpleProperty(final GetSimplePropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -168,7 +180,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyProcessor
*/
@Override
- public ODataResponse updateEntitySimpleProperty(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntitySimpleProperty(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -176,7 +189,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityMediaProcessor
*/
@Override
- public ODataResponse readEntityMedia(final GetMediaResourceUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityMedia(final GetMediaResourceUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -184,7 +198,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityMediaProcessor
*/
@Override
- public ODataResponse updateEntityMedia(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntityMedia(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -200,7 +215,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinksProcessor
*/
@Override
- public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -208,7 +224,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinksProcessor
*/
@Override
- public ODataResponse countEntityLinks(final GetEntitySetLinksCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse countEntityLinks(final GetEntitySetLinksCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -216,7 +233,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinkProcessor
*/
@Override
- public ODataResponse createEntityLink(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse createEntityLink(final PostUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -224,7 +242,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinkProcessor
*/
@Override
- public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -232,7 +251,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinkProcessor
*/
@Override
- public ODataResponse existsEntityLink(final GetEntityLinkCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse existsEntityLink(final GetEntityLinkCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -240,7 +260,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinkProcessor
*/
@Override
- public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -256,7 +277,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityComplexPropertyProcessor
*/
@Override
- public ODataResponse readEntityComplexProperty(final GetComplexPropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityComplexProperty(final GetComplexPropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -264,7 +286,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityComplexPropertyProcessor
*/
@Override
- public ODataResponse updateEntityComplexProperty(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final boolean merge, final String contentType) throws ODataException {
+ public ODataResponse updateEntityComplexProperty(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final boolean merge, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -272,7 +295,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySetProcessor
*/
@Override
- public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -280,7 +304,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySetProcessor
*/
@Override
- public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -288,7 +313,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySetProcessor
*/
@Override
- public ODataResponse createEntity(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse createEntity(final PostUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -304,7 +330,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityProcessor
*/
@Override
- public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -312,7 +339,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityProcessor
*/
@Override
- public ODataResponse updateEntity(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final boolean merge, final String contentType) throws ODataException {
+ public ODataResponse updateEntity(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final boolean merge, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -328,12 +356,14 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see ServiceDocumentProcessor
*/
@Override
- public ODataResponse readServiceDocument(final GetServiceDocumentUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readServiceDocument(final GetServiceDocumentUriInfo uriInfo, final String contentType)
+ throws ODataException {
final Edm entityDataModel = getContext().getService().getEntityDataModel();
final String serviceRoot = getContext().getPathInfo().getServiceRoot().toASCIIString();
final ODataResponse response = EntityProvider.writeServiceDocument(contentType, entityDataModel, serviceRoot);
- final ODataResponseBuilder odataResponseBuilder = ODataResponse.fromResponse(response).header(ODataHttpHeaders.DATASERVICEVERSION, ODataServiceVersion.V10);
+ final ODataResponseBuilder odataResponseBuilder = ODataResponse.fromResponse(response).header(
+ ODataHttpHeaders.DATASERVICEVERSION, ODataServiceVersion.V10);
return odataResponseBuilder.build();
}
@@ -345,14 +375,17 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
public ODataResponse readMetadata(final GetMetadataUriInfo uriInfo, final String contentType) throws ODataException {
final EdmServiceMetadata edmServiceMetadata = getContext().getService().getEntityDataModel().getServiceMetadata();
- return ODataResponse.status(HttpStatusCodes.OK).header(ODataHttpHeaders.DATASERVICEVERSION, edmServiceMetadata.getDataServiceVersion()).entity(edmServiceMetadata.getMetadata()).build();
+ return ODataResponse.status(HttpStatusCodes.OK)
+ .header(ODataHttpHeaders.DATASERVICEVERSION, edmServiceMetadata.getDataServiceVersion())
+ .entity(edmServiceMetadata.getMetadata()).build();
}
/**
* @see CustomContentType
*/
@Override
- public List<String> getCustomContentTypes(final Class<? extends ODataProcessor> processorFeature) throws ODataException {
+ public List<String> getCustomContentTypes(final Class<? extends ODataProcessor> processorFeature)
+ throws ODataException {
return Collections.emptyList();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
index 3a1719f..610f45c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -26,9 +26,9 @@ import org.apache.olingo.odata2.api.processor.ODataProcessor;
/**
* Data processor feature if processor supports custom content types. By default the OData library supports
* various types like Json (application/json), Atom (application/xml+atom) and XML (application/xml). But
- * the OData specification allows also other types like e.g. CSV or plain text.
+ * the OData specification allows also other types like e.g. CSV or plain text.
+ *
*
- *
*/
public interface CustomContentType extends ODataProcessorFeature {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
index f694535..32d6e3c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
@@ -1,29 +1,29 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.processor.feature;
/**
- * Marker interface for data processor features. A feature is like a call back where
+ * Marker interface for data processor features. A feature is like a call back where
* the OData library can request additional information from the processor to change
- * control over request handling.
+ * control over request handling.
+ *
*
- *
*/
public interface ODataProcessorFeature {
[05/59] [abbrv] Clean up of odata api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java
index 1111d54..3f7e88a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,17 +22,18 @@ import org.apache.olingo.odata2.api.ODataCallback;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
/**
- * Callback interface for the $expand query option.
+ * Callback interface for the $expand query option.
* <p>If an expand clause for a navigation property which points to a feed is found this callback will be called.
* <br>Pointing to an feed means the navigation property has a multiplicity of 0..* or 1..*.
*
- *
- *
+ *
+ *
*/
public interface OnWriteFeedContent extends ODataCallback {
/**
- * Retrieves the data for a feed. See {@link WriteFeedCallbackContext} for details on the context and {@link WriteFeedCallbackResult} for details on the result of this method.
+ * Retrieves the data for a feed. See {@link WriteFeedCallbackContext} for details on the context and
+ * {@link WriteFeedCallbackResult} for details on the result of this method.
* @param context of this entry
* @return result - must not be null.
* @throws ODataApplicationException
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
index cbeee19..e6b8d8c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,13 +24,13 @@ import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
/**
* A {@link ReadEntryResult} represents an inlined navigation property which points to an entry.
- * The {@link ReadEntryResult} contains the {@link EntityProviderReadProperties} which were used for read,
+ * The {@link ReadEntryResult} contains the {@link EntityProviderReadProperties} which were used for read,
* the <code>navigationPropertyName</code> and the read/de-serialized inlined entity.
- * If inlined navigation property is <code>nullable</code> the {@link ReadEntryResult} has the
+ * If inlined navigation property is <code>nullable</code> the {@link ReadEntryResult} has the
* <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
*
- *
- *
+ *
+ *
*/
public class ReadEntryResult extends ReadResult {
@@ -44,7 +44,8 @@ public class ReadEntryResult extends ReadResult {
* @param navigationProperty emd navigation property information of found inline navigation property
* @param entry read entity as {@link ODataEntry}
*/
- public ReadEntryResult(final EntityProviderReadProperties properties, final EdmNavigationProperty navigationProperty, final ODataEntry entry) {
+ public ReadEntryResult(final EntityProviderReadProperties properties, final EdmNavigationProperty navigationProperty,
+ final ODataEntry entry) {
super(properties, navigationProperty);
this.entry = entry;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
index edfbad4..3e58609 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,12 +25,12 @@ import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
/**
* A {@link ReadFeedResult} represents an inlined navigation property which points to a feed (in the form of a list of
* {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry} instances).
- * The {@link ReadFeedResult} contains the {@link EntityProviderReadProperties} which were used for read,
+ * The {@link ReadFeedResult} contains the {@link EntityProviderReadProperties} which were used for read,
* the <code>navigationPropertyName</code> and the read/de-serialized inlined entities.
- * If inlined navigation property is <code>nullable</code> the {@link ReadFeedResult} has the
+ * If inlined navigation property is <code>nullable</code> the {@link ReadFeedResult} has the
* <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
*
- *
+ *
*/
public class ReadFeedResult extends ReadResult {
@@ -44,7 +44,8 @@ public class ReadFeedResult extends ReadResult {
* @param navigationProperty emd navigation property information of found inline navigation property
* @param entry read entities as list of {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
*/
- public ReadFeedResult(final EntityProviderReadProperties properties, final EdmNavigationProperty navigationProperty, final ODataFeed entry) {
+ public ReadFeedResult(final EntityProviderReadProperties properties, final EdmNavigationProperty navigationProperty,
+ final ODataFeed entry) {
super(properties, navigationProperty);
feed = entry;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
index 9d05b54..d890ac8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,13 +23,15 @@ import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
/**
* A {@link ReadResult} represents an inlined navigation property which points to an entry or feed.
- * The {@link ReadResult} contains the {@link EntityProviderReadProperties} which were used for read,
- * the <code>navigationPropertyName</code>, the read/de-serialized inlined entity and information whether the inlined content
- * is a <code>feed</code> (multiplicity of <code>1..m</code>) or a single <code>entry</code> (multiplicity of <code>0..1</code> or <code>1..1</code>).
- * If inlined navigation property is <code>nullable</code> the {@link ReadResult} has the
+ * The {@link ReadResult} contains the {@link EntityProviderReadProperties} which were used for read,
+ * the <code>navigationPropertyName</code>, the read/de-serialized inlined entity and information whether the inlined
+ * content
+ * is a <code>feed</code> (multiplicity of <code>1..m</code>) or a single <code>entry</code> (multiplicity of
+ * <code>0..1</code> or <code>1..1</code>).
+ * If inlined navigation property is <code>nullable</code> the {@link ReadResult} has the
* <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
*
- *
+ *
*/
public abstract class ReadResult {
@@ -65,20 +67,19 @@ public abstract class ReadResult {
/**
* Common access method to read result.
*
- * @return an {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
- * for the case of an single read entry or a list of
- * {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
- * in the case of an read feed.
+ * @return an {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry} for the case of an single read entry
+ * or a list of {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry} in the case of an read feed.
*/
public abstract Object getResult();
@Override
public String toString() {
- return this.getClass().getSimpleName() + " [readProperties=" + readProperties + ", navigationProperty=" + navigationProperty + "]";
+ return this.getClass().getSimpleName() + " [readProperties=" + readProperties + ", navigationProperty="
+ + navigationProperty + "]";
}
/**
- * Return whether this entry is a <code>feed</code> (multiplicity of <code>1..m</code>)
+ * Return whether this entry is a <code>feed</code> (multiplicity of <code>1..m</code>)
* or a single <code>entry</code> (multiplicity of <code>0..1</code> or <code>1..1</code>).
*
* @return <code>true</code> for a feed and <code>false</code> for an entry
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
index 7c91690..deb2b5d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,9 +23,9 @@ import org.apache.olingo.odata2.api.ODataCallback;
/**
* <p>Interface that must be implemented in order to provide tombstone support.</p>
* <p>The callback implementing this interface is registered at the
- * {@link org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties EntityProviderWriteProperties}
- * using the callback key of this class.</p>
- *
+ * {@link org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties EntityProviderWriteProperties} using the
+ * callback key of this class.</p>
+ *
*/
public interface TombstoneCallback extends ODataCallback {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
index ad9f1af..fb635ab 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,8 +23,8 @@ import java.util.Map;
/**
* Objects of this class are a container for the result of the {@link TombstoneCallback}.
- *
- *
+ *
+ *
*/
public class TombstoneCallbackResult {
@@ -33,8 +33,10 @@ public class TombstoneCallbackResult {
/**
* A map representing a deleted entry <b>MUST</b> contain all properties which are part of the key for this entry.
- * <br>A map representing a deleted entry <b>MAY</b> contain the property which is mapped on SyndicationUpdated. The provided value here will result in the value of the "when" attribute of the deleted entry.
- * @return deleted entries in the form of List{@literal <}Map{@literal <}property name, property value{@literal >}{@literal >}
+ * <br>A map representing a deleted entry <b>MAY</b> contain the property which is mapped on SyndicationUpdated. The
+ * provided value here will result in the value of the "when" attribute of the deleted entry.
+ * @return deleted entries in the form of List{@literal <}Map{@literal <}property name, property value{@literal >}
+ * {@literal >}
*/
public List<Map<String, Object>> getDeletedEntriesData() {
return deletedEntriesData;
@@ -56,7 +58,7 @@ public class TombstoneCallbackResult {
}
/**
- * Sets the delta link to retrieve a delta.
+ * Sets the delta link to retrieve a delta.
* @param deltaLink
*/
public void setDeltaLink(final String deltaLink) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
index d834447..7659765 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -29,8 +29,8 @@ import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
/**
* Wrapper for {@link WriteEntryCallbackContext} and {@link WriteFeedCallbackContext}.
- * @org.apache.olingo.odata2.DoNotImplement
- *
+ * @org.apache.olingo.odata2.DoNotImplement
+ *
*/
public abstract class WriteCallbackContext {
private EdmEntitySet sourceEntitySet;
@@ -113,7 +113,8 @@ public abstract class WriteCallbackContext {
key.put(keyPropertyName, entryData.get(keyPropertyName));
}
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return key;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
index 8b47630..ad8f521 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
@@ -1,26 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.ep.callback;
/**
- * Context given if the target of an expand is an entry. It contains the source entity set, the navigation property pointing to the entry which has to be expanded, the current expand select tree node and the data of the source entry.
- *
- *
+ * Context given if the target of an expand is an entry. It contains the source entity set, the navigation property
+ * pointing to the entry which has to be expanded, the current expand select tree node and the data of the source entry.
+ *
+ *
*/
public class WriteEntryCallbackContext extends WriteCallbackContext {}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
index c632045..be4d635 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,8 +23,9 @@ import java.util.Map;
import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
/**
- * Result of a callback. It contains the data of the entry which is to be expanded as well as the properties of this entry.
- *
+ * Result of a callback. It contains the data of the entry which is to be expanded as well as the properties of this
+ * entry.
+ *
*/
public class WriteEntryCallbackResult {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
index f806bb6..ce7a753 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,9 +21,10 @@ package org.apache.olingo.odata2.api.ep.callback;
import java.net.URI;
/**
- * Context given if the target of an expand is a feed. It contains the source entity set, the navigation property pointing to the entry which has to be expanded, the current expand select tree node and the data of the source entry.
- *
- *
+ * Context given if the target of an expand is a feed. It contains the source entity set, the navigation property
+ * pointing to the entry which has to be expanded, the current expand select tree node and the data of the source entry.
+ *
+ *
*/
public class WriteFeedCallbackContext extends WriteCallbackContext {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
index 6e37fc3..cce8662 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,9 +24,10 @@ import java.util.Map;
import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
/**
- * Result of a callback. It contains the data of the feed which is to be expanded as well as the BaseUri of the feed. Further callbacks for this feed can also be set.
- *
- *
+ * Result of a callback. It contains the data of the feed which is to be expanded as well as the BaseUri of the feed.
+ * Further callbacks for this feed can also be set.
+ *
+ *
*/
public class WriteFeedCallbackResult {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/package-info.java
index 6762b24..039a5d5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/package-info.java
@@ -1,28 +1,32 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Entity Provider Callbacks<p>
- * These callbacks will be used to support the $expand query option. Callbacks have to implement the {@link org.apache.olingo.odata2.api.ODataCallback} as a marker.
- * <br>To support an expanded entry the {@link org.apache.olingo.odata2.api.ep.callback.OnWriteEntryContent} interface has to be implemented.
- * <br>To support an expanded feed the {@link org.apache.olingo.odata2.api.ep.callback.OnWriteFeedContent} interface has to be implemented.
+ * These callbacks will be used to support the $expand query option. Callbacks have to implement the
+ * {@link org.apache.olingo.odata2.api.ODataCallback} as a marker.
+ * <br>To support an expanded entry the {@link org.apache.olingo.odata2.api.ep.callback.OnWriteEntryContent} interface
+ * has to be implemented.
+ * <br>To support an expanded feed the {@link org.apache.olingo.odata2.api.ep.callback.OnWriteFeedContent} interface has
+ * to be implemented.
*
- * <p>All callbacks are registered for a navigation property in a HashMap<String as navigation property name, callback for this navigation property> and will only be called if a matching $expand clause is found.
+ * <p>All callbacks are registered for a navigation property in a HashMap<String as navigation property name, callback
+ * for this navigation property> and will only be called if a matching $expand clause is found.
*/
package org.apache.olingo.odata2.api.ep.callback;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.java
index a253665..2707832 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java
index 28b5f19..f5c3bba 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -31,7 +31,7 @@ public interface MediaMetadata {
public abstract String getEditLink();
/**
- * Get <code>content type</code> in as specified in
+ * Get <code>content type</code> in as specified in
* <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html">RFC 2616 Section 14</a>.
*
* @return <code>content type</code>.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java
index ef2d307..68bb184 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
/**
- * An {@link ODataEntry} contains all <b>properties</b> (in form of a {@link Map}) and possible <b>metadata</b>
+ * An {@link ODataEntry} contains all <b>properties</b> (in form of a {@link Map}) and possible <b>metadata</b>
* (in form of {@link MediaMetadata} and/or {@link EntryMetadata}) for an entry.
*
*/
@@ -52,7 +52,7 @@ public interface ODataEntry {
/**
* If this {@link ODataEntry} contains properties of an inline navigation property this method
- * returns <code>true</code>.
+ * returns <code>true</code>.
* Otherwise if this {@link ODataEntry} only contains it own properties this method
* returns <code>false</code>.
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/package-info.java
index f2be764..b02e7bc 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/package-info.java
@@ -1,25 +1,26 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Entity Provider Entries<p>
*
- * The <b>org.apache.olingo.odata2.api.ep.entry</b> package contains all classes related and necessary for an {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry}.
+ * The <b>org.apache.olingo.odata2.api.ep.entry</b> package contains all classes related and necessary for an
+ * {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry}.
* <p>
*/
package org.apache.olingo.odata2.api.ep.entry;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
index f17a8df..441ffbe 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.api.ep.feed;
/**
* {@link FeedMetadata} objects contain metadata information about one feed.
- *
- *
+ *
+ *
*/
public interface FeedMetadata {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
index c6ebd4b..9b98ec9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,8 +24,8 @@ import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
/**
* An {@link ODataFeed} object contains a list of {@link ODataEntry}s and the metadata associated with this feed.
- *
- *
+ *
+ *
*/
public interface ODataFeed {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/package-info.java
index 574e5be..8ff355a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/package-info.java
@@ -1,25 +1,26 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Entity Provider Feed<p>
*
- * The <b>org.apache.olingo.odata2.api.ep.feed</b> package contains all classes related and necessary for an {@link org.apache.olingo.odata2.api.ep.feed.ODataFeed}.
+ * The <b>org.apache.olingo.odata2.api.ep.feed</b> package contains all classes related and necessary for an
+ * {@link org.apache.olingo.odata2.api.ep.feed.ODataFeed}.
* <p>
*/
package org.apache.olingo.odata2.api.ep.feed;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/package-info.java
index 8d61f84..caba6ef 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/package-info.java
@@ -1,33 +1,36 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Entity Provider<p>
*
- * The <b>org.apache.olingo.odata2.api.ep</b> package contains all classes related and necessary to provide an {@link org.apache.olingo.odata2.api.ep.EntityProvider}.
+ * The <b>org.apache.olingo.odata2.api.ep</b> package contains all classes related and necessary to provide an
+ * {@link org.apache.olingo.odata2.api.ep.EntityProvider}.
* <p>
- * An {@link org.apache.olingo.odata2.api.ep.EntityProvider} provides all necessary <b>read</b> and <b>write</b> methods for accessing
+ * An {@link org.apache.olingo.odata2.api.ep.EntityProvider} provides all necessary <b>read</b> and <b>write</b> methods
+ * for accessing
* the entities defined in an <code>Entity Data Model</code>.
- * Therefore this library provides (in its <code>core</code> packages) as convenience basic {@link org.apache.olingo.odata2.api.ep.EntityProvider}
- * for accessing entities in the <b>XML</b> and <b>JSON</b> format.
+ * Therefore this library provides (in its <code>core</code> packages) as convenience basic
+ * {@link org.apache.olingo.odata2.api.ep.EntityProvider} for accessing entities in the <b>XML</b> and <b>JSON</b>
+ * format.
* <p>
- * For support of additional formats it is recommended to handle those directly within an implementation of a
- * <code>ODataProcessor</code> (it is possible but <b>not recommended</b> to implement an own
+ * For support of additional formats it is recommended to handle those directly within an implementation of a
+ * <code>ODataProcessor</code> (it is possible but <b>not recommended</b> to implement an own
* {@link org.apache.olingo.odata2.api.ep.EntityProvider} for support of additional formats).
*/
package org.apache.olingo.odata2.api.ep;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
index d1bb948..4f0f5be 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,13 +24,14 @@ import java.util.Collections;
import java.util.List;
/**
- * APPLICATION DEVELOPERS: Please use {@link ODataApplicationException} to throw custom exceptions. This class is used inside the library only.
- * <p>A {@link MessageReference} references to the used message for an
- * {@link ODataMessageException} and its sub classes. It supports
+ * APPLICATION DEVELOPERS: Please use {@link ODataApplicationException} to throw custom exceptions. This class is used
+ * inside the library only.
+ * <p>A {@link MessageReference} references to the used message for an {@link ODataMessageException} and its sub
+ * classes. It supports
* internationalization and translation of exception messages.
- * <br>Theses classes contain a {@link MessageReference} object which
+ * <br>Theses classes contain a {@link MessageReference} object which
* can be mapped to a related key and message text in the resource bundles.
- *
+ *
*/
public abstract class MessageReference {
@@ -50,10 +51,9 @@ public abstract class MessageReference {
* Creates a {@link MessageReference} for given <code>class</code> and <code>key</code>.
* This combination of <code>class</code> and <code>key</code> has to be provided
* by a resource bundle.
- * @param clazz {@link ODataMessageException} for which this {@link MessageReference}
- * should be used
- * @param key unique key (in context of {@link ODataMessageException}) for reference
- * to message text in resource bundle
+ * @param clazz {@link ODataMessageException} for which this {@link MessageReference} should be used
+ * @param key unique key (in context of {@link ODataMessageException}) for reference
+ * to message text in resource bundle
* @return created {@link MessageReference}
*/
public static MessageReference create(final Class<? extends ODataException> clazz, final String key) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
index d4be8ec..f862eba 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,10 +23,12 @@ import java.util.Locale;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
- * This class represents a translated application exception. Use this exception class to display custom exception messages.
- * <br>If a HTTP status is given this exception will result in the set status code like an HTTP exception.
- * <br>A set status code can be used to show a substatus to a HTTP status as described in the OData protocol specification.
- *
+ * This class represents a translated application exception. Use this exception class to display custom exception
+ * messages.
+ * <br>If a HTTP status is given this exception will result in the set status code like an HTTP exception.
+ * <br>A set status code can be used to show a substatus to a HTTP status as described in the OData protocol
+ * specification.
+ *
*/
public class ODataApplicationException extends ODataException {
@@ -46,8 +48,8 @@ public class ODataApplicationException extends ODataException {
}
/**
- * Since this is a translated application exception locale must not be null.
- * <br>The status code given will be displayed at the client.
+ * Since this is a translated application exception locale must not be null.
+ * <br>The status code given will be displayed at the client.
* @param message
* @param locale
* @param status
@@ -60,28 +62,32 @@ public class ODataApplicationException extends ODataException {
/**
* Since this is a translated application exception locale must not be null.
* <br>The status code given will be displayed at the client.
- * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol specification.
+ * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol
+ * specification.
* @param message
* @param locale
* @param status
* @param errorCode
*/
- public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status, final String errorCode) {
+ public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status,
+ final String errorCode) {
this(message, locale, status);
this.errorCode = errorCode;
}
- /**
- * Since this is a translated application exception locale must not be null.
+ /**
+ * Since this is a translated application exception locale must not be null.
* <br>The status code given will be displayed at the client.
- * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol specification.
+ * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol
+ * specification.
* @param message
* @param locale
* @param status
* @param errorCode
* @param e
*/
- public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status, final String errorCode, final Throwable e) {
+ public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status,
+ final String errorCode, final Throwable e) {
super(message, e);
this.errorCode = errorCode;
httpStatus = status;
@@ -107,20 +113,23 @@ public class ODataApplicationException extends ODataException {
* @param status
* @param e
*/
- public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status, final Throwable e) {
+ public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status,
+ final Throwable e) {
this(message, locale, e);
httpStatus = status;
}
/**
* Since this is a translated application exception locale must not be null.
- * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol specification.
+ * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol
+ * specification.
* @param message
* @param locale
* @param errorCode
* @param e
*/
- public ODataApplicationException(final String message, final Locale locale, final String errorCode, final Throwable e) {
+ public ODataApplicationException(final String message, final Locale locale, final String errorCode,
+ final Throwable e) {
this(message, locale, e);
this.errorCode = errorCode;
@@ -135,7 +144,7 @@ public class ODataApplicationException extends ODataException {
/**
* Default HttpStatusCodes.INTERNAL_SERVER_ERROR
- * @return {@link HttpStatusCodes} the status code
+ * @return {@link HttpStatusCodes} the status code
*/
public HttpStatusCodes getHttpStatus() {
return httpStatus;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
index 52afb4f..9cb0503 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,23 +22,30 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 400 bad request
- *
+ *
*/
public class ODataBadRequestException extends ODataHttpException {
private static final long serialVersionUID = 1L;
public static final MessageReference COMMON = createMessageReference(ODataBadRequestException.class, "COMMON");
- public static final MessageReference NOTSUPPORTED = createMessageReference(ODataBadRequestException.class, "NOTSUPPORTED");
- public static final MessageReference URLTOOSHORT = createMessageReference(ODataBadRequestException.class, "URLTOOSHORT");
- public static final MessageReference VERSIONERROR = createMessageReference(ODataBadRequestException.class, "VERSIONERROR");
- public static final MessageReference PARSEVERSIONERROR = createMessageReference(ODataBadRequestException.class, "PARSEVERSIONERROR");
+ public static final MessageReference NOTSUPPORTED = createMessageReference(ODataBadRequestException.class,
+ "NOTSUPPORTED");
+ public static final MessageReference URLTOOSHORT = createMessageReference(ODataBadRequestException.class,
+ "URLTOOSHORT");
+ public static final MessageReference VERSIONERROR = createMessageReference(ODataBadRequestException.class,
+ "VERSIONERROR");
+ public static final MessageReference PARSEVERSIONERROR = createMessageReference(ODataBadRequestException.class,
+ "PARSEVERSIONERROR");
public static final MessageReference BODY = createMessageReference(ODataBadRequestException.class, "BODY");
- public static final MessageReference AMBIGUOUS_XMETHOD = createMessageReference(ODataBadRequestException.class, "AMBIGUOUS_XMETHOD");
+ public static final MessageReference AMBIGUOUS_XMETHOD = createMessageReference(ODataBadRequestException.class,
+ "AMBIGUOUS_XMETHOD");
/** INVALID_HEADER requires 2 content values ('header key' and 'header value') */
- public static final MessageReference INVALID_HEADER = createMessageReference(ODataBadRequestException.class, "INVALID_HEADER");
+ public static final MessageReference INVALID_HEADER = createMessageReference(ODataBadRequestException.class,
+ "INVALID_HEADER");
/** INVALID_SYNTAX requires NO content values */
- public static final MessageReference INVALID_SYNTAX = createMessageReference(ODataBadRequestException.class, "INVALID_SYNTAX");;
+ public static final MessageReference INVALID_SYNTAX = createMessageReference(ODataBadRequestException.class,
+ "INVALID_SYNTAX");;
public ODataBadRequestException(final MessageReference messageReference) {
super(messageReference, HttpStatusCodes.BAD_REQUEST);
@@ -52,7 +59,8 @@ public class ODataBadRequestException extends ODataHttpException {
super(messageReference, cause, HttpStatusCodes.BAD_REQUEST);
}
- public ODataBadRequestException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
+ public ODataBadRequestException(final MessageReference messageReference, final Throwable cause,
+ final String errorCode) {
super(messageReference, cause, HttpStatusCodes.BAD_REQUEST, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java
index 12ff78e..5534a58 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 409 Conflict
- *
+ *
*/
public class ODataConflictException extends ODataHttpException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java
index 21c72db..30ffe19 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.exception;
/**
* Base exception for all <code>OData</code>-related exceptions.
- *
+ *
*/
public class ODataException extends Exception {
@@ -44,8 +44,9 @@ public class ODataException extends Exception {
/**
* Checks whether this exception is an or was caused by an {@link ODataHttpException} exception.
- *
- * @return <code>true</code> if this is an or was caused by an {@link ODataHttpException}, otherwise <code>false</code>
+ *
+ * @return <code>true</code> if this is an or was caused by an {@link ODataHttpException}, otherwise
+ * <code>false</code>
*/
public boolean isCausedByHttpException() {
return getHttpExceptionCause() != null;
@@ -56,7 +57,7 @@ public class ODataException extends Exception {
* If there is no {@link ODataHttpException} in the cause hierarchy, <code>NULL</code> is returned.
*
* @return the first found {@link ODataHttpException} in the cause exception hierarchy
- * or <code>NULL</code> if no {@link ODataHttpException} is found in the cause hierarchy
+ * or <code>NULL</code> if no {@link ODataHttpException} is found in the cause hierarchy
*/
public ODataHttpException getHttpExceptionCause() {
return getSpecificCause(ODataHttpException.class);
@@ -64,8 +65,9 @@ public class ODataException extends Exception {
/**
* Checks whether this exception is an or was caused by an {@link ODataApplicationException} exception.
- *
- * @return <code>true</code> if this is an or was caused by an {@link ODataApplicationException}, otherwise <code>false</code>
+ *
+ * @return <code>true</code> if this is an or was caused by an {@link ODataApplicationException}, otherwise
+ * <code>false</code>
*/
public boolean isCausedByApplicationException() {
return getApplicationExceptionCause() != null;
@@ -74,7 +76,8 @@ public class ODataException extends Exception {
/**
* Checks whether this exception is an or was caused by an {@link ODataMessageException} exception.
*
- * @return <code>true</code> if this is an or was caused by an {@link ODataMessageException}, otherwise <code>false</code>
+ * @return <code>true</code> if this is an or was caused by an {@link ODataMessageException}, otherwise
+ * <code>false</code>
*/
public boolean isCausedByMessageException() {
return getMessageExceptionCause() != null;
@@ -83,9 +86,9 @@ public class ODataException extends Exception {
/**
* Search for and return first (from top) {@link ODataMessageException} in the cause hierarchy.
* If there is no {@link ODataMessageException} in the cause hierarchy <code>NULL</code> is returned.
- *
- * @return the first found {@link ODataMessageException} in the cause exception hierarchy
- * or <code>NULL</code> if no {@link ODataMessageException} is found in the cause hierarchy
+ *
+ * @return the first found {@link ODataMessageException} in the cause exception hierarchy
+ * or <code>NULL</code> if no {@link ODataMessageException} is found in the cause hierarchy
*/
public ODataMessageException getMessageExceptionCause() {
return getSpecificCause(ODataMessageException.class);
@@ -94,9 +97,9 @@ public class ODataException extends Exception {
/**
* Search for and return first (from top) {@link ODataApplicationException} in the cause hierarchy.
* If there is no {@link ODataApplicationException} in the cause hierarchy <code>NULL</code> is returned.
- *
+ *
* @return the first found {@link ODataApplicationException} in the cause exception hierarchy
- * or <code>NULL</code> if no {@link ODataApplicationException} is found in the cause hierarchy
+ * or <code>NULL</code> if no {@link ODataApplicationException} is found in the cause hierarchy
*/
public ODataApplicationException getApplicationExceptionCause() {
return getSpecificCause(ODataApplicationException.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
index 92e0dbb..622771d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 403 forbidden
- *
+ *
*/
public class ODataForbiddenException extends ODataHttpException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java
index f412de1..bdf6125 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* {@link ODataMessageException} with a HTTP status code.
- *
+ *
*/
public abstract class ODataHttpException extends ODataMessageException {
@@ -36,15 +36,18 @@ public abstract class ODataHttpException extends ODataMessageException {
this(messageReference, null, httpStatus);
}
- public ODataHttpException(final MessageReference messageReference, final HttpStatusCodes httpStatus, final String errorCode) {
+ public ODataHttpException(final MessageReference messageReference, final HttpStatusCodes httpStatus,
+ final String errorCode) {
this(messageReference, null, httpStatus, errorCode);
}
- public ODataHttpException(final MessageReference messageReference, final Throwable cause, final HttpStatusCodes httpStatus) {
+ public ODataHttpException(final MessageReference messageReference, final Throwable cause,
+ final HttpStatusCodes httpStatus) {
this(messageReference, cause, httpStatus, null);
}
- public ODataHttpException(final MessageReference messageReference, final Throwable cause, final HttpStatusCodes httpStatus, final String errorCode) {
+ public ODataHttpException(final MessageReference messageReference, final Throwable cause,
+ final HttpStatusCodes httpStatus, final String errorCode) {
super(messageReference, cause, errorCode);
this.httpStatus = httpStatus;
}
[25/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java
index 506b03c..24ce1e6 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -77,7 +77,7 @@ public class MethodExpressionImpl implements MethodExpression {
/**
* @param expression
- * @return A self reference for method chaining"
+ * @return A self reference for method chaining"
*/
public MethodExpressionImpl appendParameter(final CommonExpression expression) {
actualParameters.add(expression);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java
index 870de1f..ad9b5d8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java
index 3c6544d..4c194db 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -25,33 +25,38 @@ import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
/**
* Interface which defines a method for parsing a $orderby expression to allow different parser implementations
* <p>
- * The current expression parser supports expressions as defined in the OData specification 2.0 with the following restrictions
- * - the methods "cast", "isof" and "replace" are not supported
- *
+ * The current expression parser supports expressions as defined in the OData specification 2.0 with the following
+ * restrictions
+ * - the methods "cast", "isof" and "replace" are not supported
+ *
* The expression parser can be used with providing an Entity Data Model (EDM) an without providing it.
- * <p>When a EDM is provided the expression parser will be as strict as possible. That means:
- * <li>All properties used in the expression must be defined inside the EDM</li>
- * <li>The types of EDM properties will be checked against the lists of allowed type per method, binary- and unary operator</li>
- * </p>
- * <p>If no EDM is provided the expression parser performs a lax validation
- * <li>The properties used in the expression are not looked up inside the EDM and the type of the expression node representing the
- * property will be "null"</li>
- * <li>Expression node with EDM-types which are "null" are not considered during the parameter type validation, to the return type of the parent expression node will
- * also become "null"</li>
- *
- *
+ * <p>When a EDM is provided the expression parser will be as strict as possible. That means:
+ * <li>All properties used in the expression must be defined inside the EDM</li>
+ * <li>The types of EDM properties will be checked against the lists of allowed type per method, binary- and unary
+ * operator</li>
+ * </p>
+ * <p>If no EDM is provided the expression parser performs a lax validation
+ * <li>The properties used in the expression are not looked up inside the EDM and the type of the expression node
+ * representing the
+ * property will be "null"</li>
+ * <li>Expression node with EDM-types which are "null" are not considered during the parameter type validation, to the
+ * return type of the parent expression node will
+ * also become "null"</li>
+ *
+ *
*/
public interface OrderByParser {
/**
* Parses a $orderby expression string and creates an $orderby expression tree
* @param orderByExpression
- * The $orderby expression string ( for example "name asc" ) to be parsed
+ * The $orderby expression string ( for example "name asc" ) to be parsed
* @return
- * The $orderby expression tree
+ * The $orderby expression tree
* @throws ExpressionParserException
- * Exception thrown due to errors while parsing the $orderby expression string
+ * Exception thrown due to errors while parsing the $orderby expression string
* @throws ODataMessageException
- * Used for extensibility
+ * Used for extensibility
*/
- abstract OrderByExpression parseOrderByString(String orderByExpression) throws ExpressionParserException, ODataMessageException;
+ abstract OrderByExpression parseOrderByString(String orderByExpression) throws ExpressionParserException,
+ ODataMessageException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParserImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParserImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParserImpl.java
index d81a412..6cda554 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParserImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParserImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -30,12 +30,13 @@ public class OrderByParserImpl extends FilterParserImpl implements OrderByParser
}
@Override
- public OrderByExpression parseOrderByString(final String orderByExpression) throws ExpressionParserException, ExpressionParserInternalError {
+ public OrderByExpression parseOrderByString(final String orderByExpression) throws ExpressionParserException,
+ ExpressionParserInternalError {
curExpression = orderByExpression;
OrderByExpressionImpl orderCollection = new OrderByExpressionImpl(curExpression);
try {
- tokenList = new Tokenizer(orderByExpression).tokenize(); //throws TokenizerMessage
+ tokenList = new Tokenizer(orderByExpression).tokenize(); // throws TokenizerMessage
} catch (TokenizerException tokenizerException) {
throw FilterParserExceptionImpl.createERROR_IN_TOKENIZER(tokenizerException, curExpression);
}
@@ -52,7 +53,7 @@ public class OrderByParserImpl extends FilterParserImpl implements OrderByParser
OrderExpressionImpl orderNode = new OrderExpressionImpl(node);
- //read the sort order
+ // read the sort order
Token token = tokenList.lookToken();
if (token == null) {
orderNode.setSortOrder(SortOrder.asc);
@@ -73,7 +74,7 @@ public class OrderByParserImpl extends FilterParserImpl implements OrderByParser
orderCollection.addOrder(orderNode);
- //ls_token may be a ',' or empty.
+ // ls_token may be a ',' or empty.
if (token == null) {
break;
} else if (token.getKind() == TokenKind.COMMA) {
@@ -85,7 +86,7 @@ public class OrderByParserImpl extends FilterParserImpl implements OrderByParser
// Tested with TestParserExceptions.TestOPMparseOrderByString CASE 2
throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(oldToken, curExpression);
}
- } else { //e.g. in case $orderby=String asc a
+ } else { // e.g. in case $orderby=String asc a
throw FilterParserExceptionImpl.createCOMMA_OR_END_EXPECTED_AT_POS(token, curExpression);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java
index 83e1fe3..796e5ff 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java
index d667020..b9ce742 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -26,12 +26,12 @@ import org.apache.olingo.odata2.api.edm.EdmType;
import org.apache.olingo.odata2.api.edm.EdmTypeKind;
/**
- * Parameter set is a vector of 1 or more EDM types, it is used to store the possible
+ * Parameter set is a vector of 1 or more EDM types, it is used to store the possible
* input and return types of a <i>OData filter operator</i> or <i>OData filter method</i>
- * @see InfoMethod
- * @see InfoBinaryOperator
+ * @see InfoMethod
+ * @see InfoBinaryOperator
* @see InfoUnaryOperator
- *
+ *
*/
@SuppressWarnings("javadoc")
public class ParameterSet {
@@ -50,7 +50,8 @@ public class ParameterSet {
types.add(type2);
}
- public ParameterSet(final EdmSimpleType returnType, final EdmSimpleType type1, final EdmSimpleType type2, final EdmSimpleType type3) {
+ public ParameterSet(final EdmSimpleType returnType, final EdmSimpleType type1, final EdmSimpleType type2,
+ final EdmSimpleType type3) {
this.returnType = returnType;
types.add(type1);
types.add(type2);
@@ -73,27 +74,30 @@ public class ParameterSet {
/**
* Compares a list of EdmTypes with the EdmTypes stored in {@link #types}.
* The lists are compared sequentially, e.g index N of actualParameterTypes with index N of {@link #types}.
- * If the input list contains more elements than stored in {@link #types} (which is allowed when validating the <i>concat</i> method
- * which takes a variable number of input parameters), the actual parameter type is compared against the {@link #furtherType}.
+ * If the input list contains more elements than stored in {@link #types} (which is allowed when validating the
+ * <i>concat</i> method
+ * which takes a variable number of input parameters), the actual parameter type is compared against the
+ * {@link #furtherType}.
* @param actualParameterTypes
* @param allowPromotion
* @return true if equals
* @throws ExpressionParserInternalError
*/
- public boolean equals(final List<EdmType> actualParameterTypes, final boolean allowPromotion) throws ExpressionParserInternalError {
+ public boolean equals(final List<EdmType> actualParameterTypes, final boolean allowPromotion)
+ throws ExpressionParserInternalError {
int actSize = actualParameterTypes.size();
int paramSize = types.size();
if (actSize < paramSize) {
return false;
- //throw FilterParserInternalError.createINVALID_TYPE_COUNT(); //to few actual Parameters
+ // throw FilterParserInternalError.createINVALID_TYPE_COUNT(); //to few actual Parameters
}
- //This may happen if the number of supplied actual method parameters is higher then than the number
- //of allowed method parameters but this should be checked before, hence this is an internal error in the parser
+ // This may happen if the number of supplied actual method parameters is higher then than the number
+ // of allowed method parameters but this should be checked before, hence this is an internal error in the parser
if ((actSize > paramSize) && (furtherType == null)) {
return false;
- //throw FilterParserInternalError.createINVALID_TYPE_COUNT();
+ // throw FilterParserInternalError.createINVALID_TYPE_COUNT();
}
for (int i = 0; i < actSize; i++) {
@@ -106,24 +110,24 @@ public class ParameterSet {
if (i < paramSize) {
paramType = types.get(i);
} else {
- paramType = furtherType; // for methods with variable amount of method parameters
+ paramType = furtherType; // for methods with variable amount of method parameters
}
if (!actType.equals(paramType)) {
- //this the parameter type does not fit and if it is not allowed to promoted the actual parameter then
- //this parameter combination does not fit
+ // this the parameter type does not fit and if it is not allowed to promoted the actual parameter then
+ // this parameter combination does not fit
if (!allowPromotion) {
return false;
}
- //Its allowed to promoted the actual parameter!!!
+ // Its allowed to promoted the actual parameter!!!
- //Promotion only allowed for simple types
+ // Promotion only allowed for simple types
if (actType.getKind() != EdmTypeKind.SIMPLE) {
- return false; //Tested with TestParserExceptions.testAdditionalStuff CASE 8
+ return false; // Tested with TestParserExceptions.testAdditionalStuff CASE 8
}
- //The type simply don't match
+ // The type simply don't match
if (!paramType.isCompatible((EdmSimpleType) actType)) {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSetCombination.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSetCombination.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSetCombination.java
index a989055..ecc94b0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSetCombination.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSetCombination.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -52,7 +52,7 @@ public interface ParameterSetCombination {
return combinations.get(0).getReturnType();
}
- //There are more than 1 possible return type, check if they are equal, if not return null.
+ // There are more than 1 possible return type, check if they are equal, if not return null.
EdmType returnType = combinations.get(0).getReturnType();
for (int i = 1; i < parameterCount; i++) {
if (returnType != combinations.get(i)) {
@@ -81,7 +81,7 @@ public interface ParameterSetCombination {
return new ParameterSet(null, null);
}
- //first check for exact parameter combination
+ // first check for exact parameter combination
for (ParameterSet parameterSet : combinations) {
boolean s = parameterSet.equals(actualParameterTypes, false);
if (s) {
@@ -89,7 +89,7 @@ public interface ParameterSetCombination {
}
}
- //first check for parameter combination with promotion
+ // first check for parameter combination with promotion
for (ParameterSet parameterSet : combinations) {
boolean s = parameterSet.equals(actualParameterTypes, true);
if (s) {
@@ -117,13 +117,14 @@ public interface ParameterSetCombination {
public ParameterSet validate(final List<EdmType> actualParameterTypes) throws ExpressionParserInternalError {
EdmType xxx = actualParameterTypes.get(actualParameterTypes.size() - 1);
return new ParameterSet(xxx, null);
- //return actualParameterTypes.get(actualParameterTypes.size() - 1);
+ // return actualParameterTypes.get(actualParameterTypes.size() - 1);
}
@Override
public EdmType getReturnType() {
- //If the return type is always the type of the last parameter of the actual parameters ( e.g. when using the method operator)
- //then the return type can not predicted.
+ // If the return type is always the type of the last parameter of the actual parameters ( e.g. when using the
+ // method operator)
+ // then the return type can not predicted.
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/PropertyExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/PropertyExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/PropertyExpressionImpl.java
index 7e13237..ac19e47 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/PropertyExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/PropertyExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -43,7 +43,7 @@ public class PropertyExpressionImpl implements PropertyExpression {
}
public CommonExpression setEdmProperty(final EdmTyped edmProperty) {
- //used EdmTyped because it may be a EdmProperty or a EdmNavigationProperty
+ // used EdmTyped because it may be a EdmProperty or a EdmNavigationProperty
this.edmProperty = edmProperty;
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Token.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Token.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Token.java
index e1f0354..e4a7dfb 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Token.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Token.java
@@ -1,24 +1,24 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
-/*1*/
+/* 1 */
import org.apache.olingo.odata2.api.edm.EdmLiteral;
import org.apache.olingo.odata2.api.edm.EdmType;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenKind.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenKind.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenKind.java
index fff6bb2..f8a93cd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenKind.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenKind.java
@@ -1,28 +1,28 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
-/*1*/
+/* 1 */
/**
* The token kind is used to categorize a single {@link Token}.
- * The Expression parser ({@link FilterParserImpl}) uses this information
+ * The Expression parser ({@link FilterParserImpl}) uses this information
* to build the expression tree.
*/
public enum TokenKind {
@@ -47,16 +47,16 @@ public enum TokenKind {
COMMA,
/**
- * Indicates that the token is a typed literal. That may be a
+ * Indicates that the token is a typed literal. That may be a
* Edm.String like 'TEST'
- * Edm.Double like '1.1D'
+ * Edm.Double like '1.1D'
* or any other Edm.Simple Type
*/
SIMPLE_TYPE,
/**
* Indicates that the token is a single symbol. That may be a
- * '-', '=', '/', '?', '.' or a '*' character
+ * '-', '=', '/', '?', '.' or a '*' character
*/
SYMBOL,
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenList.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenList.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenList.java
index e08ba17..4dbef4a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenList.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenList.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -33,7 +33,7 @@ public class TokenList implements Iterator<Token> {
/**
* Append StringValue Token to tokens parameter
- * @param position Position of parsed token
+ * @param position Position of parsed token
* @param kind Kind of parsed token
* @param uriLiteral String value of parsed token
*/
@@ -45,7 +45,7 @@ public class TokenList implements Iterator<Token> {
/**
* Append CharValue Token to tokens parameter
- * @param position Position of parsed token
+ * @param position Position of parsed token
* @param kind Kind of parsed token
* @param charValue Char value of parsed token
*/
@@ -57,11 +57,12 @@ public class TokenList implements Iterator<Token> {
/**
* Append UriLiteral Token to tokens parameter
- * @param position Position of parsed token
+ * @param position Position of parsed token
* @param kind Kind of parsed token
- * @param javaLiteral EdmLiteral of parsed token containing type and value of UriLiteral
+ * @param javaLiteral EdmLiteral of parsed token containing type and value of UriLiteral
*/
- public void appendEdmTypedToken(final int position, final TokenKind kind, final String uriLiteral, final EdmLiteral javaLiteral) {
+ public void appendEdmTypedToken(final int position, final TokenKind kind, final String uriLiteral,
+ final EdmLiteral javaLiteral) {
Token token = new Token(kind, position, uriLiteral, javaLiteral);
tokens.add(token);
return;
@@ -105,7 +106,8 @@ public class TokenList implements Iterator<Token> {
return actual;
}
- public Token expectToken(final TokenKind comma, final boolean throwFilterExpression) throws ExpressionParserInternalError {
+ public Token expectToken(final TokenKind comma, final boolean throwFilterExpression)
+ throws ExpressionParserInternalError {
Token actual = next();
if (actual == null) {
throw ExpressionParserInternalError.createNO_TOKEN_AVAILABLE(comma.toString());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java
index 6cbc165..519f493 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -30,13 +30,16 @@ import org.apache.olingo.odata2.core.edm.EdmSimpleTypeFacadeImpl;
/**
* Expression tokenizer
- *
+ *
*/
public class Tokenizer {
- //Pattern OTHER_LIT = Pattern.compile("^([[A-Za-z0-9]._~%!$&*+;:@-]+)");
+ // Pattern OTHER_LIT = Pattern.compile("^([[A-Za-z0-9]._~%!$&*+;:@-]+)");
private static final Pattern OTHER_LIT = Pattern.compile("(?:\\p{L}|\\p{Digit}|[-._~%!$&*+;:@])+");
- private static final Pattern FUNK = Pattern.compile("^(startswith|endswith|substring|substring|substringof|indexof|replace|tolower|toupper|trim|concat|length|year|mounth|day|hour|minute|second|round|ceiling|floor)( *)\\(");
+ private static final Pattern FUNK =
+ Pattern
+ .compile("^(startswith|endswith|substring|substring|substringof|indexof|replace|tolower|toupper" +
+ "|trim|concat|length|year|mounth|day|hour|minute|second|round|ceiling|floor)( *)\\(");
private static final Pattern AND_SUB1 = Pattern.compile("^(add|sub|mul|div|mod|not) ");
private static final Pattern AND_SUB = Pattern.compile("^(and|or|eq|ne|lt|gt|le|ge) ");
private static final Pattern prefix = Pattern.compile("^(X|binary|guid|datetime|datetimeoffset|time)'");
@@ -66,8 +69,8 @@ public class Tokenizer {
}
/**
- * Tokenizes an expression as defined per OData specification
- * @return Token list
+ * Tokenizes an expression as defined per OData specification
+ * @return Token list
*/
public TokenList tokenize() throws TokenizerException, ExpressionParserException {
curPosition = 0;
@@ -81,7 +84,7 @@ public class Tokenizer {
curCharacter = expression.charAt(curPosition);
switch (curCharacter) {
case ' ':
- //count whitespace and move pointer to next non-whitespace char
+ // count whitespace and move pointer to next non-whitespace char
eatWhiteSpaces(curPosition, curCharacter);
break;
@@ -117,26 +120,26 @@ public class Tokenizer {
break;
default:
- String rem_expr = expression.substring(curPosition); //remaining expression
+ String rem_expr = expression.substring(curPosition); // remaining expression
boolean isBinary = checkForBinary(oldPosition, rem_expr);
if (isBinary) {
break;
}
- //check for prefixes like X, binary, guid, datetime
+ // check for prefixes like X, binary, guid, datetime
boolean isPrefix = checkForPrefix(rem_expr);
if (isPrefix) {
break;
}
- //check for math
+ // check for math
boolean isMath = checkForMath(oldPosition, rem_expr);
if (isMath) {
break;
}
- //check for function
+ // check for function
boolean isFunction = checkForMethod(oldPosition, rem_expr);
if (isFunction) {
break;
@@ -171,7 +174,7 @@ public class Tokenizer {
tokens.appendEdmTypedToken(oldPosition, TokenKind.SIMPLE_TYPE, token, edmLiteral);
isLiteral = true;
} catch (EdmLiteralException e) {
- // We treat it as normal untyped literal.
+ // We treat it as normal untyped literal.
// The '-' is checked here (and not in the switch statement) because it may be
// part of a negative number.
@@ -193,7 +196,8 @@ public class Tokenizer {
boolean isBoolean = false;
if (rem_expr.equals("true") || rem_expr.equals("false")) {
curPosition = curPosition + rem_expr.length();
- tokens.appendEdmTypedToken(oldPosition, TokenKind.SIMPLE_TYPE, rem_expr, new EdmLiteral(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Boolean), rem_expr));
+ tokens.appendEdmTypedToken(oldPosition, TokenKind.SIMPLE_TYPE, rem_expr, new EdmLiteral(EdmSimpleTypeFacadeImpl
+ .getEdmSimpleType(EdmSimpleTypeKind.Boolean), rem_expr));
isBoolean = true;
}
return isBoolean;
@@ -262,7 +266,7 @@ public class Tokenizer {
if (matcher.find()) {
token = matcher.group(1);
curPosition = curPosition + token.length();
- curCharacter = expression.charAt(curPosition); //"should be '
+ curCharacter = expression.charAt(curPosition); // "should be '
readLiteral(curCharacter, token);
isPrefix = true;
}
@@ -286,7 +290,7 @@ public class Tokenizer {
token = token + Character.toString(curCharacter);
curPosition = curPosition + 1;
- boolean wasApostroph = false; //leading ' does not count
+ boolean wasApostroph = false; // leading ' does not count
while (curPosition < expressionLength) {
curCharacter = expression.charAt(curPosition);
@@ -299,7 +303,7 @@ public class Tokenizer {
wasApostroph = false;
} else {
if (wasApostroph) {
- wasApostroph = false; //a double ' is a normal character '
+ wasApostroph = false; // a double ' is a normal character '
} else {
wasApostroph = true;
token = token + curCharacter;
@@ -309,7 +313,7 @@ public class Tokenizer {
}
if (!wasApostroph) {
- //Exception tested within TestPMparseFilterString
+ // Exception tested within TestPMparseFilterString
throw FilterParserExceptionImpl.createTOKEN_UNDETERMINATED_STRING(oldPosition, expression);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java
index a942ba5..cb02bbd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -25,14 +25,16 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
/**
* This exception is thrown if there is an error during tokenizing.<br>
* <b>This exception in not in the public API</b>, but may be added as cause for
- * the {@link org.apache.olingo.odata2.api.uri.expression.ExpressionParserException} exception.
- *
+ * the {@link org.apache.olingo.odata2.api.uri.expression.ExpressionParserException} exception.
+ *
*/
public class TokenizerException extends ODataMessageException {
private static final long serialVersionUID = 77L;
- public static final MessageReference TYPEDECTECTION_FAILED_ON_STRING = createMessageReference(TokenizerException.class, "TYPEDECTECTION_FAILED_ON_STRING");
- public static final MessageReference UNKNOWN_CHARACTER = createMessageReference(TokenizerException.class, "UNKNOWN_CHARACTER");
+ public static final MessageReference TYPEDECTECTION_FAILED_ON_STRING = createMessageReference(
+ TokenizerException.class, "TYPEDECTECTION_FAILED_ON_STRING");
+ public static final MessageReference UNKNOWN_CHARACTER = createMessageReference(TokenizerException.class,
+ "UNKNOWN_CHARACTER");
private Token token;
private int position;
@@ -62,7 +64,8 @@ public class TokenizerException extends ODataMessageException {
super(messageReference, cause);
}
- static public TokenizerException createTYPEDECTECTION_FAILED_ON_STRING(final EdmLiteralException ex, final int position, final String uriLiteral) {
+ static public TokenizerException createTYPEDECTECTION_FAILED_ON_STRING(final EdmLiteralException ex,
+ final int position, final String uriLiteral) {
MessageReference msgRef = TokenizerException.TYPEDECTECTION_FAILED_ON_STRING.create();
msgRef.addContent(uriLiteral);
@@ -73,18 +76,20 @@ public class TokenizerException extends ODataMessageException {
}
/*
- static public TokenizerException createTYPEDECTECTION_FAILED_ON_EDMTYPE(EdmLiteralException ex, int position, String uriLiteral)
- {
- MessageReference msgRef = TokenizerException.TYPEDECTECTION_FAILED_ON_EDMTYPE.create();
-
- msgRef.addContent(uriLiteral);
- msgRef.addContent(position);
- Token token = new Token(TokenKind.UNKNOWN, position, uriLiteral);
-
- return new TokenizerException(msgRef).setToken(token);
- }
- */
- static public TokenizerException createUNKNOWN_CHARACTER(final int position, final String uriLiteral, final String expression) {
+ * static public TokenizerException createTYPEDECTECTION_FAILED_ON_EDMTYPE(EdmLiteralException ex, int position,
+ * String uriLiteral)
+ * {
+ * MessageReference msgRef = TokenizerException.TYPEDECTECTION_FAILED_ON_EDMTYPE.create();
+ *
+ * msgRef.addContent(uriLiteral);
+ * msgRef.addContent(position);
+ * Token token = new Token(TokenKind.UNKNOWN, position, uriLiteral);
+ *
+ * return new TokenizerException(msgRef).setToken(token);
+ * }
+ */
+ static public TokenizerException createUNKNOWN_CHARACTER(final int position, final String uriLiteral,
+ final String expression) {
MessageReference msgRef = TokenizerException.UNKNOWN_CHARACTER.create();
msgRef.addContent(uriLiteral);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java
index 6b98f8a..64a9fba 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -23,24 +23,27 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
/**
* This exception is thrown if a token should be read
- * from the top of the {@link TokenList} which does not match an
- * expected token. The cause for using this exception <b>MUST</b> indicate an internal error
+ * from the top of the {@link TokenList} which does not match an
+ * expected token. The cause for using this exception <b>MUST</b> indicate an internal error
* in the {@link Tokenizer} or inside the {@link FilterParserImpl}.
* <br><br>
* <b>This exception in not in the public API</b>, but may be added as cause for
- * the {@link ExpressionParserInternalError} exception.
- *
- */
+ * the {@link ExpressionParserInternalError} exception.
+ *
+ */
public class TokenizerExpectError extends ODataMessageException {
private static final long serialVersionUID = 1L;
public static final int parseStringpoken = 1;
- //Invalid token detected at position &POSITION&
- public static final MessageReference NO_TOKEN_AVAILABLE = createMessageReference(TokenizerExpectError.class, "NO_TOKEN_AVAILABLE");
- public static final MessageReference INVALID_TOKEN_AT = createMessageReference(TokenizerExpectError.class, "INVALID_TOKEN_AT");
- public static final MessageReference INVALID_TOKENKIND_AT = createMessageReference(TokenizerExpectError.class, "INVALID_TOKENKIND_AT");
+ // Invalid token detected at position &POSITION&
+ public static final MessageReference NO_TOKEN_AVAILABLE = createMessageReference(TokenizerExpectError.class,
+ "NO_TOKEN_AVAILABLE");
+ public static final MessageReference INVALID_TOKEN_AT = createMessageReference(TokenizerExpectError.class,
+ "INVALID_TOKEN_AT");
+ public static final MessageReference INVALID_TOKENKIND_AT = createMessageReference(TokenizerExpectError.class,
+ "INVALID_TOKENKIND_AT");
private String token;
private Exception previous;
@@ -84,7 +87,8 @@ public class TokenizerExpectError extends ODataMessageException {
return new TokenizerExpectError(msgRef);
}
- public static TokenizerExpectError createINVALID_TOKENKIND_AT(final TokenKind expectedTokenKind, final Token actualToken) {
+ public static TokenizerExpectError createINVALID_TOKENKIND_AT(final TokenKind expectedTokenKind,
+ final Token actualToken) {
MessageReference msgRef = TokenizerExpectError.INVALID_TOKEN_AT.create();
msgRef.addContent(expectedTokenKind.toString());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java
index 05c5b79..3589b9d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java
@@ -1,26 +1,26 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
/**
* Internal error. If used(thrown) the thrower
- *
+ *
*/
public class TokenizerRTException extends Exception {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java
index 1d07681..a9faa84 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java
index 475ffb6..a45da48 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -40,33 +40,36 @@ import org.mockito.Mockito;
*
*/
public class ContentNegotiatorTest {
-
- private void negotiateContentType(final List<ContentType> contentTypes, final List<ContentType> supportedTypes, final String expected) throws ODataException {
+
+ private void negotiateContentType(final List<ContentType> contentTypes, final List<ContentType> supportedTypes,
+ final String expected) throws ODataException {
final ContentType contentType = new ContentNegotiator().contentNegotiation(contentTypes, supportedTypes);
assertEquals(expected, contentType.toContentTypeString());
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void invalidContentNegotiatorCreation() throws ODataException {
final ContentType contentType = new ContentNegotiator().doContentNegotiation(null, null, null);
assertNull(contentType);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void invalidContentNegotiatorCreationNullRequest() throws ODataException {
UriInfoImpl uriInfo = Mockito.mock(UriInfoImpl.class);
- final ContentType contentType = new ContentNegotiator().doContentNegotiation(null, uriInfo, new ArrayList<String>());
+ final ContentType contentType =
+ new ContentNegotiator().doContentNegotiation(null, uriInfo, new ArrayList<String>());
assertNull(contentType);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void invalidContentNegotiatorCreationNullUri() throws ODataException {
ODataRequest request = Mockito.mock(ODataRequest.class);
- final ContentType contentType = new ContentNegotiator().doContentNegotiation(request, null, new ArrayList<String>());
+ final ContentType contentType =
+ new ContentNegotiator().doContentNegotiation(request, null, new ArrayList<String>());
assertNull(contentType);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void invalidContentNegotiatorCreationNullSupported() throws ODataException {
ODataRequest request = Mockito.mock(ODataRequest.class);
UriInfoImpl uriInfo = Mockito.mock(UriInfoImpl.class);
@@ -184,7 +187,9 @@ public class ContentNegotiatorTest {
negotiateContentTypeCharset("application/xml; charset=utf-8", "application/xml;charset=utf-8", true);
}
- private void negotiateContentTypeCharset(final String requestType, final String supportedType, final boolean asFormat) throws ODataException {
+ private void
+ negotiateContentTypeCharset(final String requestType, final String supportedType, final boolean asFormat)
+ throws ODataException {
UriInfoImpl uriInfo = Mockito.mock(UriInfoImpl.class);
Mockito.when(uriInfo.getUriType()).thenReturn(UriType.URI1);
if (asFormat) {
@@ -198,11 +203,11 @@ public class ContentNegotiatorTest {
Mockito.when(request.getMethod()).thenReturn(ODataHttpMethod.GET);
Mockito.when(request.getRequestHeaderValue(HttpHeaders.ACCEPT)).thenReturn(requestType);
Mockito.when(request.getAcceptHeaders()).thenReturn(acceptedContentTypes);
-
-
+
// perform
ContentNegotiator negotiator = new ContentNegotiator();
- String negotiatedContentType = negotiator.doContentNegotiation(request, uriInfo, supportedContentTypes).toContentTypeString();
+ String negotiatedContentType =
+ negotiator.doContentNegotiation(request, uriInfo, supportedContentTypes).toContentTypeString();
// verify
assertEquals(supportedType, negotiatedContentType);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
index 040d628..717f031 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -65,7 +65,7 @@ import org.mockito.stubbing.Answer;
/**
* Tests for request dispatching according to URI type and HTTP method.
- *
+ *
*/
public class DispatcherTest extends BaseTest {
@@ -76,37 +76,49 @@ public class DispatcherTest extends BaseTest {
EntitySetProcessor entitySet = mock(EntitySetProcessor.class);
when(entitySet.readEntitySet(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
when(entitySet.countEntitySet(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entitySet.createEntity(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(getAnswer());
+ when(entitySet.createEntity(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(
+ getAnswer());
EntityProcessor entity = mock(EntityProcessor.class);
when(entity.readEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
when(entity.existsEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
when(entity.deleteEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entity.updateEntity(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyBoolean(), anyString())).thenAnswer(getAnswer());
+ when(entity.updateEntity(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyBoolean(), anyString()))
+ .thenAnswer(getAnswer());
EntityComplexPropertyProcessor entityComplexProperty = mock(EntityComplexPropertyProcessor.class);
when(entityComplexProperty.readEntityComplexProperty(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityComplexProperty.updateEntityComplexProperty(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyBoolean(), anyString())).thenAnswer(getAnswer());
+ when(
+ entityComplexProperty.updateEntityComplexProperty(any(UriInfoImpl.class), any(InputStream.class), anyString(),
+ anyBoolean(), anyString())).thenAnswer(getAnswer());
EntitySimplePropertyProcessor entitySimpleProperty = mock(EntitySimplePropertyProcessor.class);
when(entitySimpleProperty.readEntitySimpleProperty(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entitySimpleProperty.updateEntitySimpleProperty(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(getAnswer());
+ when(
+ entitySimpleProperty.updateEntitySimpleProperty(any(UriInfoImpl.class), any(InputStream.class), anyString(),
+ anyString())).thenAnswer(getAnswer());
EntitySimplePropertyValueProcessor entitySimplePropertyValue = mock(EntitySimplePropertyValueProcessor.class);
- when(entitySimplePropertyValue.readEntitySimplePropertyValue(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entitySimplePropertyValue.deleteEntitySimplePropertyValue(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entitySimplePropertyValue.updateEntitySimplePropertyValue(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(getAnswer());
+ when(entitySimplePropertyValue.readEntitySimplePropertyValue(any(UriInfoImpl.class), anyString())).thenAnswer(
+ getAnswer());
+ when(entitySimplePropertyValue.deleteEntitySimplePropertyValue(any(UriInfoImpl.class), anyString())).thenAnswer(
+ getAnswer());
+ when(
+ entitySimplePropertyValue.updateEntitySimplePropertyValue(any(UriInfoImpl.class), any(InputStream.class),
+ anyString(), anyString())).thenAnswer(getAnswer());
EntityLinkProcessor entityLink = mock(EntityLinkProcessor.class);
when(entityLink.readEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
when(entityLink.existsEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
when(entityLink.deleteEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityLink.updateEntityLink(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(getAnswer());
+ when(entityLink.updateEntityLink(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString()))
+ .thenAnswer(getAnswer());
EntityLinksProcessor entityLinks = mock(EntityLinksProcessor.class);
when(entityLinks.readEntityLinks(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
when(entityLinks.countEntityLinks(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityLinks.createEntityLink(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(getAnswer());
+ when(entityLinks.createEntityLink(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString()))
+ .thenAnswer(getAnswer());
MetadataProcessor metadata = mock(MetadataProcessor.class);
when(metadata.readMetadata(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
@@ -123,7 +135,8 @@ public class DispatcherTest extends BaseTest {
EntityMediaProcessor entityMedia = mock(EntityMediaProcessor.class);
when(entityMedia.readEntityMedia(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
when(entityMedia.deleteEntityMedia(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityMedia.updateEntityMedia(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(getAnswer());
+ when(entityMedia.updateEntityMedia(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString()))
+ .thenAnswer(getAnswer());
ODataService service = mock(ODataService.class);
when(service.getServiceDocumentProcessor()).thenReturn(serviceDocument);
@@ -167,7 +180,8 @@ public class DispatcherTest extends BaseTest {
return uriInfo;
}
- private static void checkDispatch(final ODataHttpMethod method, final UriType uriType, final boolean isValue, final String expectedMethodName) throws ODataException {
+ private static void checkDispatch(final ODataHttpMethod method, final UriType uriType, final boolean isValue,
+ final String expectedMethodName) throws ODataException {
ODataServiceFactory factory = mock(ODataServiceFactory.class);
final ODataResponse response = new Dispatcher(factory, getMockService())
@@ -175,7 +189,9 @@ public class DispatcherTest extends BaseTest {
assertEquals(expectedMethodName, response.getEntity());
}
- private static void checkDispatch(final ODataHttpMethod method, final UriType uriType, final String expectedMethodName) throws ODataException {
+ private static void
+ checkDispatch(final ODataHttpMethod method, final UriType uriType, final String expectedMethodName)
+ throws ODataException {
checkDispatch(method, uriType, false, expectedMethodName);
}
@@ -366,7 +382,8 @@ public class DispatcherTest extends BaseTest {
notSupportedDispatch(ODataHttpMethod.MERGE, UriType.URI6A);
}
- private static void checkFeature(final UriType uriType, final boolean isValue, final Class<? extends ODataProcessor> feature) throws ODataException {
+ private static void checkFeature(final UriType uriType, final boolean isValue,
+ final Class<? extends ODataProcessor> feature) throws ODataException {
ODataServiceFactory factory = mock(ODataServiceFactory.class);
new Dispatcher(factory, getMockService());
assertEquals(feature, Dispatcher.mapUriTypeToProcessorFeature(mockUriInfo(uriType, isValue)));
@@ -423,15 +440,17 @@ public class DispatcherTest extends BaseTest {
}
@SuppressWarnings("unchecked")
- private void negotiateContentTypeCharset(final String requestType, final String supportedType, final boolean asFormat)
- throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException, ODataException {
+ private void
+ negotiateContentTypeCharset(final String requestType, final String supportedType, final boolean asFormat)
+ throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException,
+ ODataException {
ODataServiceFactory factory = mock(ODataServiceFactory.class);
ODataService service = Mockito.mock(ODataService.class);
Dispatcher dispatcher = new Dispatcher(factory, service);
UriInfoImpl uriInfo = new UriInfoImpl();
- uriInfo.setUriType(UriType.URI1); //
+ uriInfo.setUriType(UriType.URI1); //
if (asFormat) {
uriInfo.setFormat(requestType);
}
@@ -444,7 +463,8 @@ public class DispatcherTest extends BaseTest {
Mockito.when(service.getEntitySetProcessor()).thenReturn(processor);
InputStream content = null;
- ODataResponse odataResponse = dispatcher.dispatch(ODataHttpMethod.GET, uriInfo, content, requestType, supportedType);
+ ODataResponse odataResponse =
+ dispatcher.dispatch(ODataHttpMethod.GET, uriInfo, content, requestType, supportedType);
assertEquals(supportedType, odataResponse.getContentHeader());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java
index 35211de..571d6b1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
[53/59] [abbrv] cleanup jpa core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java
index 71363f4..f00cc61 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.edm;
@@ -51,7 +51,7 @@ public class ODataJPAEdmProviderNegativeTest {
Field field = clazz.getDeclaredField("schemas");
field.setAccessible(true);
List<Schema> schemas = new ArrayList<Schema>();
- schemas.add(new Schema().setNamespace("salesorderprocessing")); //Empty Schema
+ schemas.add(new Schema().setNamespace("salesorderprocessing")); // Empty Schema
field.set(edmProvider, schemas);
field = clazz.getDeclaredField("oDataJPAContext");
field.setAccessible(true);
@@ -106,7 +106,8 @@ public class ODataJPAEdmProviderNegativeTest {
public void testGetAssociationFullQualifiedName() {
Association association = null;
try {
- association = edmProvider.getAssociation(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"));
+ association =
+ edmProvider.getAssociation(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -125,7 +126,8 @@ public class ODataJPAEdmProviderNegativeTest {
@Test
public void testGetAssociationSet() {
try {
- assertNull(edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderHeaders", "SalesOrderHeader"));
+ assertNull(edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName(
+ "salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderHeaders", "SalesOrderHeader"));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -158,7 +160,7 @@ public class ODataJPAEdmProviderNegativeTest {
List<EntityContainer> containerList = new ArrayList<EntityContainer>();
containerList.add(container); // Empty Container
schema.setEntityContainers(containerList);
- schemas.add(schema); //Empty Schema
+ schemas.add(schema); // Empty Schema
field.set(provider, schemas);
} catch (IllegalArgumentException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java
index 14042c6..8dbd9da 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.edm;
@@ -158,7 +158,8 @@ public class ODataJPAEdmProviderTest {
public void testGetAssociationFullQualifiedName() {
Association association = null;
try {
- association = edmProvider.getAssociation(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"));
+ association =
+ edmProvider.getAssociation(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -187,20 +188,26 @@ public class ODataJPAEdmProviderTest {
AssociationSet associationSet = null;
try {
- associationSet = edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderHeaders", "SalesOrderHeader");
+ associationSet =
+ edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName("salesorderprocessing",
+ "SalesOrderHeader_SalesOrderItem"), "SalesOrderHeaders", "SalesOrderHeader");
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
assertNotNull(associationSet);
assertEquals("SalesOrderHeader_SalesOrderItemSet", associationSet.getName());
try {
- associationSet = edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderItems", "SalesOrderItem");
+ associationSet =
+ edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName("salesorderprocessing",
+ "SalesOrderHeader_SalesOrderItem"), "SalesOrderItems", "SalesOrderItem");
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
assertNotNull(associationSet);
try {
- associationSet = edmProvider.getAssociationSet("salesorderproceContainer", new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderItems", "SalesOrderItem");
+ associationSet =
+ edmProvider.getAssociationSet("salesorderproceContainer", new FullQualifiedName("salesorderprocessing",
+ "SalesOrderHeader_SalesOrderItem"), "SalesOrderItems", "SalesOrderItem");
} catch (ODataException e) {
assertTrue(true);
}
@@ -210,13 +217,15 @@ public class ODataJPAEdmProviderTest {
public void testGetFunctionImport() {
String functionImportName = null;
try {
- functionImportName = edmProvider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1").getName();
+ functionImportName =
+ edmProvider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1").getName();
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
assertEquals("SalesOrder_FunctionImport1", functionImportName);
try {
- functionImportName = edmProvider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1").getName();
+ functionImportName =
+ edmProvider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1").getName();
} catch (ODataException e) {
assertTrue(true);
}
@@ -304,8 +313,10 @@ public class ODataJPAEdmProviderTest {
@Test
public void testGetEntityTypeWithBuffer() {
- HashMap<String, org.apache.olingo.odata2.api.edm.provider.EntityType> entityTypes = new HashMap<String, org.apache.olingo.odata2.api.edm.provider.EntityType>();
- org.apache.olingo.odata2.api.edm.provider.EntityType entity = new org.apache.olingo.odata2.api.edm.provider.EntityType();
+ HashMap<String, org.apache.olingo.odata2.api.edm.provider.EntityType> entityTypes =
+ new HashMap<String, org.apache.olingo.odata2.api.edm.provider.EntityType>();
+ org.apache.olingo.odata2.api.edm.provider.EntityType entity =
+ new org.apache.olingo.odata2.api.edm.provider.EntityType();
entity.setName("SalesOrderHeader");
entityTypes.put("salesorderprocessing" + "." + "SalesorderHeader", entity);
ODataJPAEdmProvider jpaEdmProv = new ODataJPAEdmProvider();
@@ -349,7 +360,8 @@ public class ODataJPAEdmProviderTest {
f = claz.getDeclaredField("associations");
f.setAccessible(true);
f.set(jpaEdmProv, associations);
- assertEquals(association, jpaEdmProv.getAssociation(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem")));
+ assertEquals(association, jpaEdmProv.getAssociation(new FullQualifiedName("salesorderprocessing",
+ "SalesOrderHeader_SalesOrderItem")));
} catch (NoSuchFieldException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
} catch (SecurityException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java
index 364e830..7da02d8 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -72,7 +72,8 @@ public class JPQLBuilderFactoryTest {
// Build JPQL Context
JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.SELECT, getEntitySetView).build();
- JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
+ JPQLStatementBuilder statementBuilder =
+ new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
assertTrue(statementBuilder instanceof JPQLSelectStatementBuilder);
@@ -85,7 +86,8 @@ public class JPQLBuilderFactoryTest {
// Build JPQL Context
JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, getEntityView).build();
- JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
+ JPQLStatementBuilder statementBuilder =
+ new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
assertTrue(statementBuilder instanceof JPQLSelectSingleStatementBuilder);
@@ -98,7 +100,8 @@ public class JPQLBuilderFactoryTest {
// Build JPQL Context
JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.JOIN, getEntitySetView).build();
- JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
+ JPQLStatementBuilder statementBuilder =
+ new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
assertTrue(statementBuilder instanceof JPQLJoinStatementBuilder);
@@ -111,7 +114,8 @@ public class JPQLBuilderFactoryTest {
// Build JPQL Context
JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.JOIN_SINGLE, getEntityView).build();
- JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
+ JPQLStatementBuilder statementBuilder =
+ new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
assertTrue(statementBuilder instanceof JPQLJoinSelectSingleStatementBuilder);
@@ -121,7 +125,8 @@ public class JPQLBuilderFactoryTest {
public void testGetContextBuilderforDelete() throws ODataException {
// Build JPQL ContextBuilder
- JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.DELETE);
+ JPQLContextBuilder contextBuilder =
+ new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.DELETE);
assertNull(contextBuilder);
@@ -131,7 +136,8 @@ public class JPQLBuilderFactoryTest {
public void testGetContextBuilderforSelect() throws ODataException {
// Build JPQL ContextBuilder
- JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.SELECT);
+ JPQLContextBuilder contextBuilder =
+ new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.SELECT);
assertNotNull(contextBuilder);
assertTrue(contextBuilder instanceof JPQLSelectContextBuilder);
@@ -142,7 +148,8 @@ public class JPQLBuilderFactoryTest {
public void testGetContextBuilderforSelectSingle() throws ODataException {
// Build JPQL ContextBuilder
- JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.SELECT_SINGLE);
+ JPQLContextBuilder contextBuilder =
+ new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.SELECT_SINGLE);
assertNotNull(contextBuilder);
assertTrue(contextBuilder instanceof JPQLSelectSingleContextBuilder);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java
index 6bc8f89..509591f 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java
index 77d2975..b7c9c7d 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java
index 18e7b41..9d2ed67 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -63,11 +63,14 @@ public class JPQLJoinSelectSingleStatementBuilderTest {
private List<JPAJoinClause> getJoinClauseList() {
List<JPAJoinClause> joinClauseList = new ArrayList<JPAJoinClause>();
- JPAJoinClause jpaOuterJoinClause = new JPAJoinClause("SOHeader", "soh", null, null, "soh.soId = 1", JPAJoinClause.JOIN.LEFT);
+ JPAJoinClause jpaOuterJoinClause =
+ new JPAJoinClause("SOHeader", "soh", null, null, "soh.soId = 1", JPAJoinClause.JOIN.LEFT);
joinClauseList.add(jpaOuterJoinClause);
- jpaOuterJoinClause = new JPAJoinClause("SOHeader", "soh", "soItem", "soi", "soi.shId = soh.soId", JPAJoinClause.JOIN.LEFT);
+ jpaOuterJoinClause =
+ new JPAJoinClause("SOHeader", "soh", "soItem", "soi", "soi.shId = soh.soId", JPAJoinClause.JOIN.LEFT);
joinClauseList.add(jpaOuterJoinClause);
- jpaOuterJoinClause = new JPAJoinClause("SOItem", "si", "material", "mat", "mat.id = 'abc'", JPAJoinClause.JOIN.LEFT);
+ jpaOuterJoinClause =
+ new JPAJoinClause("SOItem", "si", "material", "mat", "mat.id = 'abc'", JPAJoinClause.JOIN.LEFT);
joinClauseList.add(jpaOuterJoinClause);
return joinClauseList;
}
@@ -78,10 +81,14 @@ public class JPQLJoinSelectSingleStatementBuilderTest {
@Test
public void testBuild() throws Exception {
setUp(getJoinClauseList());
- JPQLJoinSelectSingleStatementBuilder jpqlJoinSelectsingleStatementBuilder = new JPQLJoinSelectSingleStatementBuilder(context);
+ JPQLJoinSelectSingleStatementBuilder jpqlJoinSelectsingleStatementBuilder =
+ new JPQLJoinSelectSingleStatementBuilder(context);
try {
JPQLStatement jpqlStatement = jpqlJoinSelectsingleStatementBuilder.build();
- assertEquals("SELECT gt1 FROM SOHeader soh JOIN soh.soItem soi JOIN soi.material mat WHERE soh.soId = 1 AND soi.shId = soh.soId AND mat.id = 'abc'", jpqlStatement.toString());
+ assertEquals(
+ "SELECT gt1 FROM SOHeader soh JOIN soh.soItem soi JOIN soi.material mat WHERE soh.soId = 1 AND " +
+ "soi.shId = soh.soId AND mat.id = 'abc'",
+ jpqlStatement.toString());
} catch (ODataJPARuntimeException e) {
fail("Should not have come here");
}
@@ -108,7 +115,8 @@ public class JPQLJoinSelectSingleStatementBuilderTest {
@Test
public void testJoinClauseAsNull() throws Exception {
setUp(null);
- JPQLJoinSelectSingleStatementBuilder jpqlJoinSelectsingleStatementBuilder = new JPQLJoinSelectSingleStatementBuilder(context);
+ JPQLJoinSelectSingleStatementBuilder jpqlJoinSelectsingleStatementBuilder =
+ new JPQLJoinSelectSingleStatementBuilder(context);
try {
jpqlJoinSelectsingleStatementBuilder.build();
fail("Should not have come here");
@@ -121,7 +129,8 @@ public class JPQLJoinSelectSingleStatementBuilderTest {
public void testJoinClauseListAsEmpty() throws Exception {
List<JPAJoinClause> joinClauseList = new ArrayList<JPAJoinClause>();
setUp(joinClauseList);
- JPQLJoinSelectSingleStatementBuilder jpqlJoinSelectsingleStatementBuilder = new JPQLJoinSelectSingleStatementBuilder(context);
+ JPQLJoinSelectSingleStatementBuilder jpqlJoinSelectsingleStatementBuilder =
+ new JPQLJoinSelectSingleStatementBuilder(context);
try {
jpqlJoinSelectsingleStatementBuilder.build();
fail("Should not have come here");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
index 95b6e59..14300bc 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -63,11 +63,14 @@ public class JPQLJoinStatementBuilderTest {
private List<JPAJoinClause> getJoinClauseList() {
List<JPAJoinClause> joinClauseList = new ArrayList<JPAJoinClause>();
- JPAJoinClause jpaOuterJoinClause = new JPAJoinClause("SOHeader", "soh", null, null, "soh.createdBy = 'Peter'", JPAJoinClause.JOIN.LEFT);
+ JPAJoinClause jpaOuterJoinClause =
+ new JPAJoinClause("SOHeader", "soh", null, null, "soh.createdBy = 'Peter'", JPAJoinClause.JOIN.LEFT);
joinClauseList.add(jpaOuterJoinClause);
- jpaOuterJoinClause = new JPAJoinClause("SOHeader", "soh", "soItem", "soi", "soi.shId = soh.soId", JPAJoinClause.JOIN.LEFT);
+ jpaOuterJoinClause =
+ new JPAJoinClause("SOHeader", "soh", "soItem", "soi", "soi.shId = soh.soId", JPAJoinClause.JOIN.LEFT);
joinClauseList.add(jpaOuterJoinClause);
- jpaOuterJoinClause = new JPAJoinClause("SOItem", "si", "material", "mat", "mat.id = 'abc'", JPAJoinClause.JOIN.LEFT);
+ jpaOuterJoinClause =
+ new JPAJoinClause("SOItem", "si", "material", "mat", "mat.id = 'abc'", JPAJoinClause.JOIN.LEFT);
joinClauseList.add(jpaOuterJoinClause);
return joinClauseList;
}
@@ -81,7 +84,10 @@ public class JPQLJoinStatementBuilderTest {
JPQLJoinStatementBuilder jpqlJoinStatementBuilder = new JPQLJoinStatementBuilder(context);
try {
JPQLStatement jpqlStatement = jpqlJoinStatementBuilder.build();
- assertEquals("SELECT mat FROM SOHeader soh JOIN soh.soItem soi JOIN soi.material mat WHERE soh.buyerId = 2 AND soh.createdBy = 'Peter' AND soi.shId = soh.soId AND mat.id = 'abc' ORDER BY mat.buyerId asc , mat.city desc", jpqlStatement.toString());
+ assertEquals(
+ "SELECT mat FROM SOHeader soh JOIN soh.soItem soi JOIN soi.material mat WHERE soh.buyerId = 2 AND " +
+ "soh.createdBy = 'Peter' AND soi.shId = soh.soId AND mat.id = 'abc' ORDER BY mat.buyerId asc , mat.city desc",
+ jpqlStatement.toString());
} catch (ODataJPARuntimeException e) {
fail("Should not have come here");
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java
index 89d2e19..817d8d3 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -66,7 +66,8 @@ public class JPQLSelectContextImplTest {
}
- private void buildSelectContext(final boolean orderByIsNull, final boolean selectFieldsIsNull, final boolean filterIsNull, final boolean isTopNull, final boolean isSkipNull) {
+ private void buildSelectContext(final boolean orderByIsNull, final boolean selectFieldsIsNull,
+ final boolean filterIsNull, final boolean isTopNull, final boolean isSkipNull) {
builder = null;
selectContext = null;
keyPredicates = new ArrayList<KeyPredicate>();
@@ -171,7 +172,8 @@ public class JPQLSelectContextImplTest {
if (filterIsNull) {
EasyMock.expect(resultsView.getFilter()).andStubReturn(null);
} else {
- EasyMock.expect(resultsView.getFilter()).andStubReturn(getFilterExpressionMockedObj(ExpressionKind.PROPERTY, "SalesOrder"));
+ EasyMock.expect(resultsView.getFilter()).andStubReturn(
+ getFilterExpressionMockedObj(ExpressionKind.PROPERTY, "SalesOrder"));
}
if (isTopNull) {
EasyMock.expect(resultsView.getTop()).andStubReturn(null);
@@ -238,7 +240,8 @@ public class JPQLSelectContextImplTest {
EasyMock.expect(resultsView.getFilter()).andStubReturn(null);
EasyMock.replay(resultsView);
try {
- JPQLSelectContextBuilder builder1 = (JPQLSelectContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT, resultsView);
+ JPQLSelectContextBuilder builder1 =
+ (JPQLSelectContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT, resultsView);
builder1.build();
fail("Should not come here");
@@ -301,7 +304,8 @@ public class JPQLSelectContextImplTest {
public void testEntitySetAsNull() {
buildSelectContext(false, false, true, true, true);
try {
- JPQLSelectContextBuilder builder = (JPQLSelectContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT, null);
+ JPQLSelectContextBuilder builder =
+ (JPQLSelectContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT, null);
JPQLSelectContext selectContext1 = (JPQLSelectContext) builder.build();
assertNull(selectContext1.getJPAEntityAlias());
@@ -350,10 +354,12 @@ public class JPQLSelectContextImplTest {
}
- private FilterExpression getFilterExpressionMockedObj(final ExpressionKind leftOperandExpKind, final String propertyName) throws EdmException {
+ private FilterExpression getFilterExpressionMockedObj(final ExpressionKind leftOperandExpKind,
+ final String propertyName) throws EdmException {
FilterExpression filterExpression = EasyMock.createMock(FilterExpression.class);
EasyMock.expect(filterExpression.getKind()).andStubReturn(ExpressionKind.FILTER);
- EasyMock.expect(filterExpression.getExpression()).andStubReturn(getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
+ EasyMock.expect(filterExpression.getExpression()).andStubReturn(
+ getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
EasyMock.replay(filterExpression);
return filterExpression;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java
index d74ef5b..841ff5a 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -146,7 +146,8 @@ public class JPQLSelectSingleContextImplTest {
EasyMock.expect(resultsView.getFilter()).andStubReturn(null);
EasyMock.replay(resultsView);
try {
- JPQLSelectSingleContextBuilder builder1 = (JPQLSelectSingleContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, resultsView);
+ JPQLSelectSingleContextBuilder builder1 =
+ (JPQLSelectSingleContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, resultsView);
builder1.build();
fail("Should not come here");
} catch (ODataJPAModelException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java
index b10f740..c5d5f95 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -55,7 +55,7 @@ public class JPQLSelectSingleStatementBuilderTest {
}
private JPQLSelectSingleContext createSelectContext() throws ODataJPARuntimeException, EdmException {
- //Object Instantiation
+ // Object Instantiation
JPQLSelectSingleContext JPQLSelectSingleContextImpl = null;// new JPQLSelectSingleContextImpl();
GetEntityUriInfo getEntityView = EasyMock.createMock(GetEntityUriInfo.class);
@@ -64,7 +64,7 @@ public class JPQLSelectSingleStatementBuilderTest {
EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
List<SelectItem> selectItemList = null;
- //Setting up the expected value
+ // Setting up the expected value
KeyPredicate keyPredicate = EasyMock.createMock(KeyPredicate.class);
EdmProperty kpProperty = EasyMock.createMock(EdmProperty.class);
EdmSimpleType edmType = EasyMock.createMock(EdmSimpleType.class);
@@ -106,17 +106,18 @@ public class JPQLSelectSingleStatementBuilderTest {
}
/**
- * Test method for {@link org.apache.olingo.odata2.processor.jpa.jpql.JPQLSelectSingleStatementBuilder#build)}.
- * @throws EdmException
- * @throws ODataJPARuntimeException
- */
+ * Test method for {@link org.apache.olingo.odata2.processor.jpa.jpql.JPQLSelectSingleStatementBuilder#build)}.
+ * @throws EdmException
+ * @throws ODataJPARuntimeException
+ */
@Test
public void testBuildSimpleQuery() throws EdmException, ODataJPARuntimeException {
JPQLSelectSingleContext JPQLSelectSingleContextImpl = createSelectContext();
JPQLSelectSingleStatementBuilder = new JPQLSelectSingleStatementBuilder(JPQLSelectSingleContextImpl);
- assertEquals("SELECT E1 FROM SalesOrderHeader E1 WHERE E1.Field1 = 1", JPQLSelectSingleStatementBuilder.build().toString());
+ assertEquals("SELECT E1 FROM SalesOrderHeader E1 WHERE E1.Field1 = 1", JPQLSelectSingleStatementBuilder.build()
+ .toString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java
index 30b7c65..2434809 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
/**
*
@@ -55,8 +55,9 @@ public class JPQLSelectStatementBuilderTest {
}
- private JPQLSelectContext createSelectContext(final OrderByExpression orderByExpression, final FilterExpression filterExpression) throws ODataJPARuntimeException, EdmException {
- //Object Instantiation
+ private JPQLSelectContext createSelectContext(final OrderByExpression orderByExpression,
+ final FilterExpression filterExpression) throws ODataJPARuntimeException, EdmException {
+ // Object Instantiation
JPQLSelectContext jpqlSelectContextImpl = null;
GetEntitySetUriInfo getEntitySetView = EasyMock.createMock(GetEntitySetUriInfo.class);
@@ -65,7 +66,7 @@ public class JPQLSelectStatementBuilderTest {
EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
List<SelectItem> selectItemList = null;
- //Setting up the expected value
+ // Setting up the expected value
EasyMock.expect(getEntitySetView.getTargetEntitySet()).andStubReturn(edmEntitySet);
EasyMock.expect(getEntitySetView.getOrderBy()).andStubReturn(orderByExpression);
@@ -90,8 +91,8 @@ public class JPQLSelectStatementBuilderTest {
/**
* Test method for {@link org.apache.olingo.odata2.processor.jpa.jpql.JPQLSelectStatementBuilder#build)}.
- * @throws EdmException
- * @throws ODataJPARuntimeException
+ * @throws EdmException
+ * @throws ODataJPARuntimeException
*/
@Test
@@ -114,19 +115,21 @@ public class JPQLSelectStatementBuilderTest {
jpqlSelectContextImpl.setOrderByCollection(orderByCollection);
jpqlSelectStatementBuilder = new JPQLSelectStatementBuilder(jpqlSelectContextImpl);
- assertEquals("SELECT E1 FROM SalesOrderHeader E1 ORDER BY E1.soID ASC , E1.buyerId DESC", jpqlSelectStatementBuilder.build().toString());
+ assertEquals("SELECT E1 FROM SalesOrderHeader E1 ORDER BY E1.soID ASC , E1.buyerId DESC",
+ jpqlSelectStatementBuilder.build().toString());
}
@Test
public void testBuildQueryWithFilter() throws EdmException, ODataJPARuntimeException {
OrderByExpression orderByExpression = EasyMock.createMock(OrderByExpression.class);
- FilterExpression filterExpression = null;//getFilterExpressionMockedObj();
+ FilterExpression filterExpression = null;// getFilterExpressionMockedObj();
JPQLSelectContext jpqlSelectContextImpl = createSelectContext(orderByExpression, filterExpression);
jpqlSelectContextImpl.setWhereExpression("E1.soID >= 1234");
jpqlSelectStatementBuilder = new JPQLSelectStatementBuilder(jpqlSelectContextImpl);
- assertEquals("SELECT E1 FROM SalesOrderHeader E1 WHERE E1.soID >= 1234", jpqlSelectStatementBuilder.build().toString());
+ assertEquals("SELECT E1 FROM SalesOrderHeader E1 WHERE E1.soID >= 1234", jpqlSelectStatementBuilder.build()
+ .toString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java
index cbb946a..891aace 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtil.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtil.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtil.java
index 05b4ef3..57866e3 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtil.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtil.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.data;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtilV2.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtilV2.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtilV2.java
index b08565a..d20f8e9 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtilV2.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/EdmMockUtilV2.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.data;
@@ -49,7 +49,8 @@ public class EdmMockUtilV2 {
}
- public static EdmEntityType mockEdmEntityType(final String entityName, final boolean withComplexType) throws EdmException {
+ public static EdmEntityType mockEdmEntityType(final String entityName, final boolean withComplexType)
+ throws EdmException {
EdmEntityType entityType = EasyMock.createMock(EdmEntityType.class);
EasyMock.expect(entityType.getName()).andReturn(entityName).anyTimes();
@@ -64,17 +65,25 @@ public class EdmMockUtilV2 {
EasyMock.expect(entityType.getKind()).andReturn(EdmTypeKind.ENTITY);
EasyMock.expect(entityType.getMapping()).andReturn((EdmMapping) mockEdmMapping(entityName, null, null));
if (entityName.equals(JPATypeMock.ENTITY_NAME)) {
- EasyMock.expect(entityType.getProperty(JPATypeMock.PROPERTY_NAME_MINT)).andReturn(mockEdmProperty(entityName, JPATypeMock.PROPERTY_NAME_MINT)).anyTimes();
- EasyMock.expect(entityType.getProperty(JPATypeMock.PROPERTY_NAME_MSTRING)).andReturn(mockEdmProperty(entityName, JPATypeMock.PROPERTY_NAME_MSTRING)).anyTimes();
- EasyMock.expect(entityType.getProperty(JPATypeMock.PROPERTY_NAME_MDATETIME)).andReturn(mockEdmProperty(entityName, JPATypeMock.PROPERTY_NAME_MDATETIME)).anyTimes();
- EasyMock.expect(entityType.getProperty(JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE)).andReturn(mockEdmProperty(entityName, JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE)).anyTimes();
- EasyMock.expect(entityType.getProperty(JPATypeMock.NAVIGATION_PROPERTY_X)).andReturn(mockEdmNavigationProperty(JPATypeMock.NAVIGATION_PROPERTY_X, EdmMultiplicity.ONE)).anyTimes();
- }
- else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
- EasyMock.expect(entityType.getProperty(JPARelatedTypeMock.PROPERTY_NAME_MLONG)).andReturn(mockEdmProperty(entityName, JPARelatedTypeMock.PROPERTY_NAME_MLONG)).anyTimes();
- EasyMock.expect(entityType.getProperty(JPARelatedTypeMock.PROPERTY_NAME_MBYTE)).andReturn(mockEdmProperty(entityName, JPARelatedTypeMock.PROPERTY_NAME_MBYTE)).anyTimes();
- EasyMock.expect(entityType.getProperty(JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY)).andReturn(mockEdmProperty(entityName, JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY)).anyTimes();
- EasyMock.expect(entityType.getProperty(JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE)).andReturn(mockEdmProperty(entityName, JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE)).anyTimes();
+ EasyMock.expect(entityType.getProperty(JPATypeMock.PROPERTY_NAME_MINT)).andReturn(
+ mockEdmProperty(entityName, JPATypeMock.PROPERTY_NAME_MINT)).anyTimes();
+ EasyMock.expect(entityType.getProperty(JPATypeMock.PROPERTY_NAME_MSTRING)).andReturn(
+ mockEdmProperty(entityName, JPATypeMock.PROPERTY_NAME_MSTRING)).anyTimes();
+ EasyMock.expect(entityType.getProperty(JPATypeMock.PROPERTY_NAME_MDATETIME)).andReturn(
+ mockEdmProperty(entityName, JPATypeMock.PROPERTY_NAME_MDATETIME)).anyTimes();
+ EasyMock.expect(entityType.getProperty(JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE)).andReturn(
+ mockEdmProperty(entityName, JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE)).anyTimes();
+ EasyMock.expect(entityType.getProperty(JPATypeMock.NAVIGATION_PROPERTY_X)).andReturn(
+ mockEdmNavigationProperty(JPATypeMock.NAVIGATION_PROPERTY_X, EdmMultiplicity.ONE)).anyTimes();
+ } else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
+ EasyMock.expect(entityType.getProperty(JPARelatedTypeMock.PROPERTY_NAME_MLONG)).andReturn(
+ mockEdmProperty(entityName, JPARelatedTypeMock.PROPERTY_NAME_MLONG)).anyTimes();
+ EasyMock.expect(entityType.getProperty(JPARelatedTypeMock.PROPERTY_NAME_MBYTE)).andReturn(
+ mockEdmProperty(entityName, JPARelatedTypeMock.PROPERTY_NAME_MBYTE)).anyTimes();
+ EasyMock.expect(entityType.getProperty(JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY)).andReturn(
+ mockEdmProperty(entityName, JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY)).anyTimes();
+ EasyMock.expect(entityType.getProperty(JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE)).andReturn(
+ mockEdmProperty(entityName, JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE)).anyTimes();
}
EasyMock.replay(entityType);
return entityType;
@@ -91,8 +100,7 @@ public class EdmMockUtilV2 {
List<String> keyPropertyNames = new ArrayList<String>();
if (entityName.equals(JPATypeMock.ENTITY_NAME)) {
keyPropertyNames.add(JPATypeMock.PROPERTY_NAME_MINT);
- }
- else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
+ } else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
keyPropertyNames.add(JPARelatedTypeMock.PROPERTY_NAME_MLONG);
}
@@ -106,18 +114,15 @@ public class EdmMockUtilV2 {
propertyNames.add(JPATypeMock.PROPERTY_NAME_MINT);
propertyNames.add(JPATypeMock.PROPERTY_NAME_MDATETIME);
propertyNames.add(JPATypeMock.PROPERTY_NAME_MSTRING);
- }
- else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
+ } else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
propertyNames.add(JPARelatedTypeMock.PROPERTY_NAME_MLONG);
propertyNames.add(JPARelatedTypeMock.PROPERTY_NAME_MBYTE);
propertyNames.add(JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY);
propertyNames.add(JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE);
- }
- else if (entityName.equals(JPATypeEmbeddableMock.ENTITY_NAME)) {
+ } else if (entityName.equals(JPATypeEmbeddableMock.ENTITY_NAME)) {
propertyNames.add(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT);
propertyNames.add(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE);
- }
- else if (entityName.equals(JPATypeEmbeddableMock2.ENTITY_NAME)) {
+ } else if (entityName.equals(JPATypeEmbeddableMock2.ENTITY_NAME)) {
propertyNames.add(JPATypeMock.JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT);
propertyNames.add(JPATypeMock.JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID);
}
@@ -133,7 +138,8 @@ public class EdmMockUtilV2 {
}
- public static EdmAssociationEnd mockEdmAssociatioEnd(final String navigationPropertyName, final String role) throws EdmException {
+ public static EdmAssociationEnd mockEdmAssociatioEnd(final String navigationPropertyName, final String role)
+ throws EdmException {
EdmAssociationEnd associationEnd = EasyMock.createMock(EdmAssociationEnd.class);
EasyMock.expect(associationEnd.getMultiplicity()).andReturn(EdmMultiplicity.ONE);
EdmEntityType entityType = EasyMock.createMock(EdmEntityType.class);
@@ -153,14 +159,15 @@ public class EdmMockUtilV2 {
return edmAssociation;
}
- public static EdmEntitySet mockEdmEntitySet(final String entityName, final boolean withComplexType) throws EdmException {
+ public static EdmEntitySet mockEdmEntitySet(final String entityName, final boolean withComplexType)
+ throws EdmException {
EdmEntitySet entitySet = null;
if (entityName.equals(JPATypeMock.ENTITY_NAME)) {
entitySet = EasyMock.createMock(EdmEntitySet.class);
EasyMock.expect(entitySet.getEntityType()).andReturn(mockEdmEntityType(entityName, withComplexType)).anyTimes();
- EasyMock.expect(entitySet.getRelatedEntitySet(EasyMock.isA(EdmNavigationProperty.class))).andReturn(mockEdmEntitySet(JPARelatedTypeMock.ENTITY_NAME, false)).anyTimes();
- }
- else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
+ EasyMock.expect(entitySet.getRelatedEntitySet(EasyMock.isA(EdmNavigationProperty.class))).andReturn(
+ mockEdmEntitySet(JPARelatedTypeMock.ENTITY_NAME, false)).anyTimes();
+ } else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
entitySet = EasyMock.createMock(EdmEntitySet.class);
EasyMock.expect(entitySet.getEntityType()).andReturn(mockEdmEntityType(entityName, withComplexType)).anyTimes();
}
@@ -169,14 +176,16 @@ public class EdmMockUtilV2 {
return entitySet;
}
- public static EdmNavigationProperty mockEdmNavigationProperty(final String navigationPropertyName, final EdmMultiplicity multiplicity) throws EdmException {
+ public static EdmNavigationProperty mockEdmNavigationProperty(final String navigationPropertyName,
+ final EdmMultiplicity multiplicity) throws EdmException {
EdmEntityType edmEntityType = mockEdmEntityType(JPARelatedTypeMock.ENTITY_NAME, false);
EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
EasyMock.expect(navigationProperty.getType()).andReturn(edmEntityType).anyTimes();
EasyMock.expect(navigationProperty.getMultiplicity()).andReturn(multiplicity);
- EasyMock.expect(navigationProperty.getMapping()).andReturn((EdmMapping) mockEdmMapping(null, null, navigationPropertyName));
+ EasyMock.expect(navigationProperty.getMapping()).andReturn(
+ (EdmMapping) mockEdmMapping(null, null, navigationPropertyName));
EasyMock.expect(navigationProperty.getToRole()).andReturn("TO");
EasyMock.expect(navigationProperty.getRelationship()).andReturn(mockEdmAssociation(navigationPropertyName));
if (multiplicity.equals(EdmMultiplicity.ONE)) {
@@ -207,16 +216,17 @@ public class EdmMockUtilV2 {
EasyMock.expect(edmType.getKind()).andReturn(EdmTypeKind.SIMPLE).anyTimes();
EasyMock.replay(edmType);
EasyMock.expect(edmProperty.getName()).andReturn(propertyName).anyTimes();
- EasyMock.expect(edmProperty.getMapping()).andReturn((EdmMapping) mockEdmMapping(entityName, propertyName, null)).anyTimes();
+ EasyMock.expect(edmProperty.getMapping()).andReturn((EdmMapping) mockEdmMapping(entityName, propertyName, null))
+ .anyTimes();
- }
- else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE) ||
+ } else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE) ||
propertyName.equals(JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE)) {
EdmComplexType complexType = mockComplexType(propertyName);
EasyMock.expect(edmProperty.getType()).andReturn(complexType).anyTimes();
EasyMock.expect(edmProperty.getName()).andReturn(propertyName).anyTimes();
- EasyMock.expect(edmProperty.getMapping()).andReturn((EdmMapping) mockEdmMapping(null, propertyName, null)).anyTimes();
+ EasyMock.expect(edmProperty.getMapping()).andReturn((EdmMapping) mockEdmMapping(null, propertyName, null))
+ .anyTimes();
}
@@ -239,19 +249,23 @@ public class EdmMockUtilV2 {
EasyMock.expect(edmComplexType.getMapping()).andReturn((EdmMapping) mockEdmMapping(complexTypeName, null, null));
if (complexTypeName.equals(JPATypeEmbeddableMock.ENTITY_NAME)) {
- EasyMock.expect(edmComplexType.getProperty(JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT)).andReturn(mockEdmProperty(complexTypeName, JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT)).anyTimes();
- EasyMock.expect(edmComplexType.getProperty(JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE)).andReturn(mockEdmProperty(complexTypeName, JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE)).anyTimes();
- }
- else if (complexTypeName.equals(JPATypeEmbeddableMock2.ENTITY_NAME)) {
- EasyMock.expect(edmComplexType.getProperty(JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT)).andReturn(mockEdmProperty(complexTypeName, JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT)).anyTimes();
- EasyMock.expect(edmComplexType.getProperty(JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID)).andReturn(mockEdmProperty(complexTypeName, JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID)).anyTimes();
+ EasyMock.expect(edmComplexType.getProperty(JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT)).andReturn(
+ mockEdmProperty(complexTypeName, JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT)).anyTimes();
+ EasyMock.expect(edmComplexType.getProperty(JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE)).andReturn(
+ mockEdmProperty(complexTypeName, JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE)).anyTimes();
+ } else if (complexTypeName.equals(JPATypeEmbeddableMock2.ENTITY_NAME)) {
+ EasyMock.expect(edmComplexType.getProperty(JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT)).andReturn(
+ mockEdmProperty(complexTypeName, JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT)).anyTimes();
+ EasyMock.expect(edmComplexType.getProperty(JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID)).andReturn(
+ mockEdmProperty(complexTypeName, JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID)).anyTimes();
}
EasyMock.replay(edmComplexType);
return edmComplexType;
}
- public static JPAEdmMapping mockEdmMapping(final String entityName, final String propertyName, final String navigationPropertyName) {
+ public static JPAEdmMapping mockEdmMapping(final String entityName, final String propertyName,
+ final String navigationPropertyName) {
JPAEdmMapping mapping = new JPAEdmMappingImpl();
if (propertyName == null && entityName != null) {
@@ -264,56 +278,43 @@ public class EdmMockUtilV2 {
} else if (entityName.equals(JPATypeEmbeddableMock2.ENTITY_NAME)) {
mapping.setJPAType(JPATypeEmbeddableMock2.class);
}
- }
- else if (entityName == null && navigationPropertyName != null) {
+ } else if (entityName == null && navigationPropertyName != null) {
mapping.setJPAType(JPARelatedTypeMock.class);
mapping.setJPAColumnName(JPATypeMock.NAVIGATION_PROPERTY_X);
- }
- else if (propertyName.equals(JPATypeMock.PROPERTY_NAME_MINT)) {
+ } else if (propertyName.equals(JPATypeMock.PROPERTY_NAME_MINT)) {
mapping.setJPAType(int.class);
((Mapping) mapping).setInternalName(JPATypeMock.PROPERTY_NAME_MINT);
- }
- else if (propertyName.equals(JPATypeMock.PROPERTY_NAME_MSTRING)) {
+ } else if (propertyName.equals(JPATypeMock.PROPERTY_NAME_MSTRING)) {
mapping.setJPAType(String.class);
((Mapping) mapping).setInternalName(JPATypeMock.PROPERTY_NAME_MSTRING);
- }
- else if (propertyName.equals(JPATypeMock.PROPERTY_NAME_MDATETIME)) {
+ } else if (propertyName.equals(JPATypeMock.PROPERTY_NAME_MDATETIME)) {
mapping.setJPAType(Calendar.class);
((Mapping) mapping).setInternalName(JPATypeMock.PROPERTY_NAME_MDATETIME);
- }
- else if (propertyName.equals(JPARelatedTypeMock.PROPERTY_NAME_MLONG)) {
+ } else if (propertyName.equals(JPARelatedTypeMock.PROPERTY_NAME_MLONG)) {
mapping.setJPAType(long.class);
((Mapping) mapping).setInternalName(JPARelatedTypeMock.PROPERTY_NAME_MLONG);
- }
- else if (propertyName.equals(JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE)) {
+ } else if (propertyName.equals(JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE)) {
mapping.setJPAType(double.class);
((Mapping) mapping).setInternalName(JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE);
- }
- else if (propertyName.equals(JPARelatedTypeMock.PROPERTY_NAME_MBYTE)) {
+ } else if (propertyName.equals(JPARelatedTypeMock.PROPERTY_NAME_MBYTE)) {
mapping.setJPAType(byte.class);
((Mapping) mapping).setInternalName(JPARelatedTypeMock.PROPERTY_NAME_MBYTE);
- }
- else if (propertyName.equals(JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY)) {
+ } else if (propertyName.equals(JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY)) {
mapping.setJPAType(byte[].class);
((Mapping) mapping).setInternalName(JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY);
- }
- else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT)) {
+ } else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT)) {
mapping.setJPAType(Short.TYPE);
((Mapping) mapping).setInternalName(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT);
- }
- else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT)) {
+ } else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT)) {
mapping.setJPAType(Float.TYPE);
((Mapping) mapping).setInternalName(JPATypeMock.JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT);
- }
- else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID)) {
+ } else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID)) {
mapping.setJPAType(UUID.class);
((Mapping) mapping).setInternalName(JPATypeMock.JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID);
- }
- else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE)) {
+ } else if (propertyName.equals(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE)) {
mapping.setJPAType(JPATypeEmbeddableMock2.class);
((Mapping) mapping).setInternalName(JPATypeMock.JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE);
- }
- else if (propertyName.equals(JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE)) {
+ } else if (propertyName.equals(JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE)) {
mapping.setJPAType(JPATypeEmbeddableMock.class);
((Mapping) mapping).setInternalName(JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/JPATypeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/JPATypeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/JPATypeMock.java
index fff07d7..1360b6d 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/JPATypeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/JPATypeMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.data;
@@ -22,7 +22,7 @@ import java.util.Calendar;
import java.util.List;
import java.util.UUID;
-/*========================================================================= */
+/* ========================================================================= */
public class JPATypeMock {
public static final String ENTITY_NAME = "JPATypeMock";
@@ -99,7 +99,7 @@ public class JPATypeMock {
this.complexType = complexType;
}
- /*========================================================================= */
+ /* ========================================================================= */
public static class JPATypeEmbeddableMock {
public static final String ENTITY_NAME = "JPATypeEmbeddableMock";
@@ -127,7 +127,7 @@ public class JPATypeMock {
}
- /*========================================================================= */
+ /* ========================================================================= */
public static class JPATypeEmbeddableMock2 {
public static final String ENTITY_NAME = "JPATypeEmbeddableMock2";
@@ -155,7 +155,7 @@ public class JPATypeMock {
}
- /*========================================================================= */
+ /* ========================================================================= */
public static final class JPARelatedTypeMock {
public static final String ENTITY_NAME = "JPARelatedTypeMock";
public static final String PROPERTY_NAME_MLONG = "mLong";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/ODataEntryMockUtil.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/ODataEntryMockUtil.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/ODataEntryMockUtil.java
index ecbf315..609017b 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/ODataEntryMockUtil.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/ODataEntryMockUtil.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.data;
@@ -57,7 +57,8 @@ public class ODataEntryMockUtil {
public static ODataEntry mockODataEntryWithComplexType(final String entityName) {
ODataEntry oDataEntry = EasyMock.createMock(ODataEntry.class);
- EasyMock.expect(oDataEntry.getProperties()).andReturn(mockODataEntryPropertiesWithComplexType(entityName)).anyTimes();
+ EasyMock.expect(oDataEntry.getProperties()).andReturn(mockODataEntryPropertiesWithComplexType(entityName))
+ .anyTimes();
EasyMock.expect(oDataEntry.containsInlineEntry()).andReturn(false);
EasyMock.replay(oDataEntry);
@@ -75,18 +76,16 @@ public class ODataEntryMockUtil {
propertyMap.put(JPATypeMock.PROPERTY_NAME_MDATETIME, VALUE_DATE_TIME);
propertyMap.put(JPATypeMock.PROPERTY_NAME_MSTRING, VALUE_MSTRING);
- }
- else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
+ } else if (entityName.equals(JPARelatedTypeMock.ENTITY_NAME)) {
propertyMap.put(JPARelatedTypeMock.PROPERTY_NAME_MLONG, VALUE_MLONG);
propertyMap.put(JPARelatedTypeMock.PROPERTY_NAME_MDOUBLE, VALUE_MDOUBLE);
propertyMap.put(JPARelatedTypeMock.PROPERTY_NAME_MBYTE, VALUE_MBYTE);
propertyMap.put(JPARelatedTypeMock.PROPERTY_NAME_MBYTEARRAY, VALUE_MBYTEARRAY);
- }
- else if (entityName.equals(JPATypeEmbeddableMock.ENTITY_NAME)) {
+ } else if (entityName.equals(JPATypeEmbeddableMock.ENTITY_NAME)) {
propertyMap.put(JPATypeEmbeddableMock.PROPERTY_NAME_MSHORT, VALUE_SHORT);
- propertyMap.put(JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE, mockODataEntryProperties(JPATypeEmbeddableMock2.ENTITY_NAME));
- }
- else if (entityName.equals(JPATypeEmbeddableMock2.ENTITY_NAME)) {
+ propertyMap.put(JPATypeEmbeddableMock.PROPERTY_NAME_MEMBEDDABLE,
+ mockODataEntryProperties(JPATypeEmbeddableMock2.ENTITY_NAME));
+ } else if (entityName.equals(JPATypeEmbeddableMock2.ENTITY_NAME)) {
propertyMap.put(JPATypeEmbeddableMock2.PROPERTY_NAME_MFLOAT, VALUE_MFLOAT);
propertyMap.put(JPATypeEmbeddableMock2.PROPERTY_NAME_MUUID, VALUE_UUID);
}
@@ -96,7 +95,8 @@ public class ODataEntryMockUtil {
public static Map<String, Object> mockODataEntryPropertiesWithComplexType(final String entityName) {
Map<String, Object> propertyMap = mockODataEntryProperties(entityName);
- propertyMap.put(JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE, mockODataEntryProperties(JPATypeEmbeddableMock.ENTITY_NAME));
+ propertyMap
+ .put(JPATypeMock.PROPERTY_NAME_MCOMPLEXTYPE, mockODataEntryProperties(JPATypeEmbeddableMock.ENTITY_NAME));
return propertyMap;
}
[06/59] [abbrv] Clean up of odata api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
index cb876aa..c37a8bc 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -40,32 +40,32 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
import org.apache.olingo.odata2.api.servicedocument.ServiceDocument;
/**
- * <p>Entity Provider</p>
+ * <p>Entity Provider</p>
* <p>An {@link EntityProvider} provides all necessary <b>read</b> and <b>write</b>
* methods for accessing the entities defined in an <code>Entity Data Model</code>.
* Therefore this library provides (in its <code>core</code> packages) as convenience
* basic entity providers for accessing entities in the <b>XML</b> and <b>JSON</b>
* formats.</p>
- *
+ *
*/
public final class EntityProvider {
/**
- * (Internal) interface for all {@link EntityProvider} necessary <b>read</b> and <b>write</b> methods for accessing
+ * (Internal) interface for all {@link EntityProvider} necessary <b>read</b> and <b>write</b> methods for accessing
* entities defined in an <code>Entity Data Model</code>.
* <p>
* This interface is declared as inner interface (class) because the {@link EntityProvider} provides a convenience
* access (and basic implementation for <b>XML</b> and <b>JSON</b> format) to all interface methods.
* <br/>
- * Hence, it is <b>not recommended</b> to implement this interface (it is possible to implement it and to provide an
+ * Hence, it is <b>not recommended</b> to implement this interface (it is possible to implement it and to provide an
* own {@link EntityProvider} for support of additional formats but it is recommended to
* handle additional formats directly within an <code>ODataProcessor</code>).
*/
public interface EntityProviderInterface {
/**
- * Write metadata document in XML format for the given schemas and the provided predefined
- * namespaces at the EDMX element. PredefinedNamespaces is of type
+ * Write metadata document in XML format for the given schemas and the provided predefined
+ * namespaces at the EDMX element. PredefinedNamespaces is of type
* Map{@literal <}prefix,namespace{@literal >} and may be null or an empty Map.
*
* @param schemas all XML schemas which will be written
@@ -73,7 +73,8 @@ public final class EntityProvider {
* @return resulting {@link ODataResponse} with written metadata content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- ODataResponse writeMetadata(List<Schema> schemas, Map<String, String> predefinedNamespaces) throws EntityProviderException;
+ ODataResponse writeMetadata(List<Schema> schemas, Map<String, String> predefinedNamespaces)
+ throws EntityProviderException;
/**
* Write service document based on given {@link Edm} and <code>service root</code> as
@@ -117,39 +118,45 @@ public final class EntityProvider {
ODataResponse writeBinary(String mimeType, byte[] data) throws EntityProviderException;
/**
- * Write given <code>data</code> (which is given in form of a {@link List} with a {@link Map} for each entity. Such a {@link Map}
- * contains all properties [as <code>property name</code> to <code>property value</code> mapping] for the entry) in the specified
- * format (given as <code>contentType</code>) based on given <code>entity data model for an entity set</code> (given as {@link EdmEntitySet})
+ * Write given <code>data</code> (which is given in form of a {@link List} with a {@link Map} for each entity. Such
+ * a {@link Map} contains all properties [as <code>property name</code> to <code>property value</code> mapping] for
+ * the entry) in the specified
+ * format (given as <code>contentType</code>) based on given <code>entity data model for an entity set</code> (given
+ * as {@link EdmEntitySet})
* and <code>properties</code> for this entity provider (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the feed should be written
* @param entitySet entity data model for given entity data set
* @param data set of entries in form of a {@link List} with a {@link Map} for each entity (such a {@link Map}
- * contains all properties [as <code>property name</code> to <code>property value</code> mapping).
- * @param properties additional properties necessary for writing of data
+ * contains all properties [as <code>property name</code> to <code>property value</code> mapping).
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written feed content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- ODataResponse writeFeed(String contentType, EdmEntitySet entitySet, List<Map<String, Object>> data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeFeed(String contentType, EdmEntitySet entitySet, List<Map<String, Object>> data,
+ EntityProviderWriteProperties properties) throws EntityProviderException;
/**
- * Write given <code>data</code> (which is given in form of a {@link Map} for which contains all properties
+ * Write given <code>data</code> (which is given in form of a {@link Map} for which contains all properties
* as <code>property name</code> to <code>property value</code> mapping) for the entry in the specified
- * format (given as <code>contentType</code>) based on <code>entity data model for an entity set</code> (given as {@link EdmEntitySet})
+ * format (given as <code>contentType</code>) based on <code>entity data model for an entity set</code> (given as
+ * {@link EdmEntitySet})
* and <code>properties</code> for this entity provider (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the entry should be written
* @param entitySet entity data model for given entity data set
- * @param data which contains all properties as <code>property name</code> to <code>property value</code> mapping for the entry
- * @param properties additional properties necessary for writing of data
+ * @param data which contains all properties as <code>property name</code> to <code>property value</code> mapping
+ * for the entry
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written entry content
* @throws EntityProviderException if writing of data (serialization) fails
*/
- ODataResponse writeEntry(String contentType, EdmEntitySet entitySet, Map<String, Object> data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeEntry(String contentType, EdmEntitySet entitySet, Map<String, Object> data,
+ EntityProviderWriteProperties properties) throws EntityProviderException;
/**
* Write given <code>value</code> (which is given in form of an {@link Object}) for the property in the specified
- * format (given as <code>contentType</code>) based on given <code>entity data model for an entity property</code>
+ * format (given as <code>contentType</code>) based on given <code>entity data model for an entity property</code>
* (given as {@link EdmProperty}).
*
* @param contentType format in which the property should be written
@@ -158,59 +165,71 @@ public final class EntityProvider {
* @return resulting {@link ODataResponse} with written property content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- ODataResponse writeProperty(String contentType, EdmProperty edmProperty, Object value) throws EntityProviderException;
+ ODataResponse writeProperty(String contentType, EdmProperty edmProperty, Object value)
+ throws EntityProviderException;
/**
- * Write <b>link</b> for key property based on <code>entity data model for an entity set</code> (given as {@link EdmEntitySet})
+ * Write <b>link</b> for key property based on <code>entity data model for an entity set</code> (given as
+ * {@link EdmEntitySet})
* in the specified format (given as <code>contentType</code>).
- * The necessary key property values must be provided within the <code>data</code> (in the form of <code>property name</code>
+ * The necessary key property values must be provided within the <code>data</code> (in the form of <code>property
+ * name</code>
* to <code>property value</code> mapping) and <code>properties</code> for this entity provider must be set
* (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the entry should be written
* @param entitySet entity data model for given entity data set
- * @param data which contains all key properties as <code>property name</code> to <code>property value</code> mapping for the entry
- * @param properties additional properties necessary for writing of data
+ * @param data which contains all key properties as <code>property name</code> to <code>property value</code>
+ * mapping for the entry
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written link content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- ODataResponse writeLink(String contentType, EdmEntitySet entitySet, Map<String, Object> data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeLink(String contentType, EdmEntitySet entitySet, Map<String, Object> data,
+ EntityProviderWriteProperties properties) throws EntityProviderException;
/**
- * Write all <b>links</b> for key property based on <code>entity data model for an entity set</code> (given as {@link EdmEntitySet})
+ * Write all <b>links</b> for key property based on <code>entity data model for an entity set</code> (given as
+ * {@link EdmEntitySet})
* in the specified format (given as <code>contentType</code>) for a set of entries.
- * The necessary key property values must be provided within the <code>data</code> (in form of a {@link List} with a {@link Map}
- * for each entry. Such a {@link Map} contains all key properties [as <code>property name</code> to
- * <code>property value</code> mapping] for the entry) and <code>properties</code> for this entity provider must be set
+ * The necessary key property values must be provided within the <code>data</code> (in form of a {@link List} with a
+ * {@link Map} for each entry. Such a {@link Map} contains all key properties [as <code>property name</code> to
+ * <code>property value</code> mapping] for the entry) and <code>properties</code> for this entity provider must be
+ * set
* (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the entry should be written
* @param entitySet entity data model for given entity data set
* @param data set of entries in form of a {@link List} with a {@link Map} for each entry (such a {@link Map}
- * contains all key properties [as <code>property name</code> to <code>property value</code> mapping).
- * @param properties additional properties necessary for writing of data
+ * contains all key properties [as <code>property name</code> to <code>property value</code> mapping).
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written links content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- ODataResponse writeLinks(String contentType, EdmEntitySet entitySet, List<Map<String, Object>> data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeLinks(String contentType, EdmEntitySet entitySet, List<Map<String, Object>> data,
+ EntityProviderWriteProperties properties) throws EntityProviderException;
/**
- * Write <code>data</code> result (given as {@link Object}) of function import based on <code>return type</code>
- * of {@link EdmFunctionImport} in specified format (given as <code>contentType</code>). Additional <code>properties</code>
+ * Write <code>data</code> result (given as {@link Object}) of function import based on <code>return type</code>
+ * of {@link EdmFunctionImport} in specified format (given as <code>contentType</code>). Additional
+ * <code>properties</code>
* for this entity provider must be set (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the entry should be written
* @param functionImport entity data model for executed function import
* @param data result of function import
- * @param properties additional properties necessary for writing of data
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written function import result content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- ODataResponse writeFunctionImport(String contentType, EdmFunctionImport functionImport, Object data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeFunctionImport(String contentType, EdmFunctionImport functionImport, Object data,
+ EntityProviderWriteProperties properties) throws EntityProviderException;
/**
- * Read (de-serialize) a data feed from <code>content</code> (as {@link InputStream}) in specified format (given as <code>contentType</code>)
- * based on <code>entity data model</code> (given as {@link EdmEntitySet}) and provide this data as {@link ODataEntry}.
+ * Read (de-serialize) a data feed from <code>content</code> (as {@link InputStream}) in specified format (given as
+ * <code>contentType</code>)
+ * based on <code>entity data model</code> (given as {@link EdmEntitySet}) and provide this data as
+ * {@link ODataEntry}.
*
* @param contentType format of content in the given input stream.
* @param entitySet entity data model for entity set to be read
@@ -219,7 +238,8 @@ public final class EntityProvider {
* @return an {@link ODataFeed} object
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- ODataFeed readFeed(String contentType, EdmEntitySet entitySet, InputStream content, EntityProviderReadProperties properties) throws EntityProviderException;
+ ODataFeed readFeed(String contentType, EdmEntitySet entitySet, InputStream content,
+ EntityProviderReadProperties properties) throws EntityProviderException;
/**
* Reads (de-serializes) data from <code>content</code> (as {@link InputStream})
@@ -229,19 +249,22 @@ public final class EntityProvider {
* Does not return complete entry data but only data present in the
* de-serialized content.
* @param contentType format of content in the given input stream
- * @param entitySet entity data model for entity set to be read
- * @param content data in form of an {@link InputStream} which
- * contains the data in specified format
- * @param properties additional properties necessary for reading
- * content from {@link InputStream} into {@link Map}.
+ * @param entitySet entity data model for entity set to be read
+ * @param content data in form of an {@link InputStream} which
+ * contains the data in specified format
+ * @param properties additional properties necessary for reading
+ * content from {@link InputStream} into {@link Map}.
* @return entry as {@link ODataEntry}
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- ODataEntry readEntry(String contentType, EdmEntitySet entitySet, InputStream content, EntityProviderReadProperties properties) throws EntityProviderException;
+ ODataEntry readEntry(String contentType, EdmEntitySet entitySet, InputStream content,
+ EntityProviderReadProperties properties) throws EntityProviderException;
/**
- * Read (de-serialize) properties from <code>content</code> (as {@link InputStream}) in specified format (given as <code>contentType</code>)
- * based on <code>entity data model</code> (given as {@link EdmProperty}) and provide this data as {@link Map} which contains
+ * Read (de-serialize) properties from <code>content</code> (as {@link InputStream}) in specified format (given as
+ * <code>contentType</code>)
+ * based on <code>entity data model</code> (given as {@link EdmProperty}) and provide this data as {@link Map} which
+ * contains
* the read data in form of <code>property name</code> to <code>property value</code> mapping.
*
* @param contentType format of content in the given input stream.
@@ -251,25 +274,30 @@ public final class EntityProvider {
* @return property as name and value in a map
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- Map<String, Object> readProperty(String contentType, EdmProperty edmProperty, InputStream content, EntityProviderReadProperties properties) throws EntityProviderException;
+ Map<String, Object> readProperty(String contentType, EdmProperty edmProperty, InputStream content,
+ EntityProviderReadProperties properties) throws EntityProviderException;
/**
- * Read (de-serialize) a property value from <code>content</code> (as {@link InputStream}) in format <code>text/plain</code>
+ * Read (de-serialize) a property value from <code>content</code> (as {@link InputStream}) in format
+ * <code>text/plain</code>
* based on <code>entity data model</code> (given as {@link EdmProperty}) and provide this data as {@link Object}.
*
* @param edmProperty entity data model for entity property to be read
* @param content data in form of an {@link InputStream} which contains the data in format <code>text/plain</code>
- * @param typeMapping defines the mapping for this <code>edm property</code> to a <code>java class</code> which should be used
- * during read of the content. If according <code>edm property</code> can not be read
- * into given <code>java class</code> an {@link EntityProviderException} is thrown.
- * Supported mappings are documented in {@link org.apache.olingo.odata2.api.edm.EdmSimpleType}.
+ * @param typeMapping defines the mapping for this <code>edm property</code> to a <code>java class</code> which
+ * should be used
+ * during read of the content. If according <code>edm property</code> can not be read
+ * into given <code>java class</code> an {@link EntityProviderException} is thrown.
+ * Supported mappings are documented in {@link org.apache.olingo.odata2.api.edm.EdmSimpleType}.
* @return property value as object
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- Object readPropertyValue(EdmProperty edmProperty, InputStream content, Class<?> typeMapping) throws EntityProviderException;
+ Object readPropertyValue(EdmProperty edmProperty, InputStream content, Class<?> typeMapping)
+ throws EntityProviderException;
/**
- * Read (de-serialize) a link from <code>content</code> (as {@link InputStream}) in specified format (given as <code>contentType</code>)
+ * Read (de-serialize) a link from <code>content</code> (as {@link InputStream}) in specified format (given as
+ * <code>contentType</code>)
* based on <code>entity data model</code> (given as {@link EdmEntitySet}) and provide the link as {@link String}.
*
* @param contentType format of content in the given input stream.
@@ -284,27 +312,30 @@ public final class EntityProvider {
* Read (de-serialize) all links from <code>content</code> (as {@link InputStream})
* in specified format (given as <code>contentType</code>) based on <code>entity data model</code>
* (given as {@link EdmEntitySet}) and provide the link as List of Strings.
- *
+ *
* @param contentType format of content in the given input stream.
* @param entitySet entity data model for entity property to be read
* @param content data in form of an {@link InputStream} which contains the data in specified format
* @return links as List of Strings
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- List<String> readLinks(String contentType, EdmEntitySet entitySet, InputStream content) throws EntityProviderException;
+ List<String> readLinks(String contentType, EdmEntitySet entitySet, InputStream content)
+ throws EntityProviderException;
/**
- * Read (de-serialize) data from metadata <code>inputStream</code> (as {@link InputStream}) and provide Edm as {@link Edm}
+ * Read (de-serialize) data from metadata <code>inputStream</code> (as {@link InputStream}) and provide Edm as
+ * {@link Edm}
*
* @param inputStream the given input stream
- * @param validate has to be true if metadata should be validated
+ * @param validate has to be true if metadata should be validated
* @return Edm as {@link Edm}
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
Edm readMetadata(InputStream inputStream, boolean validate) throws EntityProviderException;
/**
- * Read (de-serialize) binary data from <code>content</code> (as {@link InputStream}) and provide it as <code>byte[]</code>.
+ * Read (de-serialize) binary data from <code>content</code> (as {@link InputStream}) and provide it as
+ * <code>byte[]</code>.
*
* @param content data in form of an {@link InputStream} which contains the binary data
* @return binary data as bytes
@@ -314,31 +345,34 @@ public final class EntityProvider {
/**
* <p>Serializes an error message according to the OData standard.</p>
- * @param context contains error details see {@link ODataErrorContext}
- * @return an {@link ODataResponse} containing the serialized error message
+ * @param context contains error details see {@link ODataErrorContext}
+ * @return an {@link ODataResponse} containing the serialized error message
*/
ODataResponse writeErrorDocument(ODataErrorContext context);
/**
- * Read (de-serialize) data from service document <code>inputStream</code> (as {@link InputStream}) and provide ServiceDocument as {@link ServiceDocument}
+ * Read (de-serialize) data from service document <code>inputStream</code> (as {@link InputStream}) and provide
+ * ServiceDocument as {@link ServiceDocument}
*
* @param serviceDocument the given input stream
* @param contentType format of content in the given input stream
* @return ServiceDocument as {@link ServiceDocument}
- * @throws EntityProviderException if reading of data (de-serialization) fails
+ * @throws EntityProviderException if reading of data (de-serialization) fails
*/
ServiceDocument readServiceDocument(InputStream serviceDocument, String contentType) throws EntityProviderException;
/**
- * Parse Batch Request body <code>inputStream</code> (as {@link InputStream}) and provide a list of Batch Parts as {@link BatchPart}
+ * Parse Batch Request body <code>inputStream</code> (as {@link InputStream}) and provide a list of Batch Parts as
+ * {@link BatchPart}
*
* @param contentType format of content in the given input stream
* @param content request body
* @param properties additional properties necessary for parsing. Must not be null.
* @return list of {@link BatchPart}
- * @throws BatchException if parsing fails
+ * @throws BatchException if parsing fails
*/
- List<BatchRequestPart> parseBatchRequest(String contentType, InputStream content, EntityProviderBatchProperties properties) throws BatchException;
+ List<BatchRequestPart> parseBatchRequest(String contentType, InputStream content,
+ EntityProviderBatchProperties properties) throws BatchException;
/**
* Write responses of Batch Response Parts in Batch Response as {@link ODataResponse}.
@@ -346,7 +380,7 @@ public final class EntityProvider {
*
* @param batchResponseParts a list of {@link BatchResponsePart}
* @return Batch Response as {@link ODataResponse}
- * @throws BatchException
+ * @throws BatchException
*/
ODataResponse writeBatchResponse(List<BatchResponsePart> batchResponseParts) throws BatchException;
@@ -354,18 +388,19 @@ public final class EntityProvider {
* Create Batch Request body as InputStream.
*
* @param batchParts a list of BatchPartRequests {@link BatchPart}
- * @param boundary
+ * @param boundary
* @return Batch Request as InputStream
*/
InputStream writeBatchRequest(List<BatchPart> batchParts, String boundary);
- /**
- * Parse Batch Response body (as {@link InputStream}) and provide a list of single responses as {@link BatchSingleResponse}
- *
+ /**
+ * Parse Batch Response body (as {@link InputStream}) and provide a list of single responses as
+ * {@link BatchSingleResponse}
+ *
* @param content response body
* @param contentType format of content in the given input stream (incl. boundary parameter)
* @return list of {@link BatchSingleResponse}
- * @throws BatchException
+ * @throws BatchException
*/
List<BatchSingleResponse> parseBatchResponse(String contentType, InputStream content) throws BatchException;
@@ -383,16 +418,16 @@ public final class EntityProvider {
/**
* <p>Serializes an error message according to the OData standard.</p>
* An exception is not thrown because this method is used in exception handling.</p>
- * @param context contains error details see {@link ODataErrorContext}
- * @return an {@link ODataResponse} containing the serialized error message
+ * @param context contains error details see {@link ODataErrorContext}
+ * @return an {@link ODataResponse} containing the serialized error message
*/
public static ODataResponse writeErrorDocument(final ODataErrorContext context) {
return createEntityProvider().writeErrorDocument(context);
}
/**
- * Write metadata document in XML format for the given schemas and the provided predefined
- * namespaces at the EDMX element. PredefinedNamespaces is of type
+ * Write metadata document in XML format for the given schemas and the provided predefined
+ * namespaces at the EDMX element. PredefinedNamespaces is of type
* Map{@literal <}prefix,namespace{@literal >} and may be null or an empty Map.
*
* @param schemas all XML schemas which will be written
@@ -400,7 +435,8 @@ public final class EntityProvider {
* @return resulting {@link ODataResponse} with written metadata content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writeMetadata(final List<Schema> schemas, final Map<String, String> predefinedNamespaces) throws EntityProviderException {
+ public static ODataResponse writeMetadata(final List<Schema> schemas, final Map<String, String> predefinedNamespaces)
+ throws EntityProviderException {
return createEntityProvider().writeMetadata(schemas, predefinedNamespaces);
}
@@ -414,7 +450,8 @@ public final class EntityProvider {
* @return resulting {@link ODataResponse} with written service document content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writeServiceDocument(final String contentType, final Edm edm, final String serviceRoot) throws EntityProviderException {
+ public static ODataResponse writeServiceDocument(final String contentType, final Edm edm, final String serviceRoot)
+ throws EntityProviderException {
return createEntityProvider().writeServiceDocument(contentType, edm, serviceRoot);
}
@@ -426,7 +463,8 @@ public final class EntityProvider {
* @return resulting {@link ODataResponse} with written property value content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writePropertyValue(final EdmProperty edmProperty, final Object value) throws EntityProviderException {
+ public static ODataResponse writePropertyValue(final EdmProperty edmProperty, final Object value)
+ throws EntityProviderException {
return createEntityProvider().writePropertyValue(edmProperty, value);
}
@@ -454,43 +492,50 @@ public final class EntityProvider {
}
/**
- * Write given <code>data</code> (which is given in form of a {@link List} with a {@link Map} for each entity. Such a {@link Map}
- * contains all properties [as <code>property name</code> to <code>property value</code> mapping] for the entry) in the specified
- * format (given as <code>contentType</code>) based on given <code>entity data model for an entity set</code> (given as {@link EdmEntitySet})
+ * Write given <code>data</code> (which is given in form of a {@link List} with a {@link Map} for each entity. Such a
+ * {@link Map} contains all properties [as <code>property name</code> to <code>property value</code> mapping] for the
+ * entry) in the specified
+ * format (given as <code>contentType</code>) based on given <code>entity data model for an entity set</code> (given
+ * as {@link EdmEntitySet})
* and <code>properties</code> for this entity provider (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the feed should be written
* @param entitySet entity data model for given entity data set
* @param data set of entries in form of a {@link List} with a {@link Map} for each entity (such a {@link Map}
- * contains all properties [as <code>property name</code> to <code>property value</code> mapping).
- * @param properties additional properties necessary for writing of data
+ * contains all properties [as <code>property name</code> to <code>property value</code> mapping).
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written feed content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writeFeed(final String contentType, final EdmEntitySet entitySet, final List<Map<String, Object>> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public static ODataResponse writeFeed(final String contentType, final EdmEntitySet entitySet,
+ final List<Map<String, Object>> data, final EntityProviderWriteProperties properties)
+ throws EntityProviderException {
return createEntityProvider().writeFeed(contentType, entitySet, data, properties);
}
/**
- * Write given <code>data</code> (which is given in form of a {@link Map} for which contains all properties
+ * Write given <code>data</code> (which is given in form of a {@link Map} for which contains all properties
* as <code>property name</code> to <code>property value</code> mapping) for the entry in the specified
- * format (given as <code>contentType</code>) based on <code>entity data model for an entity set</code> (given as {@link EdmEntitySet})
+ * format (given as <code>contentType</code>) based on <code>entity data model for an entity set</code> (given as
+ * {@link EdmEntitySet})
* and <code>properties</code> for this entity provider (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the entry should be written
* @param entitySet entity data model for given entity data set
- * @param data which contains all properties as <code>property name</code> to <code>property value</code> mapping for the entry
- * @param properties additional properties necessary for writing of data
+ * @param data which contains all properties as <code>property name</code> to <code>property value</code> mapping for
+ * the entry
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written entry content
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writeEntry(final String contentType, final EdmEntitySet entitySet, final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public static ODataResponse writeEntry(final String contentType, final EdmEntitySet entitySet,
+ final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
return createEntityProvider().writeEntry(contentType, entitySet, data, properties);
}
/**
* Write given <code>value</code> (which is given in form of an {@link Object}) for the property in the specified
- * format (given as <code>contentType</code>) based on given <code>entity data model for an entity property</code>
+ * format (given as <code>contentType</code>) based on given <code>entity data model for an entity property</code>
* (given as {@link EdmProperty}).
*
* @param contentType format in which the property should be written
@@ -499,112 +544,137 @@ public final class EntityProvider {
* @return resulting {@link ODataResponse} with written property content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writeProperty(final String contentType, final EdmProperty edmProperty, final Object value) throws EntityProviderException {
+ public static ODataResponse
+ writeProperty(final String contentType, final EdmProperty edmProperty, final Object value)
+ throws EntityProviderException {
return createEntityProvider().writeProperty(contentType, edmProperty, value);
}
/**
- * Write <b>link</b> for key property based on <code>entity data model for an entity set</code> (given as {@link EdmEntitySet})
+ * Write <b>link</b> for key property based on <code>entity data model for an entity set</code> (given as
+ * {@link EdmEntitySet})
* in the specified format (given as <code>contentType</code>).
- * The necessary key property values must be provided within the <code>data</code> (in the form of <code>property name</code>
+ * The necessary key property values must be provided within the <code>data</code> (in the form of <code>property
+ * name</code>
* to <code>property value</code> mapping) and <code>properties</code> for this entity provider must be set
* (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the entry should be written
* @param entitySet entity data model for given entity data set
- * @param data which contains all key properties as <code>property name</code> to <code>property value</code> mapping for the entry
- * @param properties additional properties necessary for writing of data
+ * @param data which contains all key properties as <code>property name</code> to <code>property value</code> mapping
+ * for the entry
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written link content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writeLink(final String contentType, final EdmEntitySet entitySet, final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public static ODataResponse writeLink(final String contentType, final EdmEntitySet entitySet,
+ final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
return createEntityProvider().writeLink(contentType, entitySet, data, properties);
}
/**
- * Write all <b>links</b> for key property based on <code>entity data model for an entity set</code> (given as {@link EdmEntitySet})
+ * Write all <b>links</b> for key property based on <code>entity data model for an entity set</code> (given as
+ * {@link EdmEntitySet})
* in the specified format (given as <code>contentType</code>) for a set of entries.
- * The necessary key property values must be provided within the <code>data</code> (in form of a {@link List} with a {@link Map}
- * for each entry. Such a {@link Map} contains all key properties [as <code>property name</code> to
- * <code>property value</code> mapping] for the entry) and <code>properties</code> for this entity provider must be set
+ * The necessary key property values must be provided within the <code>data</code> (in form of a {@link List} with a
+ * {@link Map} for each entry. Such a {@link Map} contains all key properties [as <code>property name</code> to
+ * <code>property value</code> mapping] for the entry) and <code>properties</code> for this entity provider must be
+ * set
* (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the entry should be written
* @param entitySet entity data model for given entity data set
- * @param data set of entries in form of a {@link List} with a {@link Map} for each entry (such a {@link Map}
- * contains all key properties [as <code>property name</code> to <code>property value</code> mapping).
- * @param properties additional properties necessary for writing of data
+ * @param data set of entries in form of a {@link List} with a {@link Map} for each entry (such a {@link Map} contains
+ * all key properties [as <code>property name</code> to <code>property value</code> mapping).
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written links content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writeLinks(final String contentType, final EdmEntitySet entitySet, final List<Map<String, Object>> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public static ODataResponse writeLinks(final String contentType, final EdmEntitySet entitySet,
+ final List<Map<String, Object>> data, final EntityProviderWriteProperties properties)
+ throws EntityProviderException {
return createEntityProvider().writeLinks(contentType, entitySet, data, properties);
}
/**
- * Write <code>data</code> result (given as {@link Object}) of function import based on <code>return type</code>
- * of {@link EdmFunctionImport} in specified format (given as <code>contentType</code>). Additional <code>properties</code>
+ * Write <code>data</code> result (given as {@link Object}) of function import based on <code>return type</code>
+ * of {@link EdmFunctionImport} in specified format (given as <code>contentType</code>). Additional
+ * <code>properties</code>
* for this entity provider must be set (given as {@link EntityProviderWriteProperties}).
*
* @param contentType format in which the entry should be written
* @param functionImport entity data model for executed function import
* @param data result of function import
- * @param properties additional properties necessary for writing of data
+ * @param properties additional properties necessary for writing of data
* @return resulting {@link ODataResponse} with written function import result content.
* @throws EntityProviderException if writing of data (serialization) fails
*/
- public static ODataResponse writeFunctionImport(final String contentType, final EdmFunctionImport functionImport, final Object data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public static ODataResponse writeFunctionImport(final String contentType, final EdmFunctionImport functionImport,
+ final Object data, final EntityProviderWriteProperties properties) throws EntityProviderException {
return createEntityProvider().writeFunctionImport(contentType, functionImport, data, properties);
}
/**
- * Read (de-serialize) a data feed from <code>content</code> (as {@link InputStream}) in specified format (given as <code>contentType</code>)
- * based on <code>entity data model</code> (given as {@link EdmEntitySet}) and provide this data as {@link ODataEntry}.
+ * Read (de-serialize) a data feed from <code>content</code> (as {@link InputStream}) in specified format (given as
+ * <code>contentType</code>)
+ * based on <code>entity data model</code> (given as {@link EdmEntitySet}) and provide this data as {@link ODataEntry}
+ * .
*
* @param contentType format of content in the given input stream.
* @param entitySet entity data model for entity set to be read
* @param content feed data in form of an {@link InputStream} which contains the data in specified format
- * @param properties additional properties necessary for reading content from {@link InputStream} into {@link Map}. Must not be null.
+ * @param properties additional properties necessary for reading content from {@link InputStream} into {@link Map}.
+ * Must not be null.
* @return an {@link ODataFeed} object
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- public static ODataFeed readFeed(final String contentType, final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public static ODataFeed readFeed(final String contentType, final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
return createEntityProvider().readFeed(contentType, entitySet, content, properties);
}
/**
- * Read (de-serialize) data from <code>content</code> (as {@link InputStream}) in specified format (given as <code>contentType</code>)
- * based on <code>entity data model</code> (given as {@link EdmEntitySet}) and provide this data as {@link ODataEntry}.
+ * Read (de-serialize) data from <code>content</code> (as {@link InputStream}) in specified format (given as
+ * <code>contentType</code>)
+ * based on <code>entity data model</code> (given as {@link EdmEntitySet}) and provide this data as {@link ODataEntry}
+ * .
*
* @param contentType format of content in the given input stream.
* @param entitySet entity data model for entity set to be read
* @param content data in form of an {@link InputStream} which contains the data in specified format
- * @param properties additional properties necessary for reading content from {@link InputStream} into {@link Map}. Must not be null.
+ * @param properties additional properties necessary for reading content from {@link InputStream} into {@link Map}.
+ * Must not be null.
* @return entry as {@link ODataEntry}
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- public static ODataEntry readEntry(final String contentType, final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public static ODataEntry readEntry(final String contentType, final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
return createEntityProvider().readEntry(contentType, entitySet, content, properties);
}
/**
- * Read (de-serialize) properties from <code>content</code> (as {@link InputStream}) in specified format (given as <code>contentType</code>)
- * based on <code>entity data model</code> (given as {@link EdmProperty}) and provide this data as {@link Map} which contains
+ * Read (de-serialize) properties from <code>content</code> (as {@link InputStream}) in specified format (given as
+ * <code>contentType</code>)
+ * based on <code>entity data model</code> (given as {@link EdmProperty}) and provide this data as {@link Map} which
+ * contains
* the read data in form of <code>property name</code> to <code>property value</code> mapping.
*
* @param contentType format of content in the given input stream.
* @param edmProperty entity data model for entity property to be read
* @param content data in form of an {@link InputStream} which contains the data in specified format
- * @param properties additional properties necessary for reading content from {@link InputStream} into {@link Map}. Must not be null.
+ * @param properties additional properties necessary for reading content from {@link InputStream} into {@link Map}.
+ * Must not be null.
* @return property as name and value in a map
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- public static Map<String, Object> readProperty(final String contentType, final EdmProperty edmProperty, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public static Map<String, Object> readProperty(final String contentType, final EdmProperty edmProperty,
+ final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
return createEntityProvider().readProperty(contentType, edmProperty, content, properties);
}
/**
- * Read (de-serialize) a property value from <code>content</code> (as {@link InputStream}) in format <code>text/plain</code>
+ * Read (de-serialize) a property value from <code>content</code> (as {@link InputStream}) in format
+ * <code>text/plain</code>
* based on <code>entity data model</code> (given as {@link EdmProperty}) and provide this data as {@link Object}.
*
* @param edmProperty entity data model for entity property to be read
@@ -612,29 +682,34 @@ public final class EntityProvider {
* @return property value as object
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- public static Object readPropertyValue(final EdmProperty edmProperty, final InputStream content) throws EntityProviderException {
+ public static Object readPropertyValue(final EdmProperty edmProperty, final InputStream content)
+ throws EntityProviderException {
return createEntityProvider().readPropertyValue(edmProperty, content, null);
}
/**
- * Read (de-serialize) a property value from <code>content</code> (as {@link InputStream}) in format <code>text/plain</code>
+ * Read (de-serialize) a property value from <code>content</code> (as {@link InputStream}) in format
+ * <code>text/plain</code>
* based on <code>entity data model</code> (given as {@link EdmProperty}) and provide this data as {@link Object}.
*
* @param edmProperty entity data model for entity property to be read
* @param content data in form of an {@link InputStream} which contains the data in format <code>text/plain</code>
- * @param typeMapping defines the mapping for this <code>edm property</code> to a <code>java class</code> which should be used
- * during read of the content. If according <code>edm property</code> can not be read
- * into given <code>java class</code> an {@link EntityProviderException} is thrown.
- * Supported mappings are documented in {@link org.apache.olingo.odata2.api.edm.EdmSimpleType}.
+ * @param typeMapping defines the mapping for this <code>edm property</code> to a <code>java class</code> which should
+ * be used
+ * during read of the content. If according <code>edm property</code> can not be read
+ * into given <code>java class</code> an {@link EntityProviderException} is thrown.
+ * Supported mappings are documented in {@link org.apache.olingo.odata2.api.edm.EdmSimpleType}.
* @return property value as object
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- public static Object readPropertyValue(final EdmProperty edmProperty, final InputStream content, final Class<?> typeMapping) throws EntityProviderException {
+ public static Object readPropertyValue(final EdmProperty edmProperty, final InputStream content,
+ final Class<?> typeMapping) throws EntityProviderException {
return createEntityProvider().readPropertyValue(edmProperty, content, typeMapping);
}
/**
- * Read (de-serialize) a link from <code>content</code> (as {@link InputStream}) in specified format (given as <code>contentType</code>)
+ * Read (de-serialize) a link from <code>content</code> (as {@link InputStream}) in specified format (given as
+ * <code>contentType</code>)
* based on <code>entity data model</code> (given as {@link EdmEntitySet}) and provide the link as {@link String}.
*
* @param contentType format of content in the given input stream.
@@ -643,7 +718,8 @@ public final class EntityProvider {
* @return link as string
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- public static String readLink(final String contentType, final EdmEntitySet entitySet, final InputStream content) throws EntityProviderException {
+ public static String readLink(final String contentType, final EdmEntitySet entitySet, final InputStream content)
+ throws EntityProviderException {
return createEntityProvider().readLink(contentType, entitySet, content);
}
@@ -651,19 +727,21 @@ public final class EntityProvider {
* Read (de-serialize) a link collection from <code>content</code> (as {@link InputStream})
* in specified format (given as <code>contentType</code>) based on <code>entity data model</code>
* (given as {@link EdmEntitySet}) and provide the links as List of Strings.
- *
+ *
* @param contentType format of content in the given input stream.
* @param entitySet entity data model for entity property to be read
* @param content data in form of an {@link InputStream} which contains the data in specified format
* @return links as List of Strings
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
- public static List<String> readLinks(final String contentType, final EdmEntitySet entitySet, final InputStream content) throws EntityProviderException {
+ public static List<String> readLinks(final String contentType, final EdmEntitySet entitySet,
+ final InputStream content) throws EntityProviderException {
return createEntityProvider().readLinks(contentType, entitySet, content);
}
/**
- * Read (de-serialize) binary data from <code>content</code> (as {@link InputStream}) and provide it as <code>byte[]</code>.
+ * Read (de-serialize) binary data from <code>content</code> (as {@link InputStream}) and provide it as
+ * <code>byte[]</code>.
*
* @param content data in form of an {@link InputStream} which contains the binary data
* @return binary data as bytes
@@ -674,10 +752,11 @@ public final class EntityProvider {
}
/**
- * Read (de-serialize) data from metadata <code>inputStream</code> (as {@link InputStream}) and provide Edm as {@link Edm}
+ * Read (de-serialize) data from metadata <code>inputStream</code> (as {@link InputStream}) and provide Edm as
+ * {@link Edm}
*
* @param metadataXml a metadata xml input stream (means the metadata document)
- * @param validate has to be true if metadata should be validated
+ * @param validate has to be true if metadata should be validated
* @return Edm as {@link Edm}
* @throws EntityProviderException if reading of data (de-serialization) fails
*/
@@ -686,19 +765,22 @@ public final class EntityProvider {
}
/**
- * Read (de-serialize) data from service document <code>inputStream</code> (as {@link InputStream}) and provide ServiceDocument as {@link ServiceDocument}
+ * Read (de-serialize) data from service document <code>inputStream</code> (as {@link InputStream}) and provide
+ * ServiceDocument as {@link ServiceDocument}
*
* @param serviceDocument the given input stream
* @param contentType format of content in the given input stream
* @return ServiceDocument as {@link ServiceDocument}
- * @throws EntityProviderException if reading of data (de-serialization) fails
+ * @throws EntityProviderException if reading of data (de-serialization) fails
*/
- public static ServiceDocument readServiceDocument(final InputStream serviceDocument, final String contentType) throws EntityProviderException {
+ public static ServiceDocument readServiceDocument(final InputStream serviceDocument, final String contentType)
+ throws EntityProviderException {
return createEntityProvider().readServiceDocument(serviceDocument, contentType);
}
/**
- * Parse Batch Request body <code>inputStream</code> (as {@link InputStream}) and provide a list of Batch Request parts as {@link BatchRequestPart}
+ * Parse Batch Request body <code>inputStream</code> (as {@link InputStream}) and provide a list of Batch Request
+ * parts as {@link BatchRequestPart}
*
* @param contentType format of content in the given input stream
* @param content request body
@@ -706,7 +788,8 @@ public final class EntityProvider {
* @return list of {@link BatchRequestPart}
* @throws BatchException if parsing fails
*/
- public static List<BatchRequestPart> parseBatchRequest(final String contentType, final InputStream content, final EntityProviderBatchProperties properties) throws BatchException {
+ public static List<BatchRequestPart> parseBatchRequest(final String contentType, final InputStream content,
+ final EntityProviderBatchProperties properties) throws BatchException {
return createEntityProvider().parseBatchRequest(contentType, content, properties);
}
@@ -716,9 +799,10 @@ public final class EntityProvider {
*
* @param batchResponseParts a list of {@link BatchResponsePart}
* @return Batch Response as {@link ODataResponse}
- * @throws BatchException
+ * @throws BatchException
*/
- public static ODataResponse writeBatchResponse(final List<BatchResponsePart> batchResponseParts) throws BatchException {
+ public static ODataResponse writeBatchResponse(final List<BatchResponsePart> batchResponseParts)
+ throws BatchException {
return createEntityProvider().writeBatchResponse(batchResponseParts);
}
@@ -726,22 +810,24 @@ public final class EntityProvider {
* Create Batch Request body as InputStream.
*
* @param batchParts a list of BatchPartRequests {@link BatchPart}
- * @param boundary
+ * @param boundary
* @return Batch Request as InputStream
*/
public static InputStream writeBatchRequest(final List<BatchPart> batchParts, final String boundary) {
return createEntityProvider().writeBatchRequest(batchParts, boundary);
}
- /**
- * Parse Batch Response body (as {@link InputStream}) and provide a list of single responses as {@link BatchSingleResponse}
- *
+ /**
+ * Parse Batch Response body (as {@link InputStream}) and provide a list of single responses as
+ * {@link BatchSingleResponse}
+ *
* @param content response body
* @param contentType format of content in the given input stream (inclusive boundary parameter)
* @return list of {@link BatchSingleResponse}
- * @throws BatchException
+ * @throws BatchException
*/
- public static List<BatchSingleResponse> parseBatchResponse(final InputStream content, final String contentType) throws BatchException {
+ public static List<BatchSingleResponse> parseBatchResponse(final InputStream content, final String contentType)
+ throws BatchException {
return createEntityProvider().parseBatchResponse(contentType, content);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
index 46d5362..0cb47ec 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
/**
* The {@link EntityProviderBatchProperties} contains necessary informations to parse a Batch Request body.
*
- *
+ *
*/
public class EntityProviderBatchProperties {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderException.java
index 8b4b498..a2ddc91 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
/**
* An {@link EntityProviderException} is the base exception for all <code>EntityProvider</code> related exceptions.
- * It extends the {@link ODataMessageException} and provides several {@link MessageReference} for specification of
+ * It extends the {@link ODataMessageException} and provides several {@link MessageReference} for specification of
* the thrown exception.
*/
public class EntityProviderException extends ODataMessageException {
@@ -33,48 +33,71 @@ public class EntityProviderException extends ODataMessageException {
/** INVALID_STATE requires no content value */
public static final MessageReference COMMON = createMessageReference(EntityProviderException.class, "COMMON");
/** EXCEPTION_OCCURRED requires 1 content value ('exception name') */
- public static final MessageReference EXCEPTION_OCCURRED = createMessageReference(EntityProviderException.class, "EXCEPTION_OCCURRED");
+ public static final MessageReference EXCEPTION_OCCURRED = createMessageReference(EntityProviderException.class,
+ "EXCEPTION_OCCURRED");
/** INVALIDMAPPING requires 1 content value ('propertyName') */
- public static final MessageReference INVALID_MAPPING = createMessageReference(EntityProviderException.class, "INVALID_MAPPING");
+ public static final MessageReference INVALID_MAPPING = createMessageReference(EntityProviderException.class,
+ "INVALID_MAPPING");
/** INVALID_ENTITYTYPE requires 2 content values ('supplied entity type' and 'content entity type') */
- public static final MessageReference INVALID_ENTITYTYPE = createMessageReference(EntityProviderException.class, "INVALID_ENTITYTYPE");
+ public static final MessageReference INVALID_ENTITYTYPE = createMessageReference(EntityProviderException.class,
+ "INVALID_ENTITYTYPE");
/** INVALID_COMPLEX_TYPE requires 2 content values ('supplied complex type' and 'content complex type') */
- public static final MessageReference INVALID_COMPLEX_TYPE = createMessageReference(EntityProviderException.class, "INVALID_COMPLEX_TYPE");
+ public static final MessageReference INVALID_COMPLEX_TYPE = createMessageReference(EntityProviderException.class,
+ "INVALID_COMPLEX_TYPE");
/** INVALID_CONTENT requires 2 content values ('invalid tag' and 'parent tag') */
- public static final MessageReference INVALID_CONTENT = createMessageReference(EntityProviderException.class, "INVALID_CONTENT");
+ public static final MessageReference INVALID_CONTENT = createMessageReference(EntityProviderException.class,
+ "INVALID_CONTENT");
/** INVALID_PROPERTY_VALUE requires 1 content value ('invalid value') */
- public static final MessageReference INVALID_PROPERTY_VALUE = createMessageReference(EntityProviderException.class, "INVALID_PROPERTY_VALUE");
+ public static final MessageReference INVALID_PROPERTY_VALUE = createMessageReference(EntityProviderException.class,
+ "INVALID_PROPERTY_VALUE");
/** MISSING_PROPERTY requires 1 content value ('invalid value') */
- public static final MessageReference MISSING_PROPERTY = createMessageReference(EntityProviderException.class, "MISSING_PROPERTY");
+ public static final MessageReference MISSING_PROPERTY = createMessageReference(EntityProviderException.class,
+ "MISSING_PROPERTY");
/** INVALID_PARENT_TAG requires 2 content values ('missing attribute name' and 'tag name') */
- public static final MessageReference MISSING_ATTRIBUTE = createMessageReference(EntityProviderException.class, "MISSING_ATTRIBUTE");
- public static final MessageReference UNSUPPORTED_PROPERTY_TYPE = createMessageReference(EntityProviderException.class, "UNSUPPORTED_PROPERTY_TYPE");
- public static final MessageReference INLINECOUNT_INVALID = createMessageReference(EntityProviderException.class, "INLINECOUNT_INVALID");
+ public static final MessageReference MISSING_ATTRIBUTE = createMessageReference(EntityProviderException.class,
+ "MISSING_ATTRIBUTE");
+ public static final MessageReference UNSUPPORTED_PROPERTY_TYPE = createMessageReference(
+ EntityProviderException.class, "UNSUPPORTED_PROPERTY_TYPE");
+ public static final MessageReference INLINECOUNT_INVALID = createMessageReference(EntityProviderException.class,
+ "INLINECOUNT_INVALID");
/** INVALID_STATE requires 1 content value ('message') */
- public static final MessageReference INVALID_STATE = createMessageReference(EntityProviderException.class, "INVALID_STATE");
+ public static final MessageReference INVALID_STATE = createMessageReference(EntityProviderException.class,
+ "INVALID_STATE");
/** INVALID_INLINE_CONTENT requires 1 content value ('invalid inline message') */
- public static final MessageReference INVALID_INLINE_CONTENT = createMessageReference(EntityProviderException.class, "INVALID_INLINE_CONTENT");
+ public static final MessageReference INVALID_INLINE_CONTENT = createMessageReference(EntityProviderException.class,
+ "INVALID_INLINE_CONTENT");
/** INVALID_PROPERTY requires 1 content value ('invalid property name') */
- public static final MessageReference INVALID_PROPERTY = createMessageReference(EntityProviderException.class, "INVALID_PROPERTY");
+ public static final MessageReference INVALID_PROPERTY = createMessageReference(EntityProviderException.class,
+ "INVALID_PROPERTY");
/** ILLEGAL_ARGUMENT requires 1 content value ('message') */
- public static final MessageReference ILLEGAL_ARGUMENT = createMessageReference(EntityProviderException.class, "ILLEGAL_ARGUMENT");
+ public static final MessageReference ILLEGAL_ARGUMENT = createMessageReference(EntityProviderException.class,
+ "ILLEGAL_ARGUMENT");
/** INVALID_NAMESPACE requires 1 content value ('invalid tag/namespace') */
- public static final MessageReference INVALID_NAMESPACE = createMessageReference(EntityProviderException.class, "INVALID_NAMESPACE");
+ public static final MessageReference INVALID_NAMESPACE = createMessageReference(EntityProviderException.class,
+ "INVALID_NAMESPACE");
/** INVALID_PARENT_TAG requires 2 content values ('expected parent tag' and 'found parent tag') */
- public static final MessageReference INVALID_PARENT_TAG = createMessageReference(EntityProviderException.class, "INVALID_PARENT_TAG");
- public static final MessageReference EXPANDNOTSUPPORTED = createMessageReference(EntityProviderException.class, "EXPANDNOTSUPPORTED");
+ public static final MessageReference INVALID_PARENT_TAG = createMessageReference(EntityProviderException.class,
+ "INVALID_PARENT_TAG");
+ public static final MessageReference EXPANDNOTSUPPORTED = createMessageReference(EntityProviderException.class,
+ "EXPANDNOTSUPPORTED");
/** DOUBLE_PROPERTY requires 1 content value ('double tag/property') */
- public static final MessageReference DOUBLE_PROPERTY = createMessageReference(EntityProviderException.class, "DOUBLE_PROPERTY");
+ public static final MessageReference DOUBLE_PROPERTY = createMessageReference(EntityProviderException.class,
+ "DOUBLE_PROPERTY");
/** NOT_SET_CHARACTER_ENCODING requires no content value */
- public static final MessageReference NOT_SET_CHARACTER_ENCODING = createMessageReference(EntityProviderException.class, "NOT_SET_CHARACTER_ENCODING");
+ public static final MessageReference NOT_SET_CHARACTER_ENCODING = createMessageReference(
+ EntityProviderException.class, "NOT_SET_CHARACTER_ENCODING");
/** UNSUPPORTED_CHARACTER_ENCODING requires 1 content value ('found but unsupported character encoding') */
- public static final MessageReference UNSUPPORTED_CHARACTER_ENCODING = createMessageReference(EntityProviderException.class, "UNSUPPORTED_CHARACTER_ENCODING");
+ public static final MessageReference UNSUPPORTED_CHARACTER_ENCODING = createMessageReference(
+ EntityProviderException.class, "UNSUPPORTED_CHARACTER_ENCODING");
/** MEDIA_DATA_NOT_INITIAL requires no content value */
- public static final MessageReference MEDIA_DATA_NOT_INITIAL = createMessageReference(EntityProviderException.class, "MEDIA_DATA_NOT_INITIAL");
+ public static final MessageReference MEDIA_DATA_NOT_INITIAL = createMessageReference(EntityProviderException.class,
+ "MEDIA_DATA_NOT_INITIAL");
/** END_DOCUMENT_EXPECTED requires 1 content value ('actual token') */
- public static final MessageReference END_DOCUMENT_EXPECTED = createMessageReference(EntityProviderException.class, "END_DOCUMENT_EXPECTED");
+ public static final MessageReference END_DOCUMENT_EXPECTED = createMessageReference(EntityProviderException.class,
+ "END_DOCUMENT_EXPECTED");
/** MISSING_RESULTS_ARRAY requires no content value */
- public static final MessageReference MISSING_RESULTS_ARRAY = createMessageReference(EntityProviderException.class, "MISSING_RESULTS_ARRAY");
+ public static final MessageReference MISSING_RESULTS_ARRAY = createMessageReference(EntityProviderException.class,
+ "MISSING_RESULTS_ARRAY");
public EntityProviderException(final MessageReference messageReference) {
super(messageReference);
@@ -88,7 +111,8 @@ public class EntityProviderException extends ODataMessageException {
super(messageReference, errorCode);
}
- public EntityProviderException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
+ public EntityProviderException(final MessageReference messageReference, final Throwable cause,
+ final String errorCode) {
super(messageReference, cause, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java
index 97e4002..a012487 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,13 +34,13 @@ import org.apache.olingo.odata2.api.ep.callback.OnReadInlineContent;
* <li>and the <code>type mappings</code></li>
* </ul>
* </p>
- *
+ *
*/
public class EntityProviderReadProperties {
/** Callback which is necessary if entity contains inlined navigation properties. */
private OnReadInlineContent callback;
/**
- * if merge is <code>true</code> the input content is in context of a <b>merge</b> (e.g. MERGE, PATCH) read request,
+ * if merge is <code>true</code> the input content is in context of a <b>merge</b> (e.g. MERGE, PATCH) read request,
* otherwise if <code>false</code> it is a <b>non-merge</b> (e.g. CREATE) read request
*/
private boolean merge;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
index b4429e2..1b5a25c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -27,8 +27,9 @@ import org.apache.olingo.odata2.api.commons.InlineCount;
import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
/**
- * {@link EntityProviderWriteProperties} contains all additional properties which are necessary to <b>write (serialize)</b> an
- * {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry} into an specific format (e.g. <code>XML</code> or <code>JSON</code> or ...).
+ * {@link EntityProviderWriteProperties} contains all additional properties which are necessary to <b>write
+ * (serialize)</b> an {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry} into an specific format (e.g.
+ * <code>XML</code> or <code>JSON</code> or ...).
*/
public class EntityProviderWriteProperties {
@@ -68,9 +69,9 @@ public class EntityProviderWriteProperties {
}
/**
- * Gets the type of the inlinecount request from the system query option.
- * @return the type of the inlinecount request from the system query option
- */
+ * Gets the type of the inlinecount request from the system query option.
+ * @return the type of the inlinecount request from the system query option
+ */
public final InlineCount getInlineCountType() {
return inlineCountType;
}
@@ -88,7 +89,7 @@ public class EntityProviderWriteProperties {
}
/**
- * Gets the inlinecount.
+ * Gets the inlinecount.
* @return the inlinecount as Integer
* @see #getInlineCountType
*/
@@ -112,7 +113,7 @@ public class EntityProviderWriteProperties {
private final EntityProviderWriteProperties properties = new EntityProviderWriteProperties();
/**
- * @param mediaResourceMimeType the mediaResourceMimeType to set
+ * @param mediaResourceMimeType the mediaResourceMimeType to set
*/
public final ODataEntityProviderPropertiesBuilder mediaResourceMimeType(final String mediaResourceMimeType) {
properties.mediaResourceMimeType = mediaResourceMimeType;
@@ -120,7 +121,7 @@ public class EntityProviderWriteProperties {
}
/**
- * @param inlineCountType the inlineCountType to set
+ * @param inlineCountType the inlineCountType to set
*/
public final ODataEntityProviderPropertiesBuilder inlineCountType(final InlineCount inlineCountType) {
properties.inlineCountType = inlineCountType;
@@ -128,7 +129,7 @@ public class EntityProviderWriteProperties {
}
/**
- * @param inlineCount the inlineCount to set
+ * @param inlineCount the inlineCount to set
*/
public final ODataEntityProviderPropertiesBuilder inlineCount(final Integer inlineCount) {
properties.inlineCount = inlineCount;
@@ -160,7 +161,8 @@ public class EntityProviderWriteProperties {
}
/**
- * Set a expand select tree which results from $expand and $select query parameter. Usually the data structure is constructed
+ * Set a expand select tree which results from $expand and $select query parameter. Usually the data structure is
+ * constructed
* by the uri parser.
* @param expandSelectTree data structure
* @return properties builder
@@ -194,7 +196,8 @@ public class EntityProviderWriteProperties {
}
public static ODataEntityProviderPropertiesBuilder fromProperties(final EntityProviderWriteProperties properties) {
- final ODataEntityProviderPropertiesBuilder b = EntityProviderWriteProperties.serviceRoot(properties.getServiceRoot());
+ final ODataEntityProviderPropertiesBuilder b = EntityProviderWriteProperties.serviceRoot(properties
+ .getServiceRoot());
b.fromProperties(properties);
return b;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java
index fb4319f..2b6afe8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,24 +23,24 @@ import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
/**
- * <p>
- * Callback interface for the deep insert read calls (read of <code><m:inline></code> content).
+ * <p>
+ * Callback interface for the deep insert read calls (read of <code><m:inline></code> content).
* Typically the {@link #receiveReadProperties(EntityProviderReadProperties, EdmNavigationProperty)} method is called
* when an inline navigation property is found and will be read.
- * </p>
- * <p>
- * The {@link #handleReadEntry(ReadEntryResult)} and {@link #handleReadFeed(ReadFeedResult)} methods are called
+ * </p>
+ * <p>
+ * The {@link #handleReadEntry(ReadEntryResult)} and {@link #handleReadFeed(ReadFeedResult)} methods are called
* after the inline navigation property was read and deliver the read (de-serialized) entity or list of entities.
- * If inlined navigation property is <code>nullable</code> and not set a {@link ReadEntryResult} is given with the
+ * If inlined navigation property is <code>nullable</code> and not set a {@link ReadEntryResult} is given with the
* <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
* </p>
*
- *
+ *
*/
public interface OnReadInlineContent {
/**
- * Receive (request) to be used {@link EntityProviderReadProperties} to read the found inline navigation property
+ * Receive (request) to be used {@link EntityProviderReadProperties} to read the found inline navigation property
* (<code>><m:inline>...</m:inline></code>).
*
* @param readProperties read properties which are used to read enclosing parent entity
@@ -48,17 +48,17 @@ public interface OnReadInlineContent {
* @return read properties which are used to read (de-serialize) found inline navigation property
* @throws ODataApplicationException
*/
- EntityProviderReadProperties receiveReadProperties(EntityProviderReadProperties readProperties, EdmNavigationProperty navigationProperty) throws ODataApplicationException;
+ EntityProviderReadProperties receiveReadProperties(EntityProviderReadProperties readProperties,
+ EdmNavigationProperty navigationProperty) throws ODataApplicationException;
/**
* Handles reading (de-serialization) entry result.
* The given {@link ReadEntryResult} object contains all contextual information
* about the de-serialized inline navigation property and the entry as
* {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}.
- *
+ *
* @param readEntryResult with contextual information about and de-serialized
- * inlined navigation property as
- * {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
+ * inlined navigation property as {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
* @throws ODataApplicationException
*/
void handleReadEntry(ReadEntryResult readEntryResult) throws ODataApplicationException;
@@ -68,10 +68,9 @@ public interface OnReadInlineContent {
* The given {@link ReadFeedResult} object contains all contextual information
* about the de-serialized inline navigation property and the entry as
* a list of {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}.
- *
+ *
* @param readFeedResult with contextual information about and de-serialized
- * inlined navigation property as a list of
- * {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
+ * inlined navigation property as a list of {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
* @throws ODataApplicationException
*/
void handleReadFeed(ReadFeedResult readFeedResult) throws ODataApplicationException;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java
index 7e725d2..1c4f74b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,17 +22,18 @@ import org.apache.olingo.odata2.api.ODataCallback;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
/**
- * Callback interface for the $expand query option.
+ * Callback interface for the $expand query option.
* <p>If an expand clause for a navigation property which points to an entry is found this callback will be called.
* <br>Pointing to an entry means the navigation property has a multiplicity of 0..1 or 1..1.
*
- *
- *
+ *
+ *
*/
public interface OnWriteEntryContent extends ODataCallback {
/**
- * Retrieves the data for an entry. See {@link WriteEntryCallbackContext} for details on the context and {@link WriteEntryCallbackResult} for details on the result of this method.
+ * Retrieves the data for an entry. See {@link WriteEntryCallbackContext} for details on the context and
+ * {@link WriteEntryCallbackResult} for details on the result of this method.
* @param context of this entry
* @return result - must not be null.
* @throws ODataApplicationException
[22/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
index 6bcc357..9e22706 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -118,7 +118,8 @@ public class EdmSimpleTypeTest extends BaseTest {
public void testBinaryCompatibility() {
testCompatibility(EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -126,7 +127,8 @@ public class EdmSimpleTypeTest extends BaseTest {
testCompatibility(EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance(),
Bit.getInstance());
- assertFalse(EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -135,21 +137,24 @@ public class EdmSimpleTypeTest extends BaseTest {
EdmSimpleTypeKind.Byte.getEdmSimpleTypeInstance(),
Bit.getInstance(),
Uint7.getInstance());
- assertFalse(EdmSimpleTypeKind.Byte.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Byte.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
public void testDateTimeCompatibility() {
testCompatibility(EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
public void testDateTimeOffsetCompatibility() {
testCompatibility(EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -165,7 +170,8 @@ public class EdmSimpleTypeTest extends BaseTest {
EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Decimal.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Decimal.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Decimal.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -180,14 +186,16 @@ public class EdmSimpleTypeTest extends BaseTest {
EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
public void testGuidCompatibility() {
testCompatibility(EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -198,7 +206,8 @@ public class EdmSimpleTypeTest extends BaseTest {
EdmSimpleTypeKind.Byte.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.SByte.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -210,7 +219,8 @@ public class EdmSimpleTypeTest extends BaseTest {
EdmSimpleTypeKind.SByte.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -223,7 +233,8 @@ public class EdmSimpleTypeTest extends BaseTest {
EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -232,7 +243,8 @@ public class EdmSimpleTypeTest extends BaseTest {
Bit.getInstance(),
Uint7.getInstance(),
EdmSimpleTypeKind.SByte.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.SByte.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.SByte.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -246,21 +258,24 @@ public class EdmSimpleTypeTest extends BaseTest {
EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
public void testStringCompatibility() {
testCompatibility(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance()));
}
@Test
public void testTimeCompatibility() {
testCompatibility(EdmSimpleTypeKind.Time.getEdmSimpleTypeInstance(),
EdmSimpleTypeKind.Time.getEdmSimpleTypeInstance());
- assertFalse(EdmSimpleTypeKind.Time.getEdmSimpleTypeInstance().isCompatible(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
+ assertFalse(EdmSimpleTypeKind.Time.getEdmSimpleTypeInstance().isCompatible(
+ EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()));
}
@Test
@@ -283,14 +298,18 @@ public class EdmSimpleTypeTest extends BaseTest {
@Test
public void toUriLiteralDateTime() throws Exception {
- assertEquals("datetime'2009-12-26T21:23:38'", EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance().toUriLiteral("2009-12-26T21:23:38"));
- assertEquals("datetime'2009-12-26T21:23:38Z'", EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance().toUriLiteral("2009-12-26T21:23:38Z"));
+ assertEquals("datetime'2009-12-26T21:23:38'", EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance().toUriLiteral(
+ "2009-12-26T21:23:38"));
+ assertEquals("datetime'2009-12-26T21:23:38Z'", EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance().toUriLiteral(
+ "2009-12-26T21:23:38Z"));
}
@Test
public void toUriLiteralDateTimeOffset() throws Exception {
- assertEquals("datetimeoffset'2009-12-26T21:23:38Z'", EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance().toUriLiteral("2009-12-26T21:23:38Z"));
- assertEquals("datetimeoffset'2002-10-10T12:00:00-05:00'", EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance().toUriLiteral("2002-10-10T12:00:00-05:00"));
+ assertEquals("datetimeoffset'2009-12-26T21:23:38Z'", EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()
+ .toUriLiteral("2009-12-26T21:23:38Z"));
+ assertEquals("datetimeoffset'2002-10-10T12:00:00-05:00'", EdmSimpleTypeKind.DateTimeOffset
+ .getEdmSimpleTypeInstance().toUriLiteral("2002-10-10T12:00:00-05:00"));
}
@Test
@@ -322,7 +341,8 @@ public class EdmSimpleTypeTest extends BaseTest {
public void toUriLiteralString() throws Exception {
assertEquals("'StringValue'", EdmSimpleTypeKind.String.getEdmSimpleTypeInstance().toUriLiteral("StringValue"));
assertEquals("'String''Value'", EdmSimpleTypeKind.String.getEdmSimpleTypeInstance().toUriLiteral("String'Value"));
- assertEquals("'String''''''Value'", EdmSimpleTypeKind.String.getEdmSimpleTypeInstance().toUriLiteral("String'''Value"));
+ assertEquals("'String''''''Value'", EdmSimpleTypeKind.String.getEdmSimpleTypeInstance().toUriLiteral(
+ "String'''Value"));
}
@Test
@@ -378,7 +398,8 @@ public class EdmSimpleTypeTest extends BaseTest {
return facets;
}
- private void expectErrorInValueToString(final EdmSimpleType instance, final Object value, final EdmLiteralKind literalKind, final EdmFacets facets, final MessageReference messageReference) {
+ private void expectErrorInValueToString(final EdmSimpleType instance, final Object value,
+ final EdmLiteralKind literalKind, final EdmFacets facets, final MessageReference messageReference) {
try {
instance.valueToString(value, literalKind, facets);
fail("Expected exception not thrown");
@@ -399,7 +420,8 @@ public class EdmSimpleTypeTest extends BaseTest {
assertNull(instance.valueToString(null, EdmLiteralKind.DEFAULT, getNullableFacets(true)));
assertNull(instance.valueToString(null, EdmLiteralKind.DEFAULT, getNullableFacets(null)));
- expectErrorInValueToString(instance, null, EdmLiteralKind.DEFAULT, getNullableFacets(false), EdmSimpleTypeException.VALUE_NULL_NOT_ALLOWED);
+ expectErrorInValueToString(instance, null, EdmLiteralKind.DEFAULT, getNullableFacets(false),
+ EdmSimpleTypeException.VALUE_NULL_NOT_ALLOWED);
}
}
@@ -438,17 +460,23 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("qrvM3e7/", instance.valueToString(binary, EdmLiteralKind.DEFAULT, getMaxLengthFacets(6)));
assertEquals("qrvM3e7/", instance.valueToString(binary, EdmLiteralKind.JSON, getMaxLengthFacets(6)));
assertEquals("binary'AABBCCDDEEFF'", instance.valueToString(binary, EdmLiteralKind.URI, getMaxLengthFacets(6)));
- assertEquals("qrvM3e7/", instance.valueToString(binary, EdmLiteralKind.DEFAULT, getMaxLengthFacets(Integer.MAX_VALUE)));
- assertEquals("binary'AABBCCDDEEFF'", instance.valueToString(binary, EdmLiteralKind.URI, getMaxLengthFacets(Integer.MAX_VALUE)));
+ assertEquals("qrvM3e7/", instance.valueToString(binary, EdmLiteralKind.DEFAULT,
+ getMaxLengthFacets(Integer.MAX_VALUE)));
+ assertEquals("binary'AABBCCDDEEFF'", instance.valueToString(binary, EdmLiteralKind.URI,
+ getMaxLengthFacets(Integer.MAX_VALUE)));
assertEquals("qrvM3e7/", instance.valueToString(binary, EdmLiteralKind.DEFAULT, getMaxLengthFacets(null)));
assertEquals("qg==", instance.valueToString(new Byte[] { new Byte((byte) 170) }, EdmLiteralKind.DEFAULT, null));
- expectErrorInValueToString(instance, binary, EdmLiteralKind.DEFAULT, getMaxLengthFacets(3), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, binary, EdmLiteralKind.JSON, getMaxLengthFacets(3), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, binary, EdmLiteralKind.URI, getMaxLengthFacets(3), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, binary, EdmLiteralKind.DEFAULT, getMaxLengthFacets(3),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, binary, EdmLiteralKind.JSON, getMaxLengthFacets(3),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, binary, EdmLiteralKind.URI, getMaxLengthFacets(3),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, binary, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -461,7 +489,8 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("true", instance.valueToString(true, EdmLiteralKind.URI, null));
assertEquals("false", instance.valueToString(Boolean.FALSE, EdmLiteralKind.DEFAULT, null));
- expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, false, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -477,9 +506,12 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("32", instance.valueToString(Integer.valueOf(32), EdmLiteralKind.DEFAULT, null));
assertEquals("255", instance.valueToString(255L, EdmLiteralKind.DEFAULT, null));
- expectErrorInValueToString(instance, -1, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, 256, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, -1, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, 256, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -508,18 +540,25 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("2012-02-29T23:32:03.007", instance.valueToString(new Date(millis), EdmLiteralKind.DEFAULT, null));
dateTime.add(Calendar.MILLISECOND, 9);
- assertEquals("2012-02-29T23:32:03.01", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null)));
+ assertEquals("2012-02-29T23:32:03.01", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(2, null)));
dateTime.add(Calendar.MILLISECOND, -10);
- assertEquals("2012-02-29T23:32:03", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null)));
+ assertEquals("2012-02-29T23:32:03", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(0, null)));
dateTime.add(Calendar.MILLISECOND, -13);
- assertEquals("2012-02-29T23:32:02.987", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, null)));
- assertEquals("2012-02-29T23:32:02.98700", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null)));
+ assertEquals("2012-02-29T23:32:02.987", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(null, null)));
+ assertEquals("2012-02-29T23:32:02.98700", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(5, null)));
dateTime.add(Calendar.MILLISECOND, 3);
- assertEquals("2012-02-29T23:32:02.99", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null)));
+ assertEquals("2012-02-29T23:32:02.99", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(2, null)));
dateTime.add(Calendar.MILLISECOND, -90);
- assertEquals("2012-02-29T23:32:02.9", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1, null)));
+ assertEquals("2012-02-29T23:32:02.9", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(1, null)));
dateTime.add(Calendar.MILLISECOND, 100);
- assertEquals("2012-02-29T23:32:03.0000000", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(7, null)));
+ assertEquals("2012-02-29T23:32:03.0000000", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(7, null)));
Calendar dateTime2 = Calendar.getInstance(TimeZone.getTimeZone("GMT-11:30"));
dateTime2.clear();
@@ -527,9 +566,11 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("/Date(-2000)/", instance.valueToString(dateTime2, EdmLiteralKind.JSON, null));
dateTime.add(Calendar.MILLISECOND, -100);
- expectErrorInValueToString(instance, dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, dateTime, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -548,12 +589,14 @@ public class EdmSimpleTypeTest extends BaseTest {
dateTime.setTimeZone(TimeZone.getTimeZone("GMT-1:30"));
assertEquals("2012-02-29T01:02:03-01:30", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, null));
assertEquals("/Date(1330477323000-0090)/", instance.valueToString(dateTime, EdmLiteralKind.JSON, null));
- assertEquals("datetimeoffset'2012-02-29T01:02:03-01:30'", instance.valueToString(dateTime, EdmLiteralKind.URI, null));
+ assertEquals("datetimeoffset'2012-02-29T01:02:03-01:30'", instance
+ .valueToString(dateTime, EdmLiteralKind.URI, null));
dateTime.setTimeZone(TimeZone.getTimeZone("GMT+11:00"));
assertEquals("2012-02-29T01:02:03+11:00", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, null));
assertEquals("/Date(1330477323000+0660)/", instance.valueToString(dateTime, EdmLiteralKind.JSON, null));
- assertEquals("datetimeoffset'2012-02-29T01:02:03+11:00'", instance.valueToString(dateTime, EdmLiteralKind.URI, null));
+ assertEquals("datetimeoffset'2012-02-29T01:02:03+11:00'", instance
+ .valueToString(dateTime, EdmLiteralKind.URI, null));
dateTime.set(1969, 11, 30, 11, 59, 58);
assertEquals("/Date(-129602000+0660)/", instance.valueToString(dateTime, EdmLiteralKind.JSON, null));
@@ -567,7 +610,8 @@ public class EdmSimpleTypeTest extends BaseTest {
final String time = date.toString().substring(11, 19);
assertTrue(instance.valueToString(date, EdmLiteralKind.DEFAULT, null).contains(time));
- expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, dateTime, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -582,10 +626,12 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("16", instance.valueToString((short) 16, EdmLiteralKind.DEFAULT, null));
assertEquals("32", instance.valueToString(Integer.valueOf(32), EdmLiteralKind.DEFAULT, null));
assertEquals("255", instance.valueToString(255L, EdmLiteralKind.DEFAULT, null));
- assertEquals("12345678901234567890123456789", instance.valueToString(new BigInteger("12345678901234567890123456789"), EdmLiteralKind.DEFAULT, null));
+ assertEquals("12345678901234567890123456789", instance.valueToString(
+ new BigInteger("12345678901234567890123456789"), EdmLiteralKind.DEFAULT, null));
assertEquals("0.00390625", instance.valueToString(1.0 / 256, EdmLiteralKind.DEFAULT, null));
assertEquals("-0.125", instance.valueToString(-0.125f, EdmLiteralKind.DEFAULT, null));
- assertEquals("-1234567890.1234567890", instance.valueToString(new BigDecimal("-1234567890.1234567890"), EdmLiteralKind.DEFAULT, null));
+ assertEquals("-1234567890.1234567890", instance.valueToString(new BigDecimal("-1234567890.1234567890"),
+ EdmLiteralKind.DEFAULT, null));
assertEquals("-32768", instance.valueToString(-32768, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, null)));
assertEquals("0.5", instance.valueToString(0.5, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, null)));
@@ -595,18 +641,28 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("32768", instance.valueToString(32768, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null)));
assertEquals("0.5", instance.valueToString(0.5, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1, null)));
assertEquals("0.5", instance.valueToString(0.5, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, 1)));
- assertEquals("100", instance.valueToString(new BigDecimal(BigInteger.ONE, -2), EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, null)));
-
- expectErrorInValueToString(instance, new BigInteger("123456789012345678901234567890"), EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, new BigDecimal(BigInteger.TEN, -28), EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, new BigDecimal(BigInteger.ONE, 30), EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, -1234, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, 1234, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, null), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, 0.00390625, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, 0.00390625, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, 7), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
-
- expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
- expectErrorInValueToString(instance, Double.NaN, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ assertEquals("100", instance.valueToString(new BigDecimal(BigInteger.ONE, -2), EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(3, null)));
+
+ expectErrorInValueToString(instance, new BigInteger("123456789012345678901234567890"), EdmLiteralKind.DEFAULT,
+ null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, new BigDecimal(BigInteger.TEN, -28), EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, new BigDecimal(BigInteger.ONE, 30), EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, -1234, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, 1234, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, null),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, 0.00390625, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, 0.00390625, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, 7),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+
+ expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, Double.NaN, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -626,13 +682,18 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("INF", instance.valueToString(Double.POSITIVE_INFINITY, EdmLiteralKind.DEFAULT, null));
assertEquals("-0.125", instance.valueToString(-0.125f, EdmLiteralKind.DEFAULT, null));
assertEquals("-INF", instance.valueToString(Float.NEGATIVE_INFINITY, EdmLiteralKind.DEFAULT, null));
- assertEquals("-1234567890.12345", instance.valueToString(new BigDecimal("-1234567890.12345"), EdmLiteralKind.DEFAULT, null));
-
- expectErrorInValueToString(instance, 1234567890123456L, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, new BigDecimal("1234567890123456"), EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, new BigDecimal(BigInteger.TEN, 400), EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
-
- expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ assertEquals("-1234567890.12345", instance.valueToString(new BigDecimal("-1234567890.12345"),
+ EdmLiteralKind.DEFAULT, null));
+
+ expectErrorInValueToString(instance, 1234567890123456L, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, new BigDecimal("1234567890123456"), EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, new BigDecimal(BigInteger.TEN, 400), EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+
+ expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -645,7 +706,8 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals(uuid.toString(), instance.valueToString(uuid, EdmLiteralKind.JSON, null));
assertEquals("guid'" + uuid.toString() + "'", instance.valueToString(uuid, EdmLiteralKind.URI, null));
- expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -661,10 +723,13 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("32", instance.valueToString(Integer.valueOf(32), EdmLiteralKind.DEFAULT, null));
assertEquals("255", instance.valueToString(255L, EdmLiteralKind.DEFAULT, null));
- expectErrorInValueToString(instance, 123456, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, -32769, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, 123456, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, -32769, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, 1.0, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 1.0, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -680,10 +745,13 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("32", instance.valueToString(Integer.valueOf(32), EdmLiteralKind.DEFAULT, null));
assertEquals("255", instance.valueToString(255L, EdmLiteralKind.DEFAULT, null));
- expectErrorInValueToString(instance, 12345678901L, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, -2147483649L, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, 12345678901L, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, -2147483649L, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, 1.0, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 1.0, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -699,12 +767,16 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("32", instance.valueToString(Integer.valueOf(32), EdmLiteralKind.DEFAULT, null));
assertEquals("255", instance.valueToString(255L, EdmLiteralKind.DEFAULT, null));
assertEquals("12345678901L", instance.valueToString(12345678901L, EdmLiteralKind.URI, null));
- assertEquals("1234567890123456789", instance.valueToString(new BigInteger("1234567890123456789"), EdmLiteralKind.DEFAULT, null));
- assertEquals("-1234567890123456789L", instance.valueToString(new BigInteger("-1234567890123456789"), EdmLiteralKind.URI, null));
+ assertEquals("1234567890123456789", instance.valueToString(new BigInteger("1234567890123456789"),
+ EdmLiteralKind.DEFAULT, null));
+ assertEquals("-1234567890123456789L", instance.valueToString(new BigInteger("-1234567890123456789"),
+ EdmLiteralKind.URI, null));
- expectErrorInValueToString(instance, new BigInteger("123456789012345678901"), EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, new BigInteger("123456789012345678901"), EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, 1.0, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 1.0, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -720,9 +792,12 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("32", instance.valueToString(Integer.valueOf(32), EdmLiteralKind.DEFAULT, null));
assertEquals("64", instance.valueToString(64L, EdmLiteralKind.DEFAULT, null));
- expectErrorInValueToString(instance, -129, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, 128, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, -129, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, 128, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -744,12 +819,17 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("-INF", instance.valueToString(Float.NEGATIVE_INFINITY, EdmLiteralKind.DEFAULT, null));
assertEquals("-12345.67", instance.valueToString(new BigDecimal("-12345.67"), EdmLiteralKind.DEFAULT, null));
- expectErrorInValueToString(instance, 12345678L, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, new BigDecimal("12345678"), EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, new BigDecimal(BigInteger.TEN, 39), EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
- expectErrorInValueToString(instance, 42e38, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
-
- expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, 12345678L, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, new BigDecimal("12345678"), EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, new BigDecimal(BigInteger.TEN, 39), EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+ expectErrorInValueToString(instance, 42e38, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_ILLEGAL_CONTENT);
+
+ expectErrorInValueToString(instance, 'A', EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, 1, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -768,8 +848,10 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals("text", instance.valueToString("text", EdmLiteralKind.DEFAULT, getMaxLengthFacets(Integer.MAX_VALUE)));
assertEquals("text", instance.valueToString("text", EdmLiteralKind.DEFAULT, getMaxLengthFacets(null)));
- expectErrorInValueToString(instance, "schräg", EdmLiteralKind.DEFAULT, getUnicodeFacets(false), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, "text", EdmLiteralKind.DEFAULT, getMaxLengthFacets(3), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, "schräg", EdmLiteralKind.DEFAULT, getUnicodeFacets(false),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, "text", EdmLiteralKind.DEFAULT, getMaxLengthFacets(3),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
expectErrorInValueToString(instance, "text", null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
@@ -801,22 +883,31 @@ public class EdmSimpleTypeTest extends BaseTest {
assertTrue(instance.valueToString(new Date(millis), EdmLiteralKind.DEFAULT, null).contains("M3.007S"));
dateTime.add(Calendar.MILLISECOND, -1);
- assertEquals("PT23H32M3S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null)));
- assertEquals("PT23H32M3.0S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1, null)));
+ assertEquals("PT23H32M3S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(0, null)));
+ assertEquals("PT23H32M3.0S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1,
+ null)));
dateTime.add(Calendar.MILLISECOND, 10);
- assertEquals("PT23H32M3.01S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null)));
+ assertEquals("PT23H32M3.01S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2,
+ null)));
dateTime.add(Calendar.MILLISECOND, -23);
- assertEquals("PT23H32M2.987S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, null)));
- assertEquals("PT23H32M2.98700S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null)));
+ assertEquals("PT23H32M2.987S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(
+ null, null)));
+ assertEquals("PT23H32M2.98700S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(
+ 5, null)));
dateTime.add(Calendar.MILLISECOND, -87);
- assertEquals("PT23H32M2.9S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1, null)));
+ assertEquals("PT23H32M2.9S", instance.valueToString(dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1,
+ null)));
- expectErrorInValueToString(instance, dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null), EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
- expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
+ expectErrorInValueToString(instance, dateTime, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null),
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+ expectErrorInValueToString(instance, 0, EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.VALUE_TYPE_NOT_SUPPORTED);
expectErrorInValueToString(instance, dateTime, null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
- private void expectErrorInValueOfString(final EdmSimpleType instance, final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final MessageReference messageReference) {
+ private void expectErrorInValueOfString(final EdmSimpleType instance, final String value,
+ final EdmLiteralKind literalKind, final EdmFacets facets, final MessageReference messageReference) {
try {
instance.valueOfString(value, literalKind, facets, instance.getDefaultType());
fail("Expected exception not thrown");
@@ -826,7 +917,8 @@ public class EdmSimpleTypeTest extends BaseTest {
}
}
- private void expectTypeErrorInValueOfString(final EdmSimpleType instance, final String value, final EdmLiteralKind literalKind) {
+ private void expectTypeErrorInValueOfString(final EdmSimpleType instance, final String value,
+ final EdmLiteralKind literalKind) {
try {
instance.valueOfString(value, literalKind, null, Class.class);
fail("Expected exception not thrown");
@@ -836,13 +928,15 @@ public class EdmSimpleTypeTest extends BaseTest {
}
}
- private void expectUnconvertibleErrorInValueOfString(final EdmSimpleType instance, final String value, final Class<?> type) {
+ private void expectUnconvertibleErrorInValueOfString(final EdmSimpleType instance, final String value,
+ final Class<?> type) {
try {
instance.valueOfString(value, EdmLiteralKind.DEFAULT, null, type);
fail("Expected exception not thrown");
} catch (EdmSimpleTypeException e) {
assertNotNull(e.getMessageReference());
- assertEquals(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.getKey(), e.getMessageReference().getKey());
+ assertEquals(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.getKey(), e.getMessageReference()
+ .getKey());
}
}
@@ -854,10 +948,13 @@ public class EdmSimpleTypeTest extends BaseTest {
}
final EdmSimpleType instance = kind.getEdmSimpleTypeInstance();
assertNull(instance.valueOfString(null, EdmLiteralKind.DEFAULT, null, instance.getDefaultType()));
- assertNull(instance.valueOfString(null, EdmLiteralKind.DEFAULT, getNullableFacets(true), instance.getDefaultType()));
- assertNull(instance.valueOfString(null, EdmLiteralKind.DEFAULT, getNullableFacets(null), instance.getDefaultType()));
+ assertNull(instance.valueOfString(null, EdmLiteralKind.DEFAULT, getNullableFacets(true), instance
+ .getDefaultType()));
+ assertNull(instance.valueOfString(null, EdmLiteralKind.DEFAULT, getNullableFacets(null), instance
+ .getDefaultType()));
- expectErrorInValueOfString(instance, null, EdmLiteralKind.DEFAULT, getNullableFacets(false), EdmSimpleTypeException.LITERAL_NULL_NOT_ALLOWED);
+ expectErrorInValueOfString(instance, null, EdmLiteralKind.DEFAULT, getNullableFacets(false),
+ EdmSimpleTypeException.LITERAL_NULL_NOT_ALLOWED);
expectErrorInValueOfString(instance, "", null, null, EdmSimpleTypeException.LITERAL_KIND_MISSING);
}
}
@@ -868,30 +965,51 @@ public class EdmSimpleTypeTest extends BaseTest {
final EdmSimpleType instance = EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance();
assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.DEFAULT, null, byte[].class)));
- assertTrue(Arrays.equals(new Byte[] { binary[0], binary[1], binary[2] }, instance.valueOfString("qrvM", EdmLiteralKind.JSON, null, Byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("binary'AABBCCDDEEFF'", EdmLiteralKind.URI, null, byte[].class)));
-
- assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.DEFAULT, getMaxLengthFacets(6), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.JSON, getMaxLengthFacets(6), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("binary'AABBCCDDEEFF'", EdmLiteralKind.URI, getMaxLengthFacets(6), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("X'AABBCCDDEEFF'", EdmLiteralKind.URI, getMaxLengthFacets(6), byte[].class)));
- assertTrue(Arrays.equals(new byte[] { 42 }, instance.valueOfString("Kg==", EdmLiteralKind.DEFAULT, getMaxLengthFacets(1), byte[].class)));
- assertTrue(Arrays.equals(new byte[] { 1, 2 }, instance.valueOfString("AQI=", EdmLiteralKind.JSON, getMaxLengthFacets(2), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM\r\n3e7/\r\n", EdmLiteralKind.DEFAULT, getMaxLengthFacets(6), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.DEFAULT, getMaxLengthFacets(Integer.MAX_VALUE), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("X'AABBCCDDEEFF'", EdmLiteralKind.URI, getMaxLengthFacets(Integer.MAX_VALUE), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.DEFAULT, getMaxLengthFacets(null), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.JSON, getMaxLengthFacets(null), byte[].class)));
- assertTrue(Arrays.equals(binary, instance.valueOfString("X'AABBCCDDEEFF'", EdmLiteralKind.URI, getMaxLengthFacets(null), byte[].class)));
-
- expectErrorInValueOfString(instance, "qrvM3e7/", EdmLiteralKind.DEFAULT, getMaxLengthFacets(3), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "qrvM3e7/", EdmLiteralKind.JSON, getMaxLengthFacets(3), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "binary'AABBCCDDEEFF'", EdmLiteralKind.URI, getMaxLengthFacets(3), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
-
- expectErrorInValueOfString(instance, "@", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "@", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "binary'ZZ'", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "Y'AA'", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ assertTrue(Arrays.equals(new Byte[] { binary[0], binary[1], binary[2] }, instance.valueOfString("qrvM",
+ EdmLiteralKind.JSON, null, Byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("binary'AABBCCDDEEFF'", EdmLiteralKind.URI, null,
+ byte[].class)));
+
+ assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.DEFAULT, getMaxLengthFacets(6),
+ byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.JSON, getMaxLengthFacets(6),
+ byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("binary'AABBCCDDEEFF'", EdmLiteralKind.URI,
+ getMaxLengthFacets(6), byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("X'AABBCCDDEEFF'", EdmLiteralKind.URI,
+ getMaxLengthFacets(6), byte[].class)));
+ assertTrue(Arrays.equals(new byte[] { 42 }, instance.valueOfString("Kg==", EdmLiteralKind.DEFAULT,
+ getMaxLengthFacets(1), byte[].class)));
+ assertTrue(Arrays.equals(new byte[] { 1, 2 }, instance.valueOfString("AQI=", EdmLiteralKind.JSON,
+ getMaxLengthFacets(2), byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM\r\n3e7/\r\n", EdmLiteralKind.DEFAULT,
+ getMaxLengthFacets(6), byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.DEFAULT,
+ getMaxLengthFacets(Integer.MAX_VALUE), byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("X'AABBCCDDEEFF'", EdmLiteralKind.URI,
+ getMaxLengthFacets(Integer.MAX_VALUE), byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.DEFAULT,
+ getMaxLengthFacets(null), byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7/", EdmLiteralKind.JSON, getMaxLengthFacets(null),
+ byte[].class)));
+ assertTrue(Arrays.equals(binary, instance.valueOfString("X'AABBCCDDEEFF'", EdmLiteralKind.URI,
+ getMaxLengthFacets(null), byte[].class)));
+
+ expectErrorInValueOfString(instance, "qrvM3e7/", EdmLiteralKind.DEFAULT, getMaxLengthFacets(3),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "qrvM3e7/", EdmLiteralKind.JSON, getMaxLengthFacets(3),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "binary'AABBCCDDEEFF'", EdmLiteralKind.URI, getMaxLengthFacets(3),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+
+ expectErrorInValueOfString(instance, "@", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "@", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "binary'ZZ'", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "Y'AA'", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "qrvM3e7/", EdmLiteralKind.DEFAULT);
}
@@ -905,9 +1023,12 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals(true, instance.valueOfString("1", EdmLiteralKind.URI, null, Boolean.class));
assertEquals(false, instance.valueOfString("0", EdmLiteralKind.URI, null, Boolean.class));
- expectErrorInValueOfString(instance, "True", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "-1", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "FALSE", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "True", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "-1", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "FALSE", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "1", EdmLiteralKind.DEFAULT);
}
@@ -922,11 +1043,16 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals(Short.valueOf((short) 255), instance.valueOfString("255", EdmLiteralKind.URI, null, Short.class));
assertEquals(Long.valueOf(0), instance.valueOfString("0", EdmLiteralKind.DEFAULT, null, Long.class));
- expectErrorInValueOfString(instance, "0x42", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "abc", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "256", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "-1", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1.0", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "0x42", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "abc", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "256", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "-1", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1.0", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "1", EdmLiteralKind.DEFAULT);
expectUnconvertibleErrorInValueOfString(instance, "128", Byte.class);
@@ -941,29 +1067,43 @@ public class EdmSimpleTypeTest extends BaseTest {
dateTime.setTimeZone(TimeZone.getTimeZone("GMT"));
dateTime.set(2012, 1, 29, 23, 32, 3);
assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:03", EdmLiteralKind.DEFAULT, null, Calendar.class));
- assertEquals(Long.valueOf(dateTime.getTimeInMillis()), instance.valueOfString("2012-02-29T23:32:03", EdmLiteralKind.JSON, null, Long.class));
+ assertEquals(Long.valueOf(dateTime.getTimeInMillis()), instance.valueOfString("2012-02-29T23:32:03",
+ EdmLiteralKind.JSON, null, Long.class));
assertEquals(dateTime, instance.valueOfString("/Date(1330558323000)/", EdmLiteralKind.JSON, null, Calendar.class));
- assertEquals(Long.valueOf(dateTime.getTimeInMillis()), instance.valueOfString("/Date(1330558323000)/", EdmLiteralKind.JSON, null, Long.class));
- assertEquals(dateTime.getTime(), instance.valueOfString("/Date(1330558323000)/", EdmLiteralKind.JSON, null, Date.class));
- assertEquals(dateTime.getTime(), instance.valueOfString("datetime'2012-02-29T23:32:03'", EdmLiteralKind.URI, null, Date.class));
+ assertEquals(Long.valueOf(dateTime.getTimeInMillis()), instance.valueOfString("/Date(1330558323000)/",
+ EdmLiteralKind.JSON, null, Long.class));
+ assertEquals(dateTime.getTime(), instance.valueOfString("/Date(1330558323000)/", EdmLiteralKind.JSON, null,
+ Date.class));
+ assertEquals(dateTime.getTime(), instance.valueOfString("datetime'2012-02-29T23:32:03'", EdmLiteralKind.URI, null,
+ Date.class));
dateTime.add(Calendar.MILLISECOND, 1);
- assertEquals(Long.valueOf(dateTime.getTimeInMillis()), instance.valueOfString("2012-02-29T23:32:03.001", EdmLiteralKind.DEFAULT, null, Long.class));
- assertEquals(dateTime.getTime(), instance.valueOfString("/Date(1330558323001)/", EdmLiteralKind.JSON, null, Date.class));
- assertEquals(dateTime, instance.valueOfString("datetime'2012-02-29T23:32:03.001'", EdmLiteralKind.URI, null, Calendar.class));
+ assertEquals(Long.valueOf(dateTime.getTimeInMillis()), instance.valueOfString("2012-02-29T23:32:03.001",
+ EdmLiteralKind.DEFAULT, null, Long.class));
+ assertEquals(dateTime.getTime(), instance.valueOfString("/Date(1330558323001)/", EdmLiteralKind.JSON, null,
+ Date.class));
+ assertEquals(dateTime, instance.valueOfString("datetime'2012-02-29T23:32:03.001'", EdmLiteralKind.URI, null,
+ Calendar.class));
dateTime.add(Calendar.MILLISECOND, 9);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:03.01", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null), Calendar.class));
- assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:03.0100000", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null), Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:03.01", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(2, null), Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:03.0100000", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(2, null), Calendar.class));
dateTime.add(Calendar.MILLISECOND, -10);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:03.000", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null), Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:03.000", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(0, null), Calendar.class));
dateTime.add(Calendar.MILLISECOND, -13);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:02.987", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, null), Calendar.class));
- assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:02.98700", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null), Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:02.987", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(null, null), Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:02.98700", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(5, null), Calendar.class));
dateTime.add(Calendar.MILLISECOND, 3);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:02.99", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null), Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:02.99", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(2, null), Calendar.class));
dateTime.add(Calendar.MILLISECOND, -90);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:02.9", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1, null), Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32:02.9", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(1, null), Calendar.class));
dateTime.add(Calendar.MILLISECOND, -2900);
assertEquals(dateTime, instance.valueOfString("2012-02-29T23:32", EdmLiteralKind.DEFAULT, null, Calendar.class));
@@ -972,21 +1112,36 @@ public class EdmSimpleTypeTest extends BaseTest {
dateTime.set(1969, 11, 31, 23, 59, 18);
assertEquals(dateTime, instance.valueOfString("/Date(-42000)/", EdmLiteralKind.JSON, null, Calendar.class));
- expectErrorInValueOfString(instance, "2012-02-29T23:32:02.9", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "2012-02-29T23:32:02.98700", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "2012-02-29T23:32:02.9876", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "2012-02-29T23:32:02.", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "2012-02-29T23:32:02.00000000", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "20120229T233202", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1900-02-29T00:00:00", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "2012-02-29T24:00:01", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "\\/Date(1)\\/", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "/Date(12345678901234567890)/", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "/Date(1330558323000+0060)/", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "datetime'2012-02-29T23:32:02+01:00'", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "date'2012-02-29T23:32:02'", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "datetime'2012-02-29T23:32:02", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "datetime'", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "2012-02-29T23:32:02.9", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0,
+ null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "2012-02-29T23:32:02.98700", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(
+ 2, null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "2012-02-29T23:32:02.9876", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "2012-02-29T23:32:02.", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "2012-02-29T23:32:02.00000000", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "20120229T233202", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1900-02-29T00:00:00", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "2012-02-29T24:00:01", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "\\/Date(1)\\/", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "/Date(12345678901234567890)/", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "/Date(1330558323000+0060)/", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "datetime'2012-02-29T23:32:02+01:00'", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "date'2012-02-29T23:32:02'", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "datetime'2012-02-29T23:32:02", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "datetime'", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "2012-02-29T23:32", EdmLiteralKind.DEFAULT);
expectTypeErrorInValueOfString(instance, "/Date(1)/", EdmLiteralKind.JSON);
@@ -1000,46 +1155,68 @@ public class EdmSimpleTypeTest extends BaseTest {
dateTime.clear();
dateTime.setTimeZone(TimeZone.getTimeZone("GMT"));
dateTime.set(2012, 1, 29, 1, 2, 3);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03Z", EdmLiteralKind.DEFAULT, null, Calendar.class));
- assertEquals(Long.valueOf(dateTime.getTimeInMillis()), instance.valueOfString("2012-02-29T01:02:03+00:00", EdmLiteralKind.DEFAULT, null, Long.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03Z",
+ EdmLiteralKind.DEFAULT, null, Calendar.class));
+ assertEquals(Long.valueOf(dateTime.getTimeInMillis()), instance.valueOfString("2012-02-29T01:02:03+00:00",
+ EdmLiteralKind.DEFAULT, null, Long.class));
assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03", EdmLiteralKind.DEFAULT, null, Calendar.class));
assertEquals(dateTime, instance.valueOfString("/Date(1330477323000)/", EdmLiteralKind.JSON, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("/Date(1330477323000-0000)/", EdmLiteralKind.JSON, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("datetimeoffset'2012-02-29T01:02:03Z'", EdmLiteralKind.URI, null, Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("/Date(1330477323000-0000)/", EdmLiteralKind.JSON, null,
+ Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("datetimeoffset'2012-02-29T01:02:03Z'", EdmLiteralKind.URI, null,
+ Calendar.class));
dateTime.clear();
dateTime.setTimeZone(TimeZone.getTimeZone("GMT-01:30"));
dateTime.set(2012, 1, 29, 1, 2, 3);
- assertEquals(dateTime.getTime(), instance.valueOfString("2012-02-29T01:02:03-01:30", EdmLiteralKind.DEFAULT, null, Date.class));
- assertEquals(dateTime, instance.valueOfString("/Date(1330477323000-0090)/", EdmLiteralKind.JSON, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("datetimeoffset'2012-02-29T01:02:03-01:30'", EdmLiteralKind.URI, null, Calendar.class));
+ assertEquals(dateTime.getTime(), instance.valueOfString("2012-02-29T01:02:03-01:30", EdmLiteralKind.DEFAULT, null,
+ Date.class));
+ assertEquals(dateTime, instance.valueOfString("/Date(1330477323000-0090)/", EdmLiteralKind.JSON, null,
+ Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("datetimeoffset'2012-02-29T01:02:03-01:30'", EdmLiteralKind.URI,
+ null, Calendar.class));
dateTime.clear();
dateTime.setTimeZone(TimeZone.getTimeZone("GMT+11:00"));
dateTime.set(2012, 1, 29, 1, 2, 3);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03+11:00", EdmLiteralKind.DEFAULT, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("/Date(1330477323000+0660)/", EdmLiteralKind.JSON, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("datetimeoffset'2012-02-29T01:02:03+11:00'", EdmLiteralKind.URI, null, Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03+11:00", EdmLiteralKind.DEFAULT, null,
+ Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("/Date(1330477323000+0660)/", EdmLiteralKind.JSON, null,
+ Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("datetimeoffset'2012-02-29T01:02:03+11:00'", EdmLiteralKind.URI,
+ null, Calendar.class));
dateTime.add(Calendar.MILLISECOND, 7);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03.007+11:00", EdmLiteralKind.DEFAULT, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("/Date(1330477323007+0660)/", EdmLiteralKind.JSON, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("datetimeoffset'2012-02-29T01:02:03.007+11:00'", EdmLiteralKind.URI, null, Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03.007+11:00", EdmLiteralKind.DEFAULT, null,
+ Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("/Date(1330477323007+0660)/", EdmLiteralKind.JSON, null,
+ Calendar.class));
+ assertEquals(dateTime, instance.valueOfString("datetimeoffset'2012-02-29T01:02:03.007+11:00'", EdmLiteralKind.URI,
+ null, Calendar.class));
dateTime.clear();
dateTime.setTimeZone(TimeZone.getTimeZone("GMT+11:00"));
dateTime.set(1969, 11, 31, 23, 59, 18);
assertEquals(dateTime, instance.valueOfString("/Date(-42000+0660)/", EdmLiteralKind.JSON, null, Calendar.class));
- expectErrorInValueOfString(instance, "2012-02-29T23:32:02.9Z", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0, null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "datetime'2012-02-29T23:32:02'", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "2012-02-29T23:32:02X", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "2012-02-29T23:32:02+24:00", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "/Date(12345678901234567890)/", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "/Date(1234567890-1440)/", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "/Date(1234567890Z)/", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "datetimeoffset'", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "datetimeoffset''Z", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "2012-02-29T23:32:02.9Z", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(0,
+ null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "datetime'2012-02-29T23:32:02'", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "2012-02-29T23:32:02X", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "2012-02-29T23:32:02+24:00", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "/Date(12345678901234567890)/", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "/Date(1234567890-1440)/", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "/Date(1234567890Z)/", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "datetimeoffset'", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "datetimeoffset''Z", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "2012-02-29T01:02:03Z", EdmLiteralKind.DEFAULT);
}
@@ -1050,34 +1227,57 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals(BigDecimal.ONE, instance.valueOfString("1", EdmLiteralKind.DEFAULT, null, BigDecimal.class));
assertEquals(Byte.valueOf((byte) -2), instance.valueOfString("-2", EdmLiteralKind.JSON, null, Byte.class));
- assertEquals(new BigDecimal("-12345678901234567890"), instance.valueOfString("-12345678901234567890M", EdmLiteralKind.URI, null, BigDecimal.class));
+ assertEquals(new BigDecimal("-12345678901234567890"), instance.valueOfString("-12345678901234567890M",
+ EdmLiteralKind.URI, null, BigDecimal.class));
assertEquals(Short.valueOf((short) 0), instance.valueOfString("0M", EdmLiteralKind.URI, null, Short.class));
- assertEquals(Integer.valueOf(-32768), instance.valueOfString("-32768", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(42, null), Integer.class));
- assertEquals(Long.valueOf(-32768), instance.valueOfString("-32768", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null), Long.class));
- assertEquals(BigInteger.valueOf(32768), instance.valueOfString("32768", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null), BigInteger.class));
- assertEquals(Double.valueOf(0.5), instance.valueOfString("0.5", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1, null), Double.class));
- assertEquals(Float.valueOf(0.5F), instance.valueOfString("0.5", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, 1), Float.class));
- assertEquals(new BigDecimal("12.3"), instance.valueOfString("12.3", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, 1), BigDecimal.class));
-
- expectErrorInValueOfString(instance, "-1234", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "1234", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "12.34", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "12.34", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, 2), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "12.34", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(4, 1), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "0.00390625", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
- expectErrorInValueOfString(instance, "0.00390625", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, 7), EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
-
- expectErrorInValueOfString(instance, "-1E2", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1.", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, ".1", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1.0.1", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1M", EdmLiteralKind.JSON, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ assertEquals(Integer.valueOf(-32768), instance.valueOfString("-32768", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(42, null), Integer.class));
+ assertEquals(Long.valueOf(-32768), instance.valueOfString("-32768", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(5, null), Long.class));
+ assertEquals(BigInteger.valueOf(32768), instance.valueOfString("32768", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(5, null), BigInteger.class));
+ assertEquals(Double.valueOf(0.5), instance.valueOfString("0.5", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(1,
+ null), Double.class));
+ assertEquals(Float.valueOf(0.5F), instance.valueOfString("0.5", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(
+ null, 1), Float.class));
+ assertEquals(new BigDecimal("12.3"), instance.valueOfString("12.3", EdmLiteralKind.DEFAULT,
+ getPrecisionScaleFacets(3, 1), BigDecimal.class));
+
+ expectErrorInValueOfString(instance, "-1234", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(2, null),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "1234", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, null),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "12.34", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, null),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "12.34", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(3, 2),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "12.34", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(4, 1),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "0.00390625", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(5, null),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+ expectErrorInValueOfString(instance, "0.00390625", EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(null, 7),
+ EdmSimpleTypeException.LITERAL_FACETS_NOT_MATCHED);
+
+ expectErrorInValueOfString(instance, "-1E2", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1.", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, ".1", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1.0.1", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1M", EdmLiteralKind.JSON, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectErrorInValueOfString(instance, "0", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1.0D", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "0F", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "0x42", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "123456789012345678901234567890", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1.0D", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "0F", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "0x42", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "123456789012345678901234567890", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "1", EdmLiteralKind.DEFAULT);
expectUnconvertibleErrorInValueOfString(instance, "-129", Byte.class);
@@ -1104,18 +1304,27 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals(Byte.valueOf((byte) 0), instance.valueOfString("0", EdmLiteralKind.JSON, null, Byte.class));
assertEquals(Short.valueOf((short) 1), instance.valueOfString("1.00", EdmLiteralKind.DEFAULT, null, Short.class));
assertEquals(Integer.valueOf(42), instance.valueOfString("4.2E1", EdmLiteralKind.DEFAULT, null, Integer.class));
- assertEquals(Long.valueOf(1234567890), instance.valueOfString("1234567890E-00", EdmLiteralKind.DEFAULT, null, Long.class));
+ assertEquals(Long.valueOf(1234567890), instance.valueOfString("1234567890E-00", EdmLiteralKind.DEFAULT, null,
+ Long.class));
assertEquals(Double.valueOf(Double.NaN), instance.valueOfString("NaN", EdmLiteralKind.DEFAULT, null, Double.class));
- assertEquals(Double.valueOf(Double.NEGATIVE_INFINITY), instance.valueOfString("-INF", EdmLiteralKind.JSON, null, Double.class));
- assertEquals(Double.valueOf(Double.POSITIVE_INFINITY), instance.valueOfString("INF", EdmLiteralKind.URI, null, Double.class));
-
- expectErrorInValueOfString(instance, "42E400", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "42.42.42", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "42.42.42D", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "42F", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "42", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "0x42P42", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ assertEquals(Double.valueOf(Double.NEGATIVE_INFINITY), instance.valueOfString("-INF", EdmLiteralKind.JSON, null,
+ Double.class));
+ assertEquals(Double.valueOf(Double.POSITIVE_INFINITY), instance.valueOfString("INF", EdmLiteralKind.URI, null,
+ Double.class));
+
+ expectErrorInValueOfString(instance, "42E400", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "42.42.42", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "42.42.42D", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "42F", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "42", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "0x42P42", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "1.42", EdmLiteralKind.DEFAULT);
expectUnconvertibleErrorInValueOfString(instance, "INF", BigDecimal.class);
@@ -1142,12 +1351,17 @@ public class EdmSimpleTypeTest extends BaseTest {
final EdmSimpleType instance = EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance();
final UUID uuid = UUID.fromString("aabbccdd-aabb-ccdd-eeff-aabbccddeeff");
- assertEquals(uuid, instance.valueOfString("aabbccdd-aabb-ccdd-eeff-aabbccddeeff", EdmLiteralKind.DEFAULT, null, UUID.class));
- assertEquals(uuid, instance.valueOfString("AABBCCDD-AABB-CCDD-EEFF-AABBCCDDEEFF", EdmLiteralKind.JSON, null, UUID.class));
- assertEquals(uuid, instance.valueOfString("guid'AABBCCDD-aabb-ccdd-eeff-AABBCCDDEEFF'", EdmLiteralKind.URI, null, UUID.class));
+ assertEquals(uuid, instance.valueOfString("aabbccdd-aabb-ccdd-eeff-aabbccddeeff", EdmLiteralKind.DEFAULT, null,
+ UUID.class));
+ assertEquals(uuid, instance.valueOfString("AABBCCDD-AABB-CCDD-EEFF-AABBCCDDEEFF", EdmLiteralKind.JSON, null,
+ UUID.class));
+ assertEquals(uuid, instance.valueOfString("guid'AABBCCDD-aabb-ccdd-eeff-AABBCCDDEEFF'", EdmLiteralKind.URI, null,
+ UUID.class));
- expectErrorInValueOfString(instance, "AABBCCDDAABBCCDDEEFFAABBCCDDEEFF", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "uid'AABBCCDD-aabb-ccdd-eeff-AABBCCDDEEFF'", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "AABBCCDDAABBCCDDEEFFAABBCCDDEEFF", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "uid'AABBCCDD-aabb-ccdd-eeff-AABBCCDDEEFF'", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, uuid.toString(), EdmLiteralKind.DEFAULT);
}
@@ -1158,13 +1372,16 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals(Byte.valueOf((byte) 1), instance.valueOfString("1", EdmLiteralKind.DEFAULT, null, Byte.class));
assertEquals(Short.valueOf((short) 2), instance.valueOfString("2", EdmLiteralKind.JSON, null, Short.class));
- assertEquals(Short.valueOf((short) -32768), instance.valueOfString("-32768", EdmLiteralKind.URI, null, Short.class));
+ assertEquals(Short.valueOf((short) -32768), instance.valueOfString("-32768",
+ EdmLiteralKind.URI, null, Short.class));
assertEquals(Short.valueOf((short) 32767), instance.valueOfString("32767", EdmLiteralKind.URI, null, Short.class));
assertEquals(Integer.valueOf(0), instance.valueOfString("0", EdmLiteralKind.DEFAULT, null, Integer.class));
assertEquals(Long.valueOf(-1), instance.valueOfString("-1", EdmLiteralKind.DEFAULT, null, Long.class));
- expectErrorInValueOfString(instance, "32768", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1.0", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "32768", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1.0", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "1", EdmLiteralKind.DEFAULT);
expectUnconvertibleErrorInValueOfString(instance, "-129", Byte.class);
@@ -1177,11 +1394,14 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals(Byte.valueOf((byte) 1), instance.valueOfString("1", EdmLiteralKind.DEFAULT, null, Byte.class));
assertEquals(Short.valueOf((short) 2), instance.valueOfString("2", EdmLiteralKind.JSON, null, Short.class));
- assertEquals(Integer.valueOf(-10000000), instance.valueOfString("-10000000", EdmLiteralKind.URI, null, Integer.class));
+ assertEquals(Integer.valueOf(-10000000), instance.valueOfString("-10000000", EdmLiteralKind.URI, null,
+ Integer.class));
assertEquals(Long.valueOf(10000000), instance.valueOfString("10000000", EdmLiteralKind.URI, null, Long.class));
- expectErrorInValueOfString(instance, "-2147483649", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1.0", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "-2147483649", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1.0", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "1", EdmLiteralKind.DEFAULT);
expectUnconvertibleErrorInValueOfString(instance, "-129", Byte.class);
@@ -1196,16 +1416,22 @@ public class EdmSimpleTypeTest extends BaseTest {
assertEquals(Short.valueOf((short) 1), instance.valueOfString("1", EdmLiteralKind.DEFAULT, null, Short.class));
assertEquals(Integer.valueOf(2), instance.valueOfString("2", EdmLiteralKind.JSON, null, Integer.class));
- assertEquals(Long.valueOf(-1234567890123456789L), instance.valueOfString("-1234567890123456789L", EdmLiteralKind.URI, null, Long.class));
+ assertEquals(Long.valueOf(-1234567890123456789L), instance.valueOfString("-1234567890123456789L",
+ EdmLiteralKind.URI, null, Long.class));
assertEquals(BigInteger.ONE, instance.valueOfString("1", EdmLiteralKind.DEFAULT, null, BigInteger.class));
assertEquals(Long.valueOf(0), instance.valueOfString("0l", EdmLiteralKind.URI, null, Long.class));
assertEquals(Byte.valueOf((byte) 0), instance.valueOfString("0L", EdmLiteralKind.URI, null, Byte.class));
- expectErrorInValueOfString(instance, "-12345678901234567890", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1.0", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "1.0L", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "0M", EdmLiteralKind.URI, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
- expectErrorInValueOfString(instance, "0x42", EdmLiteralKind.DEFAULT, null, EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "-12345678901234567890", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1.0", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "1.0L", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "0M", EdmLiteralKind.URI, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
+ expectErrorInValueOfString(instance, "0x42", EdmLiteralKind.DEFAULT, null,
+ EdmSimpleTypeException.LITERAL_ILLEGAL_CONTENT);
expectTypeErrorInValueOfString(instance, "1", EdmLiteralKind.DEFAULT);
<TRUNCATED>
[15/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
index 3777ffa..001e7f1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -46,7 +46,8 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void singleSimpleType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
final ODataResponse response = new JsonEntityProvider().writeFunctionImport(functionImport, 42, null);
assertNotNull(response);
@@ -60,7 +61,8 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void singleComplexType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MostCommonLocation");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MostCommonLocation");
Map<String, Object> cityData = new HashMap<String, Object>();
cityData.put("PostalCode", "8392");
cityData.put("CityName", "Å");
@@ -84,9 +86,11 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void collectionOfSimpleTypes() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllUsedRoomIds");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllUsedRoomIds");
- final ODataResponse response = new JsonEntityProvider().writeFunctionImport(functionImport, Arrays.asList("1", "2", "3"), null);
+ final ODataResponse response =
+ new JsonEntityProvider().writeFunctionImport(functionImport, Arrays.asList("1", "2", "3"), null);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -100,7 +104,8 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void collectionOfComplexTypes() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllLocations");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllLocations");
Map<String, Object> locationData = new HashMap<String, Object>();
locationData.put("Country", "NO");
List<Map<String, Object>> locations = new ArrayList<Map<String, Object>>();
@@ -122,7 +127,8 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void singleEntityType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("OldestEmployee");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("OldestEmployee");
final String uri = "http://host:80/service/";
final EntityProviderWriteProperties properties =
EntityProviderWriteProperties.serviceRoot(URI.create(uri)).build();
@@ -130,7 +136,8 @@ public class JsonFunctionImportTest extends BaseTest {
employeeData.put("EmployeeId", "1");
employeeData.put("getImageType", "image/jpeg");
- final ODataResponse response = new JsonEntityProvider().writeFunctionImport(functionImport, employeeData, properties);
+ final ODataResponse response =
+ new JsonEntityProvider().writeFunctionImport(functionImport, employeeData, properties);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
index ac7b71f..b23ac7b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
index 36832ad..bef9ecb 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
index 0a00f91..ac31a80 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -46,7 +46,8 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeString() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, "\"Игорь\tНиколаевич\tЛарионов\"");
assertNotNull(response);
@@ -64,7 +65,8 @@ public class JsonPropertyProducerTest extends BaseTest {
char[] chars = new char[32768];
Arrays.fill(chars, 0, 32768, 'a');
String propertyValue = new String(chars);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, propertyValue);
assertNotNull(response);
@@ -79,21 +81,24 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeNumber() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, 42);
assertEquals("{\"d\":{\"Age\":42}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
}
@Test
public void serializeBinary() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Building").getProperty("Image");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Building").getProperty("Image");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, new byte[] { 42, -42 });
assertEquals("{\"d\":{\"Image\":\"KtY=\"}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
}
@Test
public void serializeBinaryWithContentType() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("Image");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("Image");
Map<String, Object> content = new HashMap<String, Object>();
content.put("getImageType", "image/jpeg");
content.put("Image", new byte[] { 1, 2, 3 });
@@ -103,14 +108,17 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeBoolean() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Team").getProperty("isScrumTeam");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Team").getProperty("isScrumTeam");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, false);
- assertEquals("{\"d\":{\"isScrumTeam\":false}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
+ assertEquals("{\"d\":{\"isScrumTeam\":false}}", StringHelper
+ .inputStreamToString((InputStream) response.getEntity()));
}
@Test
public void serializeNull() throws Exception {
- EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("ImageUrl");
+ EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("ImageUrl");
ODataResponse response = new JsonEntityProvider().writeProperty(property, null);
assertEquals("{\"d\":{\"ImageUrl\":null}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
@@ -129,16 +137,19 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeDateTime() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
Calendar dateTime = Calendar.getInstance();
dateTime.setTimeInMillis(-42);
final ODataResponse response = new JsonEntityProvider().writeProperty(property, dateTime);
- assertEquals("{\"d\":{\"EntryDate\":\"\\/Date(-42)\\/\"}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
+ assertEquals("{\"d\":{\"EntryDate\":\"\\/Date(-42)\\/\"}}", StringHelper.inputStreamToString((InputStream) response
+ .getEntity()));
}
@Test
public void serializeComplexProperty() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
Map<String, Object> cityData = new LinkedHashMap<String, Object>();
cityData.put("PostalCode", "8392");
cityData.put("CityName", "Å");
@@ -155,7 +166,8 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeComplexPropertyNull() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, null);
assertEquals("{\"d\":{\"Location\":{\"__metadata\":{\"type\":\"RefScenario.c_Location\"},"
+ "\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},"
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
index eaf4e8c..038f561 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
index 364a8ae..bdea75a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -56,16 +56,21 @@ public class MyCallback implements OnWriteEntryContent, OnWriteFeedContent {
if ("Rooms".equals(context.getSourceEntitySet().getName())) {
if ("nr_Employees".equals(context.getNavigationProperty().getName())) {
HashMap<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
- for (String navPropName : context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty()).getEntityType().getNavigationPropertyNames()) {
+ for (String navPropName : context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty())
+ .getEntityType().getNavigationPropertyNames()) {
callbacks.put(navPropName, this);
}
- EntityProviderWriteProperties inlineProperties = EntityProviderWriteProperties.serviceRoot(baseUri).callbacks(callbacks).expandSelectTree(context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
+ EntityProviderWriteProperties inlineProperties =
+ EntityProviderWriteProperties.serviceRoot(baseUri).callbacks(callbacks).expandSelectTree(
+ context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
result.setFeedData(dataProvider.getEmployeesData());
result.setInlineProperties(inlineProperties);
}
} else if ("Buildings".equals(context.getSourceEntitySet().getName())) {
- EntityProviderWriteProperties inlineProperties = EntityProviderWriteProperties.serviceRoot(baseUri).expandSelectTree(context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
+ EntityProviderWriteProperties inlineProperties =
+ EntityProviderWriteProperties.serviceRoot(baseUri).expandSelectTree(
+ context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
List<Map<String, Object>> emptyData = new ArrayList<Map<String, Object>>();
result.setFeedData(emptyData);
result.setInlineProperties(inlineProperties);
@@ -83,10 +88,13 @@ public class MyCallback implements OnWriteEntryContent, OnWriteFeedContent {
if ("Employees".equals(context.getSourceEntitySet().getName())) {
if ("ne_Room".equals(context.getNavigationProperty().getName())) {
HashMap<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
- for (String navPropName : context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty()).getEntityType().getNavigationPropertyNames()) {
+ for (String navPropName : context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty())
+ .getEntityType().getNavigationPropertyNames()) {
callbacks.put(navPropName, this);
}
- EntityProviderWriteProperties inlineProperties = EntityProviderWriteProperties.serviceRoot(baseUri).callbacks(callbacks).expandSelectTree(context.getCurrentExpandSelectTreeNode()).build();
+ EntityProviderWriteProperties inlineProperties =
+ EntityProviderWriteProperties.serviceRoot(baseUri).callbacks(callbacks).expandSelectTree(
+ context.getCurrentExpandSelectTreeNode()).build();
result.setEntryData(dataProvider.getRoomData());
result.setInlineProperties(inlineProperties);
} else if ("ne_Team".equals(context.getNavigationProperty().getName())) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java
index bfe4a54..fb04f70 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -69,7 +69,8 @@ public class ServiceDocumentProducerTest extends AbstractXmlProducerTestHelper {
@Test
public void testServiceDocumentXml() throws EntityProviderException, ODataException {
- ODataResponse response = EntityProvider.writeServiceDocument(HttpContentType.APPLICATION_ATOM_XML, edm, "http://localhost/");
+ ODataResponse response =
+ EntityProvider.writeServiceDocument(HttpContentType.APPLICATION_ATOM_XML, edm, "http://localhost/");
assertNull("EntityProvider should not set content header", response.getContentHeader());
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java
index f65c13f..81cbd2f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java
index 7414d4c..11fc21a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -67,12 +67,14 @@ public class TombstoneProducerTest extends AbstractProviderTest {
OutputStream outStream = csb.getOutputStream();
writer = XMLOutputFactory.newInstance().createXMLStreamWriter(outStream, DEFAULT_CHARSET);
defaultProperties = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
- defaultEia = EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), defaultProperties.getExpandSelectTree());
+ defaultEia =
+ EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"),
+ defaultProperties.getExpandSelectTree());
}
@Test
public void oneDeletedEntryWithAllProperties() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
data.put("Id", "1");
@@ -80,9 +82,9 @@ public class TombstoneProducerTest extends AbstractProviderTest {
data.put("Seats", new Integer(20));
data.put("Version", new Integer(3));
deletedEntries.add(data);
- //Execute producer
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Rooms('1')", "/a:feed/at:deleted-entry/@ref", xml);
@@ -90,7 +92,7 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void twoDeletedEntriesWithAllProperties() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
data.put("Id", "1");
@@ -105,9 +107,9 @@ public class TombstoneProducerTest extends AbstractProviderTest {
data2.put("Seats", new Integer(20));
data2.put("Version", new Integer(3));
deletedEntries.add(data2);
- //Execute producer
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathExists("/a:feed/at:deleted-entry[@ref=\"http://host:80/service/Rooms('1')\"]", xml);
@@ -116,14 +118,14 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void oneDeletedEntryWithKeyProperties() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
data.put("Id", "1");
deletedEntries.add(data);
- //Execute producer
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Rooms('1')", "/a:feed/at:deleted-entry/@ref", xml);
@@ -131,21 +133,21 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test(expected = EntityProviderException.class)
public void oneDeletedEntryWithoutProperties() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
deletedEntries.add(data);
- //Execute producer
+ // Execute producer
execute(deletedEntries);
}
@Test
public void emptyEntryList() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
- //Execute producer
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed", xml);
assertXpathNotExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
@@ -153,13 +155,15 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void entryWithSyndicatedUpdatedMappingPresent() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
deletedEntries.add(employeeData);
- defaultEia = EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), defaultProperties.getExpandSelectTree());
- //Execute producer
+ defaultEia =
+ EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ defaultProperties.getExpandSelectTree());
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Employees('1')", "/a:feed/at:deleted-entry/@ref", xml);
@@ -168,15 +172,17 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void entryWithSyndicatedUpdatedMappingNotPresent() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
data.put("EmployeeId", "1");
deletedEntries.add(data);
- defaultEia = EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), defaultProperties.getExpandSelectTree());
- //Execute producer
+ defaultEia =
+ EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ defaultProperties.getExpandSelectTree());
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Employees('1')", "/a:feed/at:deleted-entry/@ref", xml);
@@ -185,14 +191,16 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void entryWithSyndicatedUpdatedMappingNull() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
employeeData.put("EntryDate", null);
deletedEntries.add(employeeData);
- defaultEia = EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), defaultProperties.getExpandSelectTree());
- //Execute producer
+ defaultEia =
+ EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ defaultProperties.getExpandSelectTree());
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Employees('1')", "/a:feed/at:deleted-entry/@ref", xml);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
index 6049ccc..85538ce 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -219,8 +219,11 @@ public class XmlErrorProducerTest extends AbstractXmlProducerTestHelper {
}
}
- private void serializeError(final String errorCode, final String message, final String innerError, final Locale locale) throws Exception {
- ODataResponse response = new AtomEntityProvider().writeErrorDocument(expectedStatus, errorCode, message, locale, innerError);
+ private void
+ serializeError(final String errorCode, final String message, final String innerError, final Locale locale)
+ throws Exception {
+ ODataResponse response =
+ new AtomEntityProvider().writeErrorDocument(expectedStatus, errorCode, message, locale, innerError);
String errorXml = verifyResponse(response);
verifyXml(errorCode, message, locale, innerError, errorXml);
}
@@ -237,7 +240,8 @@ public class XmlErrorProducerTest extends AbstractXmlProducerTestHelper {
return xmlString;
}
- private void verifyXml(final String errorCode, final String message, final Locale locale, final String innerError, final String errorXml) throws Exception {
+ private void verifyXml(final String errorCode, final String message, final Locale locale, final String innerError,
+ final String errorXml) throws Exception {
assertXpathExists("/a:error", errorXml);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java
index c8221e1..c9ff16a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -89,9 +89,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Rooms('1')", "nr_Employees", "nr_Employees");
HashMap<String, ODataCallback> callbacksRoom = createCallbacks("Rooms");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -107,7 +111,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ODataCallback employeeCallback = new OnWriteFeedContent() {
@Override
- public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) throws ODataApplicationException {
+ public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
+ throws ODataApplicationException {
WriteFeedCallbackResult writeFeedCallbackResult = new WriteFeedCallbackResult();
writeFeedCallbackResult.setInlineProperties(DEFAULT_PROPERTIES);
writeFeedCallbackResult.setFeedData(null);
@@ -115,9 +120,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
}
};
callbacksRoom.put("nr_Employees", employeeCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -135,7 +144,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ODataCallback employeeCallback = new OnWriteFeedContent() {
@Override
- public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) throws ODataApplicationException {
+ public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
+ throws ODataApplicationException {
WriteFeedCallbackResult writeFeedCallbackResult = new WriteFeedCallbackResult();
writeFeedCallbackResult.setInlineProperties(DEFAULT_PROPERTIES);
writeFeedCallbackResult.setFeedData(new ArrayList<Map<String, Object>>());
@@ -143,9 +153,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
}
};
callbacksRoom.put("nr_Employees", employeeCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -159,9 +173,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Rooms('1')", "nr_Employees", "nr_Employees");
HashMap<String, ODataCallback> callbacksRoom = createCallbacks("Rooms");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -175,25 +193,35 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Rooms('1')", "nr_Employees/ne_Room", "nr_Employees/ne_Room");
HashMap<String, ODataCallback> callbacksRoom = createCallbacks("Rooms");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
assertXpathExists(employeeXPathString, xmlString);
assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString, xmlString);
- assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString + "/m:inline/a:entry/a:content/m:properties", xmlString);
+ assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString
+ + "/m:inline/a:entry/a:content/m:properties", xmlString);
}
@Test
public void deepExpandSelectedEmployeesWithRoomId() throws Exception {
- ExpandSelectTreeNode selectTree = getSelectExpandTree("Rooms('1')", "nr_Employees/ne_Room/Id", "nr_Employees/ne_Room");
+ ExpandSelectTreeNode selectTree =
+ getSelectExpandTree("Rooms('1')", "nr_Employees/ne_Room/Id", "nr_Employees/ne_Room");
HashMap<String, ODataCallback> callbacksRoom = createCallbacks("Rooms");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -201,7 +229,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString, xmlString);
assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString + "/m:inline", xmlString);
assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString + "/m:inline/a:entry", xmlString);
- assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString + "/m:inline/a:entry/a:content/m:properties/d:Id", xmlString);
+ assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString
+ + "/m:inline/a:entry/a:content/m:properties/d:Id", xmlString);
}
@Test
@@ -209,9 +238,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Employees('1')", "ne_Room", "ne_Room");
HashMap<String, ODataCallback> callbacksEmployee = createCallbacks("Employees");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
verifyNavigationProperties(xmlString, F, T, F);
@@ -224,9 +257,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Employees('1')", "ne_Team", "ne_Team");
HashMap<String, ODataCallback> callbacksEmployee = createCallbacks("Employees");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
verifyNavigationProperties(xmlString, F, F, T);
@@ -243,7 +280,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
OnWriteEntryContent callback = new OnWriteEntryContent() {
@Override
- public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context) throws ODataApplicationException {
+ public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context)
+ throws ODataApplicationException {
WriteEntryCallbackResult result = new WriteEntryCallbackResult();
result.setInlineProperties(DEFAULT_PROPERTIES);
result.setEntryData(new HashMap<String, Object>());
@@ -251,9 +289,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
}
};
callbacksEmployee.put("ne_Team", callback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
verifyNavigationProperties(xmlString, F, F, T);
@@ -267,9 +309,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Buildings('1')", "nb_Rooms", "nb_Rooms");
HashMap<String, ODataCallback> callbacksEmployee = createCallbacks("Buildings");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Buildings"), buildingData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Buildings"),
+ buildingData, properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -291,15 +337,20 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
HashMap<String, ODataCallback> callbacksBuilding = new HashMap<String, ODataCallback>();
callbacksBuilding.put("nb_Rooms", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksBuilding).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksBuilding)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Buildings"), buildingData, properties);
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Buildings"), buildingData,
+ properties);
}
- private HashMap<String, ODataCallback> createCallbacks(final String entitySetName) throws EdmException, ODataException {
+ private HashMap<String, ODataCallback> createCallbacks(final String entitySetName) throws EdmException,
+ ODataException {
HashMap<String, ODataCallback> callbacksEmployee = new HashMap<String, ODataCallback>();
MyCallback callback = new MyCallback(this, inlineBaseUri);
- for (String navPropName : MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet(entitySetName).getEntityType().getNavigationPropertyNames()) {
+ for (String navPropName : MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet(entitySetName)
+ .getEntityType().getNavigationPropertyNames()) {
callbacksEmployee.put(navPropName, callback);
}
return callbacksEmployee;
@@ -309,9 +360,12 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
public void expandSelectedRoomWithoutCallback() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Employees('1')", "ne_Room", "ne_Room");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
verifyNavigationProperties(xmlString, F, T, F);
@@ -325,12 +379,16 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
HashMap<String, ODataCallback> callbacksEmployee = new HashMap<String, ODataCallback>();
callbacksEmployee.put("ne_Room", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ properties);
}
- private void verifyEmployees(final String path, final String xmlString) throws XpathException, IOException, SAXException {
+ private void verifyEmployees(final String path, final String xmlString) throws XpathException, IOException,
+ SAXException {
assertXpathExists(path, xmlString);
assertXpathExists(path + "/m:inline", xmlString);
@@ -377,7 +435,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
assertXpathExists(path + "/m:inline/a:entry/a:content/m:properties/d:Version", xmlString);
}
- private void verifyNavigationProperties(final String xmlString, final boolean neManager, final boolean neRoom, final boolean neTeam) throws IOException, SAXException, XpathException {
+ private void verifyNavigationProperties(final String xmlString, final boolean neManager, final boolean neRoom,
+ final boolean neTeam) throws IOException, SAXException, XpathException {
if (neManager) {
assertXpathExists("/a:entry/a:link[@href=\"Employees('1')/ne_Manager\" and @title='ne_Manager']", xmlString);
} else {
@@ -403,7 +462,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
return xmlString;
}
- private ExpandSelectTreeNode getSelectExpandTree(final String pathSegment, final String selectString, final String expandString) throws Exception {
+ private ExpandSelectTreeNode getSelectExpandTree(final String pathSegment, final String selectString,
+ final String expandString) throws Exception {
Edm edm = RuntimeDelegate.createEdm(new EdmTestProvider());
UriParserImpl uriParser = new UriParserImpl(edm);
@@ -420,7 +480,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
}
UriInfo uriInfo = uriParser.parse(pathSegments, queryParameters);
- ExpandSelectTreeCreator expandSelectTreeCreator = new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
+ ExpandSelectTreeCreator expandSelectTreeCreator =
+ new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
ExpandSelectTreeNode expandSelectTree = expandSelectTreeCreator.create();
assertNotNull(expandSelectTree);
return expandSelectTree;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java
index 1b3d830..ae88009 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -55,7 +55,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
initializeRoomData(2);
initializeCallbacks();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
@@ -68,7 +69,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
initializeRoomData(4);
initializeCallbacks();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
@@ -83,7 +85,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
callbacks = new HashMap<String, ODataCallback>();
callbacks.put(TombstoneCallback.CALLBACK_KEY_TOMBSTONE, tombstoneCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
@@ -94,16 +97,19 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
public void deltaLinkPresent() throws Exception {
initializeRoomData(2);
initializeDeletedRoomData();
- TombstoneCallback tombstoneCallback = new TombstoneCallbackImpl(deletedRoomsData, BASE_URI.toASCIIString() + "Rooms?!deltatoken=1234");
+ TombstoneCallback tombstoneCallback =
+ new TombstoneCallbackImpl(deletedRoomsData, BASE_URI.toASCIIString() + "Rooms?!deltatoken=1234");
callbacks = new HashMap<String, ODataCallback>();
callbacks.put(TombstoneCallback.CALLBACK_KEY_TOMBSTONE, tombstoneCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
assertXpathExists("/a:feed/at:deleted-entry", xmlString);
- assertXpathExists("/a:feed/a:link[@rel=\"delta\" and @href=\"" + BASE_URI.toASCIIString() + "Rooms?!deltatoken=1234" + "\"]", xmlString);
+ assertXpathExists("/a:feed/a:link[@rel=\"delta\" and @href=\"" + BASE_URI.toASCIIString()
+ + "Rooms?!deltatoken=1234" + "\"]", xmlString);
}
@Test
@@ -114,7 +120,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
callbacks = new HashMap<String, ODataCallback>();
callbacks.put(TombstoneCallback.CALLBACK_KEY_TOMBSTONE, tombstoneCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
@@ -122,7 +129,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
assertXpathNotExists("/a:feed/a:link[@rel=\"http://odata.org/delta\" and @href]", xmlString);
}
- private String execute(final EntityProviderWriteProperties properties, final EdmEntitySet entitySet) throws EntityProviderException, IOException {
+ private String execute(final EntityProviderWriteProperties properties, final EdmEntitySet entitySet)
+ throws EntityProviderException, IOException {
ODataResponse response = EntityProvider.writeFeed("application/atom+xml", entitySet, roomsData, properties);
assertNotNull(response);
String xmlString = StringHelper.inputStreamToString((InputStream) response.getEntity());
@@ -134,7 +142,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
initializeRoomData(1);
initializeCallbacks();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
index 126a7b4..de71435 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -44,9 +44,11 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void singleSimpleType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, employeeData.get("Age"), DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider().writeFunctionImport(functionImport, employeeData.get("Age"), DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -60,9 +62,12 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void singleComplexType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MostCommonLocation");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MostCommonLocation");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, employeeData.get("Location"), DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider()
+ .writeFunctionImport(functionImport, employeeData.get("Location"), DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -77,9 +82,12 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void collectionOfSimpleTypes() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllUsedRoomIds");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllUsedRoomIds");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, Arrays.asList("1", "2", "3"), DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider()
+ .writeFunctionImport(functionImport, Arrays.asList("1", "2", "3"), DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -95,9 +103,12 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void collectionOfComplexTypes() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllLocations");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllLocations");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, Arrays.asList(employeeData.get("Location")), DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider().writeFunctionImport(functionImport, Arrays.asList(employeeData.get("Location")),
+ DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -113,9 +124,11 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void singleEntityType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("OldestEmployee");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("OldestEmployee");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, employeeData, DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider().writeFunctionImport(functionImport, employeeData, DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntityProvider should not set content header", response.getContentHeader());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
index 9dd2a27..df36b95 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
[34/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java
index 4f81303..118727c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Int16.
- *
+ *
*/
public class EdmInt16 extends AbstractSimpleType {
@@ -50,7 +50,8 @@ public class EdmInt16 extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
Short valueShort;
try {
valueShort = Short.parseShort(value);
@@ -64,7 +65,8 @@ public class EdmInt16 extends AbstractSimpleType {
if (valueShort >= Byte.MIN_VALUE && valueShort <= Byte.MAX_VALUE) {
return returnType.cast(valueShort.byteValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (returnType.isAssignableFrom(Integer.class)) {
return returnType.cast(valueShort.intValue());
@@ -76,7 +78,8 @@ public class EdmInt16 extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof Byte || value instanceof Short) {
return value.toString();
} else if (value instanceof Integer || value instanceof Long) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java
index ce2fcbd..b75e931 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Int32.
- *
+ *
*/
public class EdmInt32 extends AbstractSimpleType {
@@ -51,7 +51,8 @@ public class EdmInt32 extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
Integer valueInteger;
try {
valueInteger = Integer.parseInt(value);
@@ -65,13 +66,15 @@ public class EdmInt32 extends AbstractSimpleType {
if (valueInteger >= Byte.MIN_VALUE && valueInteger <= Byte.MAX_VALUE) {
return returnType.cast(valueInteger.byteValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (returnType.isAssignableFrom(Short.class)) {
if (valueInteger >= Short.MIN_VALUE && valueInteger <= Short.MAX_VALUE) {
return returnType.cast(valueInteger.shortValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (returnType.isAssignableFrom(Long.class)) {
return returnType.cast(valueInteger.longValue());
@@ -81,7 +84,8 @@ public class EdmInt32 extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof Byte || value instanceof Short || value instanceof Integer) {
return value.toString();
} else if (value instanceof Long) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java
index ef3f0a1..48297ba 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Int64.
- *
+ *
*/
public class EdmInt64 extends AbstractSimpleType {
@@ -54,7 +54,8 @@ public class EdmInt64 extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
Long valueLong;
try {
if (literalKind == EdmLiteralKind.URI) {
@@ -76,19 +77,22 @@ public class EdmInt64 extends AbstractSimpleType {
if (valueLong >= Byte.MIN_VALUE && valueLong <= Byte.MAX_VALUE) {
return returnType.cast(valueLong.byteValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (returnType.isAssignableFrom(Short.class)) {
if (valueLong >= Short.MIN_VALUE && valueLong <= Short.MAX_VALUE) {
return returnType.cast(valueLong.shortValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (returnType.isAssignableFrom(Integer.class)) {
if (valueLong >= Integer.MIN_VALUE && valueLong <= Integer.MAX_VALUE) {
return returnType.cast(valueLong.intValue());
} else {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
}
} else if (returnType.isAssignableFrom(BigInteger.class)) {
return returnType.cast(BigInteger.valueOf(valueLong));
@@ -98,7 +102,8 @@ public class EdmInt64 extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof Byte || value instanceof Short || value instanceof Integer || value instanceof Long) {
return value.toString();
} else if (value instanceof BigInteger) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java
index b33eb32..2808089 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the simple type Null.
- *
+ *
*/
public class EdmNull extends AbstractSimpleType {
@@ -50,12 +50,14 @@ public class EdmNull extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
return null;
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java
index 78c040c..ef1e56b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type SByte.
- *
+ *
*/
public class EdmSByte extends AbstractSimpleType {
@@ -48,7 +48,8 @@ public class EdmSByte extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
Byte valueByte;
try {
valueByte = Byte.parseByte(value);
@@ -70,7 +71,8 @@ public class EdmSByte extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof Byte) {
return value.toString();
} else if (value instanceof Short || value instanceof Integer || value instanceof Long) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
index e078097..4a237ef 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -54,7 +54,9 @@ public class EdmSimpleTypeFacadeImpl implements EdmSimpleTypeFacade {
if (uriLiteral.matches("-?\\p{Digit}+")) {
try {
- final int i = getEdmSimpleType(EdmSimpleTypeKind.Int32).valueOfString(uriLiteral, EdmLiteralKind.URI, null, Integer.class);
+ final int i =
+ getEdmSimpleType(EdmSimpleTypeKind.Int32)
+ .valueOfString(uriLiteral, EdmLiteralKind.URI, null, Integer.class);
if (i == 0 || i == 1) {
return new EdmLiteral(getInternalEdmSimpleTypeByString("Bit"), uriLiteral);
}
@@ -117,7 +119,8 @@ public class EdmSimpleTypeFacadeImpl implements EdmSimpleTypeFacade {
throw new EdmLiteralException(EdmLiteralException.UNKNOWNLITERAL.addContent(uriLiteral));
}
- private static EdmLiteral createEdmLiteral(final EdmSimpleTypeKind typeKind, final String literal, final int prefixLength, final int suffixLength) throws EdmLiteralException {
+ private static EdmLiteral createEdmLiteral(final EdmSimpleTypeKind typeKind, final String literal,
+ final int prefixLength, final int suffixLength) throws EdmLiteralException {
final EdmSimpleType type = getEdmSimpleType(typeKind);
if (type.validate(literal, EdmLiteralKind.URI, null)) {
return new EdmLiteral(type, literal.substring(prefixLength, literal.length() - suffixLength));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
index 257e7f8..cb8cc5f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type Single.
- *
+ *
*/
public class EdmSingle extends AbstractSimpleType {
@@ -64,7 +64,8 @@ public class EdmSingle extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
String valueString = value;
Float result = null;
// Handle special values first.
@@ -104,7 +105,8 @@ public class EdmSingle extends AbstractSimpleType {
return returnType.cast(Double.valueOf(valueString));
}
} else if (result.isInfinite() || result.isNaN()) {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType));
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType));
} else {
try {
final BigDecimal valueBigDecimal = new BigDecimal(valueString);
@@ -123,13 +125,15 @@ public class EdmSingle extends AbstractSimpleType {
}
} catch (final ArithmeticException e) {
- throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType), e);
+ throw new EdmSimpleTypeException(EdmSimpleTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value,
+ returnType), e);
}
}
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
if (value instanceof Long || value instanceof Integer) {
if (Math.abs(((Number) value).longValue()) < Math.pow(10, MAX_PRECISION)) {
return value.toString();
@@ -148,7 +152,8 @@ public class EdmSingle extends AbstractSimpleType {
}
} else if (value instanceof Float) {
final String result = value.toString();
- return ((Float) value).isInfinite() ? result.toUpperCase(Locale.ROOT).substring(0, value.toString().length() - 5) : result;
+ return ((Float) value).isInfinite() ? result.toUpperCase(Locale.ROOT).substring(0, value.toString().length() - 5)
+ : result;
} else if (value instanceof BigDecimal) {
if (((BigDecimal) value).precision() <= MAX_PRECISION && Math.abs(((BigDecimal) value).scale()) <= MAX_SCALE) {
return ((BigDecimal) value).toString();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java
index ac43aac..0be9b64 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the EDM simple type String.
- *
+ *
*/
public class EdmString extends AbstractSimpleType {
@@ -43,7 +43,8 @@ public class EdmString extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
String result;
if (literalKind == EdmLiteralKind.URI) {
if (value.length() >= 2 && value.startsWith("'") && value.endsWith("'")) {
@@ -69,7 +70,8 @@ public class EdmString extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
final String result = value instanceof String ? (String) value : String.valueOf(value);
if (facets != null
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java
index 217e772..7b7680b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
* The time value is interpreted and formatted as local time.</p>
* <p>Formatting simply ignores the year, month, and day parts of time instances.
* Parsing returns a Calendar object where all unused fields have been cleared.</p>
- *
+ *
*/
public class EdmTime extends AbstractSimpleType {
@@ -52,7 +52,8 @@ public class EdmTime extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
Calendar valueCalendar;
if (literalKind == EdmLiteralKind.URI) {
if (value.length() > 6 && value.startsWith("time'") && value.endsWith("'")) {
@@ -113,7 +114,8 @@ public class EdmTime extends AbstractSimpleType {
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
Calendar dateTimeValue;
if (value instanceof Date) {
dateTimeValue = Calendar.getInstance();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java
index 9c3f801..7416d62 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm;
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
/**
* Implementation of the internal simple type "unsigned 7-bit integer".
- *
+ *
*/
public class Uint7 extends AbstractSimpleType {
@@ -52,12 +52,14 @@ public class Uint7 extends AbstractSimpleType {
}
@Override
- protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets, final Class<T> returnType) throws EdmSimpleTypeException {
+ protected <T> T internalValueOfString(final String value, final EdmLiteralKind literalKind, final EdmFacets facets,
+ final Class<T> returnType) throws EdmSimpleTypeException {
return EdmSByte.getInstance().internalValueOfString(value, literalKind, facets, returnType);
}
@Override
- protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets) throws EdmSimpleTypeException {
+ protected <T> String internalValueToString(final T value, final EdmLiteralKind literalKind, final EdmFacets facets)
+ throws EdmSimpleTypeException {
return EdmSByte.getInstance().internalValueToString(value, literalKind, facets);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProv.java
index 9c22cfd..c4e7905 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -32,7 +32,8 @@ public class EdmAnnotationsImplProv implements EdmAnnotations {
private List<AnnotationAttribute> annotationAttributes;
private List<? extends EdmAnnotationElement> annotationElements;
- public EdmAnnotationsImplProv(final List<AnnotationAttribute> annotationAttributes, final List<AnnotationElement> annotationElements) {
+ public EdmAnnotationsImplProv(final List<AnnotationAttribute> annotationAttributes,
+ final List<AnnotationElement> annotationElements) {
this.annotationAttributes = annotationAttributes;
this.annotationElements = annotationElements;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProv.java
index 6030fa1..1abd033 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java
index 0415cf2..54942df 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -35,7 +35,8 @@ public class EdmAssociationImplProv extends EdmNamedImplProv implements EdmAssoc
private Association association;
private String namespace;
- public EdmAssociationImplProv(final EdmImplProv edm, final Association association, final String namespace) throws EdmException {
+ public EdmAssociationImplProv(final EdmImplProv edm, final Association association, final String namespace)
+ throws EdmException {
super(edm, association.getName());
this.association = association;
this.namespace = namespace;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProv.java
index 4bbc1f7..58d07c4 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProv.java
index a831615..88ef9da 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -34,7 +34,8 @@ public class EdmAssociationSetImplProv extends EdmNamedImplProv implements EdmAs
private AssociationSet associationSet;
private EdmEntityContainer edmEntityContainer;
- public EdmAssociationSetImplProv(final EdmImplProv edm, final AssociationSet associationSet, final EdmEntityContainer edmEntityContainer) throws EdmException {
+ public EdmAssociationSetImplProv(final EdmImplProv edm, final AssociationSet associationSet,
+ final EdmEntityContainer edmEntityContainer) throws EdmException {
super(edm, associationSet.getName());
this.associationSet = associationSet;
this.edmEntityContainer = edmEntityContainer;
@@ -42,7 +43,8 @@ public class EdmAssociationSetImplProv extends EdmNamedImplProv implements EdmAs
@Override
public EdmAssociation getAssociation() throws EdmException {
- EdmAssociation association = edm.getAssociation(associationSet.getAssociation().getNamespace(), associationSet.getAssociation().getName());
+ EdmAssociation association =
+ edm.getAssociation(associationSet.getAssociation().getNamespace(), associationSet.getAssociation().getName());
if (association == null) {
throw new EdmException(EdmException.COMMON);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java
index 285760a..0340587 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProv.java
index 72f294f..718047d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -26,7 +26,8 @@ import org.apache.olingo.odata2.api.edm.provider.ComplexType;
public class EdmComplexTypeImplProv extends EdmStructuralTypeImplProv implements EdmComplexType {
- public EdmComplexTypeImplProv(final EdmImplProv edm, final ComplexType complexType, final String namespace) throws EdmException {
+ public EdmComplexTypeImplProv(final EdmImplProv edm, final ComplexType complexType, final String namespace)
+ throws EdmException {
super(edm, complexType, EdmTypeKind.COMPLEX, namespace);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java
index c26f8fd..d756082 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -33,8 +33,10 @@ public abstract class EdmElementImplProv extends EdmTypedImplProv implements Edm
private EdmFacets edmFacets;
private EdmMapping edmMapping;
- public EdmElementImplProv(final EdmImplProv edm, final String name, final FullQualifiedName typeName, final EdmFacets edmFacets, final EdmMapping edmMapping) throws EdmException {
- super(edm, name, typeName, (edmFacets == null || edmFacets.isNullable() == null) || edmFacets.isNullable() ? EdmMultiplicity.ZERO_TO_ONE : EdmMultiplicity.ONE);
+ public EdmElementImplProv(final EdmImplProv edm, final String name, final FullQualifiedName typeName,
+ final EdmFacets edmFacets, final EdmMapping edmMapping) throws EdmException {
+ super(edm, name, typeName, (edmFacets == null || edmFacets.isNullable() == null) || edmFacets.isNullable()
+ ? EdmMultiplicity.ZERO_TO_ONE : EdmMultiplicity.ONE);
this.edmFacets = edmFacets;
this.edmMapping = edmMapping;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
index ae0b1c3..6df353a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -50,7 +50,8 @@ public class EdmEntityContainerImplProv implements EdmEntityContainer, EdmAnnota
private EdmEntityContainer edmExtendedEntityContainer;
private boolean isDefaultContainer;
- public EdmEntityContainerImplProv(final EdmImplProv edm, final EntityContainerInfo entityContainer) throws EdmException {
+ public EdmEntityContainerImplProv(final EdmImplProv edm, final EntityContainerInfo entityContainer)
+ throws EdmException {
this.edm = edm;
this.entityContainer = entityContainer;
edmEntitySets = new HashMap<String, EdmEntitySet>();
@@ -126,7 +127,8 @@ public class EdmEntityContainerImplProv implements EdmEntityContainer, EdmAnnota
}
@Override
- public EdmAssociationSet getAssociationSet(final EdmEntitySet sourceEntitySet, final EdmNavigationProperty navigationProperty) throws EdmException {
+ public EdmAssociationSet getAssociationSet(final EdmEntitySet sourceEntitySet,
+ final EdmNavigationProperty navigationProperty) throws EdmException {
EdmAssociation edmAssociation = navigationProperty.getRelationship();
String association = edmAssociation.getNamespace() + "." + edmAssociation.getName();
String entitySetName = sourceEntitySet.getName();
@@ -140,9 +142,12 @@ public class EdmEntityContainerImplProv implements EdmEntityContainer, EdmAnnota
}
AssociationSet associationSet;
- FullQualifiedName associationFQName = new FullQualifiedName(edmAssociation.getNamespace(), edmAssociation.getName());
+ FullQualifiedName associationFQName =
+ new FullQualifiedName(edmAssociation.getNamespace(), edmAssociation.getName());
try {
- associationSet = edm.edmProvider.getAssociationSet(entityContainer.getName(), associationFQName, entitySetName, entitySetFromRole);
+ associationSet =
+ edm.edmProvider.getAssociationSet(entityContainer.getName(), associationFQName, entitySetName,
+ entitySetFromRole);
} catch (ODataException e) {
throw new EdmException(EdmException.PROVIDERPROBLEM, e);
}
@@ -179,6 +184,7 @@ public class EdmEntityContainerImplProv implements EdmEntityContainer, EdmAnnota
@Override
public EdmAnnotations getAnnotations() throws EdmException {
- return new EdmAnnotationsImplProv(entityContainer.getAnnotationAttributes(), entityContainer.getAnnotationElements());
+ return new EdmAnnotationsImplProv(entityContainer.getAnnotationAttributes(), entityContainer
+ .getAnnotationElements());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetImplProv.java
index d864b5c..fda8fe8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -37,7 +37,8 @@ public class EdmEntitySetImplProv extends EdmNamedImplProv implements EdmEntityS
private EdmEntityContainer edmEntityContainer;
private EdmEntityType edmEntityType;
- public EdmEntitySetImplProv(final EdmImplProv edm, final EntitySet entitySet, final EdmEntityContainer edmEntityContainer) throws EdmException {
+ public EdmEntitySetImplProv(final EdmImplProv edm, final EntitySet entitySet,
+ final EdmEntityContainer edmEntityContainer) throws EdmException {
super(edm, entitySet.getName());
this.entitySet = entitySet;
this.edmEntityContainer = edmEntityContainer;
@@ -57,7 +58,8 @@ public class EdmEntitySetImplProv extends EdmNamedImplProv implements EdmEntityS
@Override
public EdmEntitySet getRelatedEntitySet(final EdmNavigationProperty navigationProperty) throws EdmException {
- EdmAssociationSet associationSet = edmEntityContainer.getAssociationSet(edmEntityContainer.getEntitySet(entitySet.getName()), navigationProperty);
+ EdmAssociationSet associationSet =
+ edmEntityContainer.getAssociationSet(edmEntityContainer.getEntitySet(entitySet.getName()), navigationProperty);
EdmAssociationSetEnd toEnd = associationSet.getEnd(navigationProperty.getToRole());
if (toEnd == null) {
throw new EdmException(EdmException.COMMON);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProv.java
index 85a6177..2d7127d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -33,7 +33,8 @@ public class EdmEntitySetInfoImplProv implements EdmEntitySetInfo {
private final String entityContainerName;
private final boolean isDefaultEntityContainer;
- public EdmEntitySetInfoImplProv(final EntitySet entitySet, final EntityContainerInfo entityContainerInfo) throws EdmException {
+ public EdmEntitySetInfoImplProv(final EntitySet entitySet, final EntityContainerInfo entityContainerInfo)
+ throws EdmException {
entityContainerName = entityContainerInfo.getName();
isDefaultEntityContainer = entityContainerInfo.isDefaultEntityContainer();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProv.java
index de82bb0..90b273b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -45,7 +45,8 @@ public class EdmEntityTypeImplProv extends EdmStructuralTypeImplProv implements
private Map<String, NavigationProperty> navigationProperties;
private List<String> edmNavigationPropertyNames;
- public EdmEntityTypeImplProv(final EdmImplProv edm, final EntityType entityType, final String namespace) throws EdmException {
+ public EdmEntityTypeImplProv(final EdmImplProv edm, final EntityType entityType, final String namespace)
+ throws EdmException {
super(edm, entityType, EdmTypeKind.ENTITY, namespace);
this.entityType = entityType;
@@ -76,7 +77,7 @@ public class EdmEntityTypeImplProv extends EdmStructuralTypeImplProv implements
edmKeyPropertyNames.add(keyProperty.getName());
}
} else {
- //Entity Type does not define a key
+ // Entity Type does not define a key
throw new EdmException(EdmException.COMMON);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
index 67ddc44..9ec2f34 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -49,7 +49,8 @@ public class EdmFunctionImportImplProv extends EdmNamedImplProv implements EdmFu
private Map<String, FunctionImportParameter> parameters;
private List<String> parametersList;
- public EdmFunctionImportImplProv(final EdmImplProv edm, final FunctionImport functionImport, final EdmEntityContainer edmEntityContainer) throws EdmException {
+ public EdmFunctionImportImplProv(final EdmImplProv edm, final FunctionImport functionImport,
+ final EdmEntityContainer edmEntityContainer) throws EdmException {
super(edm, functionImport.getName());
this.functionImport = functionImport;
this.edmEntityContainer = edmEntityContainer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProv.java
index df47202..60ecc83 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
[28/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
index 7476839..b5006fd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.core.ep.ProviderFacadeImpl;
/**
* Creates an error response according to the format defined by the OData standard
* if an exception occurs that is not handled elsewhere.
- *
+ *
*/
@Provider
public class ODataExceptionMapperImpl implements ExceptionMapper<Exception> {
@@ -88,12 +88,14 @@ public class ODataExceptionMapperImpl implements ExceptionMapper<Exception> {
}
private ODataResponse handleException(final Exception exception) {
- ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(uriInfo, httpHeaders, servletConfig, servletRequest);
+ ODataExceptionWrapper exceptionWrapper =
+ new ODataExceptionWrapper(uriInfo, httpHeaders, servletConfig, servletRequest);
ODataResponse oDataResponse = exceptionWrapper.wrapInExceptionResponse(exception);
return oDataResponse;
}
- private ODataResponse handleWebApplicationException(final Exception exception) throws ClassNotFoundException, InstantiationException, IllegalAccessException, EntityProviderException {
+ private ODataResponse handleWebApplicationException(final Exception exception) throws ClassNotFoundException,
+ InstantiationException, IllegalAccessException, EntityProviderException {
ODataErrorContext errorContext = createErrorContext((WebApplicationException) exception);
ODataErrorCallback callback = getErrorHandlerCallback();
return callback == null ?
@@ -160,8 +162,8 @@ public class ODataExceptionMapperImpl implements ExceptionMapper<Exception> {
if (DOLLAR_FORMAT_JSON.equals(contentTypeString)) {
contentType = ContentType.APPLICATION_JSON;
} else {
- //Any format mentioned in the $format parameter other than json results in an application/xml content type
- //for error messages due to the OData V2 Specification.
+ // Any format mentioned in the $format parameter other than json results in an application/xml content type
+ // for error messages due to the OData V2 Specification.
contentType = ContentType.APPLICATION_XML;
}
}
@@ -174,10 +176,13 @@ public class ODataExceptionMapperImpl implements ExceptionMapper<Exception> {
if (ContentType.isParseable(type.toString())) {
ContentType convertedContentType = ContentType.create(type.toString());
if (convertedContentType.isWildcard()
- || ContentType.APPLICATION_XML.equals(convertedContentType) || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
- || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType) || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
+ || ContentType.APPLICATION_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_XML;
- } else if (ContentType.APPLICATION_JSON.equals(convertedContentType) || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
+ } else if (ContentType.APPLICATION_JSON.equals(convertedContentType)
+ || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_JSON;
}
}
@@ -185,7 +190,8 @@ public class ODataExceptionMapperImpl implements ExceptionMapper<Exception> {
return ContentType.APPLICATION_XML;
}
- private ODataErrorCallback getErrorHandlerCallback() throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+ private ODataErrorCallback getErrorHandlerCallback() throws ClassNotFoundException, InstantiationException,
+ IllegalAccessException {
ODataErrorCallback callback = null;
final String factoryClassName = servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL);
if (factoryClassName != null) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
index 937b4c3..2ab44df 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
index 6f6018c..19595e7 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
@@ -39,14 +39,15 @@ import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
/**
* Default OData root locator responsible to handle the whole path and delegate all calls to a sub locator:<p>
- * <code>/{odata path} e.g. http://host:port/webapp/odata.svc/$metadata</code><br>
+ * <code>/{odata path} e.g. http://host:port/webapp/odata.svc/$metadata</code><br>
* All path segments defined by a servlet mapping belong to the odata uri.
* </p>
* This behavior can be changed:<p>
- * <code>/{custom path}{odata path} e.g. http://host:port/webapp/bmw/odata.svc/$metadata</code><br>
- * The first segment defined by a servlet mapping belong to customer context and the following segments are OData specific.
+ * <code>/{custom path}{odata path} e.g. http://host:port/webapp/bmw/odata.svc/$metadata</code><br>
+ * The first segment defined by a servlet mapping belong to customer context and the following segments are OData
+ * specific.
* </p>
- *
+ *
*/
public class ODataRootLocator {
@@ -63,14 +64,14 @@ public class ODataRootLocator {
/**
* Default root behavior which will delegate all paths to a ODataLocator.
- * @param pathSegments URI path segments - all segments have to be OData
- * @param xHttpMethod HTTP Header X-HTTP-Method for tunneling through POST
+ * @param pathSegments URI path segments - all segments have to be OData
+ * @param xHttpMethod HTTP Header X-HTTP-Method for tunneling through POST
* @param xHttpMethodOverride HTTP Header X-HTTP-Method-Override for tunneling through POST
* @return a locator handling OData protocol
- * @throws ODataException
- * @throws ClassNotFoundException
- * @throws IllegalAccessException
- * @throws InstantiationException
+ * @throws ODataException
+ * @throws ClassNotFoundException
+ * @throws IllegalAccessException
+ * @throws InstantiationException
*/
@Path("/{pathSegments: .*}")
public Object handleRequest(
@@ -83,7 +84,7 @@ public class ODataRootLocator {
/*
* X-HTTP-Method-Override : implemented by CXF
- * X-HTTP-Method : implemented in ODataSubLocator:handlePost
+ * X-HTTP-Method : implemented in ODataSubLocator:handlePost
*/
if (!xHttpMethod.equalsIgnoreCase(xHttpMethodOverride)) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
index 5a8dc19..3fe903a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
@@ -112,8 +112,10 @@ public final class ODataSubLocator {
context.setAcceptableLanguages(request.getAcceptableLanguages());
context.setPathInfo(request.getPathInfo());
context.setServiceFactory(serviceFactory);
- ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders());
- ODataResponse response = exceptionWrapper.wrapInExceptionResponse(new ODataNotImplementedException(messageReference));
+ ODataExceptionWrapper exceptionWrapper =
+ new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders());
+ ODataResponse response =
+ exceptionWrapper.wrapInExceptionResponse(new ODataNotImplementedException(messageReference));
return RestUtil.convertResponse(response);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java
index c348d42..00554c0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
index aa46924..410e261 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
@@ -57,7 +57,8 @@ import org.apache.olingo.odata2.core.commons.Decoder;
public class RestUtil {
public static Response convertResponse(final ODataResponse odataResponse) {
try {
- ResponseBuilder responseBuilder = Response.noContent().status(odataResponse.getStatus().getStatusCode()).entity(odataResponse.getEntity());
+ ResponseBuilder responseBuilder =
+ Response.noContent().status(odataResponse.getStatus().getStatusCode()).entity(odataResponse.getEntity());
for (final String name : odataResponse.getHeaderNames()) {
responseBuilder = responseBuilder.header(name, odataResponse.getHeader(name));
@@ -77,7 +78,8 @@ public class RestUtil {
}
}
- public static ContentType extractRequestContentType(final SubLocatorParameter param) throws ODataUnsupportedMediaTypeException {
+ public static ContentType extractRequestContentType(final SubLocatorParameter param)
+ throws ODataUnsupportedMediaTypeException {
final String contentType = param.getHttpHeaders().getHeaderString(HttpHeaders.CONTENT_TYPE);
if (contentType == null || contentType.isEmpty()) {
// RFC 2616, 7.2.1:
@@ -89,7 +91,8 @@ public class RestUtil {
} else if (ContentType.isParseable(contentType)) {
return ContentType.create(contentType);
} else {
- throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED_CONTENT_TYPE.addContent(HttpHeaders.CONTENT_TYPE, contentType));
+ throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED_CONTENT_TYPE
+ .addContent(HttpHeaders.CONTENT_TYPE, contentType));
}
}
@@ -143,7 +146,6 @@ public class RestUtil {
ContentType.sortForQParameter(toSort);
return toSort;
}
-
public static Map<String, String> extractRequestHeaders(final javax.ws.rs.core.HttpHeaders httpHeaders) {
final MultivaluedMap<String, String> headers = httpHeaders.getRequestHeaders();
@@ -204,7 +206,8 @@ public class RestUtil {
odataSegments.add(new ODataPathSegmentImpl(segment.getPath(), null));
} else {
// post condition: we do not allow matrix parameters in OData path segments
- throw new ODataNotFoundException(ODataNotFoundException.MATRIX.addContent(segment.getMatrixParameters().keySet(), segment.getPath()));
+ throw new ODataNotFoundException(ODataNotFoundException.MATRIX.addContent(segment.getMatrixParameters()
+ .keySet(), segment.getPath()));
}
}
pathInfo.setODataPathSegment(odataSegments);
@@ -212,7 +215,8 @@ public class RestUtil {
return pathInfo;
}
- private static URI buildBaseUri(final HttpServletRequest request, final javax.ws.rs.core.UriInfo uriInfo, final List<PathSegment> precedingPathSegments) throws ODataException {
+ private static URI buildBaseUri(final HttpServletRequest request, final javax.ws.rs.core.UriInfo uriInfo,
+ final List<PathSegment> precedingPathSegments) throws ODataException {
try {
UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
for (final PathSegment ps : precedingPathSegments) {
@@ -242,7 +246,8 @@ public class RestUtil {
private static List<PathSegment> convertPathSegmentList(final List<javax.ws.rs.core.PathSegment> pathSegments) {
ArrayList<PathSegment> converted = new ArrayList<PathSegment>();
for (final javax.ws.rs.core.PathSegment pathSegment : pathSegments) {
- final PathSegment segment = new ODataPathSegmentImpl(Decoder.decode(pathSegment.getPath()), pathSegment.getMatrixParameters());
+ final PathSegment segment =
+ new ODataPathSegmentImpl(Decoder.decode(pathSegment.getPath()), pathSegment.getMatrixParameters());
converted.add(segment);
}
return converted;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
index cd67579..8a0370c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
index 578a66b..6a73ded 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest.app;
@@ -64,17 +64,21 @@ public class ODataApplication extends Application {
public static final class MyProvider implements MessageBodyWriter<String> {
@Override
- public boolean isWriteable(final Class<?> type, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
+ public boolean isWriteable(final Class<?> type, final Type genericType, final Annotation[] annotations,
+ final MediaType mediaType) {
return (type == String.class);
}
@Override
- public long getSize(final String t, final Class<?> type, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
+ public long getSize(final String t, final Class<?> type, final Type genericType, final Annotation[] annotations,
+ final MediaType mediaType) {
return t.length();
}
@Override
- public void writeTo(final String t, final Class<?> type, final Type genericType, final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream) throws IOException, WebApplicationException {
+ public void writeTo(final String t, final Class<?> type, final Type genericType, final Annotation[] annotations,
+ final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream)
+ throws IOException, WebApplicationException {
StringBuilder b = new StringBuilder();
b.append(t);
entityStream.write(b.toString().getBytes("UTF-8"));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java
index e9f7bd8..cc1c6e7 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rt;
@@ -87,12 +87,14 @@ public class RuntimeDelegateImpl extends RuntimeDelegateInstance {
}
@Override
- protected ODataService createODataSingleProcessorService(final EdmProvider provider, final ODataSingleProcessor processor) {
+ protected ODataService createODataSingleProcessorService(final EdmProvider provider,
+ final ODataSingleProcessor processor) {
return new ODataSingleProcessorService(provider, processor);
}
@Override
- protected EdmProvider createEdmProvider(final InputStream metadataXml, final boolean validate) throws EntityProviderException {
+ protected EdmProvider createEdmProvider(final InputStream metadataXml, final boolean validate)
+ throws EntityProviderException {
return new EdmxProvider().parse(metadataXml, validate);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java
index 96de274..9f3fa65 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java
index 962e948..5f5080d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
@@ -85,7 +85,8 @@ public class AtomInfoImpl implements AtomInfo {
entitySets.add(entitySetInfo);
} else if (names.length == 2) {
EntitySet entitySet = new EntitySet().setName(names[1]);
- EntityContainerInfo container = new EntityContainerInfo().setName(names[0]).setDefaultEntityContainer(false);
+ EntityContainerInfo container =
+ new EntityContainerInfo().setName(names[0]).setDefaultEntityContainer(false);
EdmEntitySetInfo entitySetInfo = new EdmEntitySetInfoImplProv(entitySet, container);
entitySets.add(entitySetInfo);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java
index 0610ff0..c9aba27 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java
index 39d19d4..66ba03c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java
index 810e111..a7b61c0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java
index 7f76e05..f32679d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java
index 16f04af..ce0dc66 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java
index 3adcd9c..7adc7a5 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java
index 16c6717..b743967 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java
index 8ff524a..4271f8c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java
index a149cb1..ed9361b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.servicedocument;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java
index b7bfabe..24c879d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
@@ -40,7 +40,8 @@ public class ExpandSelectTreeCreator {
private List<SelectItem> initialSelect;
private List<ArrayList<NavigationPropertySegment>> initialExpand;
- public ExpandSelectTreeCreator(final List<SelectItem> select, final List<ArrayList<NavigationPropertySegment>> expand) {
+ public ExpandSelectTreeCreator(final List<SelectItem> select,
+ final List<ArrayList<NavigationPropertySegment>> expand) {
if (select != null) {
initialSelect = select;
} else {
@@ -56,19 +57,19 @@ public class ExpandSelectTreeCreator {
public ExpandSelectTreeNodeImpl create() throws EdmException {
- //Initial node
+ // Initial node
ExpandSelectTreeNodeImpl root = new ExpandSelectTreeNodeImpl();
if (!initialSelect.isEmpty()) {
- //Create a full expand tree
+ // Create a full expand tree
createSelectTree(root);
} else {
- //If no select is given the root node is explicitly selected for all expand clauses
+ // If no select is given the root node is explicitly selected for all expand clauses
root.setExplicitlySelected();
}
- //Merge in the expand tree
+ // Merge in the expand tree
mergeExpandTree(root);
- //consolidate the tree
+ // consolidate the tree
consolidate(root);
return root;
}
@@ -134,19 +135,20 @@ public class ExpandSelectTreeCreator {
} else if (item.isStar()) {
actualNode.setAllExplicitly();
} else {
- //The actual node is a navigation property and has no property or star so it is explicitly selected
+ // The actual node is a navigation property and has no property or star so it is explicitly selected
actualNode.setExplicitlySelected();
}
}
}
- private ExpandSelectTreeNodeImpl addSelectNode(final ExpandSelectTreeNodeImpl actualNode, final String navigationPropertyName) {
+ private ExpandSelectTreeNodeImpl addSelectNode(final ExpandSelectTreeNodeImpl actualNode,
+ final String navigationPropertyName) {
Map<String, ExpandSelectTreeNode> links = actualNode.getLinks();
if (!links.containsKey(navigationPropertyName)) {
ExpandSelectTreeNodeImpl subNode = new ExpandSelectTreeNodeImpl();
actualNode.putLink(navigationPropertyName, subNode);
if (actualNode.isExplicitlySelected()) {
- //if a node was explicitly selected all sub nodes are explicitly selected
+ // if a node was explicitly selected all sub nodes are explicitly selected
subNode.setExplicitlySelected();
} else {
if (actualNode.getAllKind() == AllKinds.IMPLICITLYTRUE) {
@@ -172,7 +174,8 @@ public class ExpandSelectTreeCreator {
}
- private ExpandSelectTreeNodeImpl addExpandNode(final ExpandSelectTreeNodeImpl actualNode, final String navigationPropertyName) {
+ private ExpandSelectTreeNodeImpl addExpandNode(final ExpandSelectTreeNodeImpl actualNode,
+ final String navigationPropertyName) {
Map<String, ExpandSelectTreeNode> links = actualNode.getLinks();
if (!links.containsKey(navigationPropertyName)) {
if (actualNode.isExplicitlySelected() || (actualNode.isExplicitlySelected() && actualNode.isExpanded())) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java
index bc69e99..d14e1bb 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
@@ -70,7 +70,8 @@ public class ExpandSelectTreeNodeImpl implements ExpandSelectTreeNode {
@SuppressWarnings("unchecked")
@Override
public Map<String, ExpandSelectTreeNode> getLinks() {
- return (Map<String, ExpandSelectTreeNode>) ((Map<String, ? extends ExpandSelectTreeNode>) Collections.unmodifiableMap(links));
+ return (Map<String, ExpandSelectTreeNode>) ((Map<String, ? extends ExpandSelectTreeNode>) Collections
+ .unmodifiableMap(links));
}
public void putLink(final String name, final ExpandSelectTreeNodeImpl node) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java
index 9d9bbcf..734ce9f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java
index c43a628..802a6cd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java
index 97f1679..e32e0ae 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java
index 89bde77..fde54e5 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java
index 5344442..272a56f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java
index ad74797..2bfd7a7 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
[19/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
index 61ef209..8c00076 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -74,23 +74,23 @@ public class JsonPropertyConsumerTest extends BaseTest {
when(edmProperty.getName()).thenReturn("Age");
when(edmProperty.isSimple()).thenReturn(true);
- //Byte
+ // Byte
JsonReader reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Byte.getEdmSimpleTypeInstance());
Map<String, Object> resultMap = execute(edmProperty, reader);
assertEquals(Short.valueOf("67"), resultMap.get("Age"));
- //SByte
+ // SByte
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.SByte.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(Byte.valueOf("67"), resultMap.get("Age"));
- //Int16
+ // Int16
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(Short.valueOf("67"), resultMap.get("Age"));
- //Int32
+ // Int32
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
@@ -104,64 +104,64 @@ public class JsonPropertyConsumerTest extends BaseTest {
when(edmProperty.isSimple()).thenReturn(true);
String simplePropertyJson;
- //DateTime
+ // DateTime
simplePropertyJson = "{\"d\":{\"Name\":\"\\/Date(915148800000)\\/\"}}";
JsonReader reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance());
Map<String, Object> resultMap = execute(edmProperty, reader);
Calendar entryDate = (Calendar) resultMap.get("Name");
assertEquals(Long.valueOf(915148800000l), Long.valueOf(entryDate.getTimeInMillis()));
- //DateTimeOffset
+ // DateTimeOffset
simplePropertyJson = "{\"d\":{\"Name\":\"\\/Date(915148800000)\\/\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
entryDate = (Calendar) resultMap.get("Name");
assertEquals(Long.valueOf(915148800000l), Long.valueOf(entryDate.getTimeInMillis()));
- //Decimal
+ // Decimal
simplePropertyJson = "{\"d\":{\"Name\":\"123456789\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Decimal.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(BigDecimal.valueOf(Long.valueOf("123456789")), resultMap.get("Name"));
- //Double
+ // Double
simplePropertyJson = "{\"d\":{\"Name\":\"123456789\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(Double.valueOf("123456789"), resultMap.get("Name"));
- //Int64
+ // Int64
simplePropertyJson = "{\"d\":{\"Name\":\"123456789\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(Long.valueOf("123456789"), resultMap.get("Name"));
- //Single
+ // Single
simplePropertyJson = "{\"d\":{\"Name\":\"123456\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(Float.valueOf("123456"), resultMap.get("Name"));
- //String
+ // String
simplePropertyJson = "{\"d\":{\"Name\":\"123456789\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals("123456789", resultMap.get("Name"));
- //Guid
+ // Guid
simplePropertyJson = "{\"d\":{\"Name\":\"AABBCCDD-AABB-CCDD-EEFF-AABBCCDDEEFF\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(UUID.fromString("aabbccdd-aabb-ccdd-eeff-aabbccddeeff"), resultMap.get("Name"));
- //Binary
+ // Binary
simplePropertyJson = "{\"d\":{\"Name\":\"qrvM\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertTrue(Arrays.equals(new byte[] { (byte) 0xAA, (byte) 0xBB, (byte) 0xCC },
(byte[]) resultMap.get("Name")));
- //Time
+ // Time
simplePropertyJson = "{\"d\":{\"Name\":\"PT23H32M3S\"}}";
reader = prepareReader(simplePropertyJson);
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Time.getEdmSimpleTypeInstance());
@@ -178,7 +178,9 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void simplePropertyOnOpenReader() throws Exception {
String simplePropertyJson = "{\"Name\":\"Team 1\"}";
JsonReader reader = prepareReader(simplePropertyJson);
- EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams").getEntityType().getProperty("Name");
+ EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams").getEntityType()
+ .getProperty("Name");
EntityPropertyInfo entityPropertyInfo = EntityInfoAggregator.create(edmProperty);
reader.beginObject();
reader.nextName();
@@ -195,11 +197,13 @@ public class JsonPropertyConsumerTest extends BaseTest {
String propertyValue = new String(chars);
String simplePropertyJson = "{\"d\":{\"Name\":\"" + propertyValue + "\"}}";
JsonReader reader = prepareReader(simplePropertyJson);
- final EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Room").getProperty("Name");
+ final EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Room").getProperty("Name");
EntityProviderReadProperties readProperties = mock(EntityProviderReadProperties.class);
when(readProperties.getTypeMappings()).thenReturn(null);
- Map<String, Object> resultMap = new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
+ Map<String, Object> resultMap =
+ new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
assertEquals(propertyValue, resultMap.get("Name"));
}
@@ -207,7 +211,8 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test
public void simplePropertyNull() throws Exception {
JsonReader reader = prepareReader("{\"Name\":null}");
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Room").getProperty("Name");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Room").getProperty("Name");
final Map<String, Object> resultMap = new JsonPropertyConsumer().readPropertyStandalone(reader, property, null);
assertTrue(resultMap.containsKey("Name"));
assertNull(resultMap.get("Name"));
@@ -216,7 +221,8 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test(expected = EntityProviderException.class)
public void simplePropertyNullValueNotAllowed() throws Exception {
JsonReader reader = prepareReader("{\"Age\":null}");
- EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
EdmFacets facets = mock(EdmFacets.class);
when(facets.isNullable()).thenReturn(false);
when(property.getFacets()).thenReturn(facets);
@@ -228,11 +234,13 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void simplePropertyWithNullMappingStandalone() throws Exception {
String simplePropertyJson = "{\"d\":{\"Age\":67}}";
JsonReader reader = prepareReader(simplePropertyJson);
- final EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
EntityProviderReadProperties readProperties = mock(EntityProviderReadProperties.class);
when(readProperties.getTypeMappings()).thenReturn(null);
- Map<String, Object> resultMap = new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
+ Map<String, Object> resultMap =
+ new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
assertEquals(Integer.valueOf(67), resultMap.get("Age"));
}
@@ -241,11 +249,13 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void simplePropertyWithNullMappingStandaloneWithoutD() throws Exception {
String simplePropertyJson = "{\"Age\":67}";
JsonReader reader = prepareReader(simplePropertyJson);
- final EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
EntityProviderReadProperties readProperties = mock(EntityProviderReadProperties.class);
when(readProperties.getTypeMappings()).thenReturn(null);
- Map<String, Object> resultMap = new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
+ Map<String, Object> resultMap =
+ new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
assertEquals(Integer.valueOf(67), resultMap.get("Age"));
}
@@ -254,11 +264,13 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void simplePropertyWithEmptyMappingStandalone() throws Exception {
String simplePropertyJson = "{\"d\":{\"Age\":67}}";
JsonReader reader = prepareReader(simplePropertyJson);
- final EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
EntityProviderReadProperties readProperties = mock(EntityProviderReadProperties.class);
when(readProperties.getTypeMappings()).thenReturn(new HashMap<String, Object>());
- Map<String, Object> resultMap = new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
+ Map<String, Object> resultMap =
+ new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
assertEquals(Integer.valueOf(67), resultMap.get("Age"));
}
@@ -267,13 +279,15 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void simplePropertyWithStringToLongMappingStandalone() throws Exception {
String simplePropertyJson = "{\"d\":{\"Age\":67}}";
JsonReader reader = prepareReader(simplePropertyJson);
- final EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
EntityProviderReadProperties readProperties = mock(EntityProviderReadProperties.class);
Map<String, Object> typeMappings = new HashMap<String, Object>();
typeMappings.put("Age", Long.class);
when(readProperties.getTypeMappings()).thenReturn(typeMappings);
- Map<String, Object> resultMap = new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
+ Map<String, Object> resultMap =
+ new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
assertEquals(Long.valueOf(67), resultMap.get("Age"));
}
@@ -282,27 +296,31 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void simplePropertyWithStringToNullMappingStandalone() throws Exception {
String simplePropertyJson = "{\"d\":{\"Age\":67}}";
JsonReader reader = prepareReader(simplePropertyJson);
- final EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
EntityProviderReadProperties readProperties = mock(EntityProviderReadProperties.class);
Map<String, Object> typeMappings = new HashMap<String, Object>();
typeMappings.put("Age", null);
when(readProperties.getTypeMappings()).thenReturn(typeMappings);
- Map<String, Object> resultMap = new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
+ Map<String, Object> resultMap =
+ new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
assertEquals(Integer.valueOf(67), resultMap.get("Age"));
}
@Test(expected = EntityProviderException.class)
public void noContent() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
JsonReader reader = prepareReader("{}");
new JsonPropertyConsumer().readPropertyStandalone(reader, property, null);
}
@Test(expected = EntityProviderException.class)
public void simplePropertyUnfinished() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
JsonReader reader = prepareReader("{\"Age\":67");
new JsonPropertyConsumer().readPropertyStandalone(reader, property, null);
}
@@ -311,16 +329,20 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void simplePropertInvalidName() throws Exception {
String simplePropertyJson = "{\"d\":{\"Invalid\":67}}";
JsonReader reader = prepareReader(simplePropertyJson);
- final EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, null);
}
@Test
public void complexPropertyWithStringToStringMappingStandalone() throws Exception {
- final String complexPropertyJson = "{\"d\":{\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}}}";
+ final String complexPropertyJson =
+ "{\"d\":{\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"}," +
+ "\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}}}";
JsonReader reader = prepareReader(complexPropertyJson);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
EntityProviderReadProperties readProperties = mock(EntityProviderReadProperties.class);
Map<String, Object> innerMappings = new HashMap<String, Object>();
@@ -339,9 +361,14 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test
public void deepComplexPropertyWithStringToStringMappingStandalone() throws Exception {
- final String complexPropertyJson = "{\"d\":{\"Location\":{\"__metadata\":{\"type\":\"RefScenario.c_Location\"},\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"},\"Country\":\"Germany\"}}}";
+ final String complexPropertyJson =
+ "{\"d\":{\"Location\":{\"__metadata\":{\"type\":\"RefScenario.c_Location\"}," +
+ "\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\"," +
+ "\"CityName\":\"Heidelberg\"},\"Country\":\"Germany\"}}}";
JsonReader reader = prepareReader(complexPropertyJson);
- EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType().getProperty("Location");
+ EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType()
+ .getProperty("Location");
EntityProviderReadProperties readProperties = mock(EntityProviderReadProperties.class);
Map<String, Object> cityMappings = new HashMap<String, Object>();
@@ -352,7 +379,8 @@ public class JsonPropertyConsumerTest extends BaseTest {
mappings.put("Location", locationMappings);
when(readProperties.getTypeMappings()).thenReturn(mappings);
- final Map<String, Object> result = new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
+ final Map<String, Object> result =
+ new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, readProperties);
assertEquals(1, result.size());
@SuppressWarnings("unchecked")
@@ -368,9 +396,11 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test
public void complexPropertyOnOpenReader() throws Exception {
- final String complexPropertyJson = "{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}";
+ final String complexPropertyJson =
+ "{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}";
JsonReader reader = prepareReader(complexPropertyJson);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
EntityComplexPropertyInfo entityPropertyInfo = (EntityComplexPropertyInfo) EntityInfoAggregator.create(property);
JsonPropertyConsumer jpc = new JsonPropertyConsumer();
@@ -386,7 +416,8 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void complexPropertyOnOpenReaderWithNoMetadata() throws Exception {
final String complexPropertyJson = "{\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}";
JsonReader reader = prepareReader(complexPropertyJson);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
EntityComplexPropertyInfo entityPropertyInfo = (EntityComplexPropertyInfo) EntityInfoAggregator.create(property);
JsonPropertyConsumer jpc = new JsonPropertyConsumer();
@@ -400,9 +431,14 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test
public void deepComplexPropertyOnOpenReader() throws Exception {
- final String complexPropertyJson = "{\"__metadata\":{\"type\":\"RefScenario.c_Location\"},\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"},\"Country\":\"Germany\"}";
+ final String complexPropertyJson =
+ "{\"__metadata\":{\"type\":\"RefScenario.c_Location\"}," +
+ "\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\"," +
+ "\"CityName\":\"Heidelberg\"},\"Country\":\"Germany\"}";
JsonReader reader = prepareReader(complexPropertyJson);
- EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType().getProperty("Location");
+ EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType()
+ .getProperty("Location");
EntityComplexPropertyInfo entityPropertyInfo = (EntityComplexPropertyInfo) EntityInfoAggregator.create(edmProperty);
JsonPropertyConsumer jpc = new JsonPropertyConsumer();
@@ -421,7 +457,9 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test
public void simplePropertyStandalone() throws Exception {
String simplePropertyJson = "{\"d\":{\"Name\":\"Team 1\"}}";
- EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams").getEntityType().getProperty("Name");
+ EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams").getEntityType()
+ .getProperty("Name");
JsonReader reader = prepareReader(simplePropertyJson);
Map<String, Object> result = new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, null);
@@ -430,9 +468,12 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test
public void complexPropertyStandalone() throws Exception {
- final String complexPropertyJson = "{\"d\":{\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}}}";
+ final String complexPropertyJson =
+ "{\"d\":{\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"}," +
+ "\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}}}";
JsonReader reader = prepareReader(complexPropertyJson);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
final Map<String, Object> result = new JsonPropertyConsumer().readPropertyStandalone(reader, property, null);
@@ -445,9 +486,14 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test
public void deepComplexPropertyStandalone() throws Exception {
- final String complexPropertyJson = "{\"d\":{\"Location\":{\"__metadata\":{\"type\":\"RefScenario.c_Location\"},\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"},\"Country\":\"Germany\"}}}";
+ final String complexPropertyJson =
+ "{\"d\":{\"Location\":{\"__metadata\":{\"type\":\"RefScenario.c_Location\"}," +
+ "\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\"," +
+ "\"CityName\":\"Heidelberg\"},\"Country\":\"Germany\"}}}";
JsonReader reader = prepareReader(complexPropertyJson);
- EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType().getProperty("Location");
+ EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType()
+ .getProperty("Location");
JsonPropertyConsumer jpc = new JsonPropertyConsumer();
Map<String, Object> result = jpc.readPropertyStandalone(reader, edmProperty, null);
@@ -468,7 +514,8 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void complexPropertyWithInvalidChild() throws Exception {
String cityProperty = "{\"d\":{\"City\":{\"Invalid\":\"69124\",\"CityName\":\"Heidelberg\"}}}";
JsonReader reader = prepareReader(cityProperty);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
new JsonPropertyConsumer().readPropertyStandalone(reader, property, null);
}
@@ -477,7 +524,8 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void complexPropertyWithInvalidName() throws Exception {
String cityProperty = "{\"d\":{\"Invalid\":{\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}}}";
JsonReader reader = prepareReader(cityProperty);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
new JsonPropertyConsumer().readPropertyStandalone(reader, property, null);
}
@@ -486,7 +534,9 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void complexPropertyNull() throws Exception {
final String locationProperty = "{\"Location\":null}";
JsonReader reader = prepareReader(locationProperty);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType().getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType()
+ .getProperty("Location");
final Map<String, Object> propertyData = new JsonPropertyConsumer().readPropertyStandalone(reader, property, null);
assertNotNull(propertyData);
@@ -499,7 +549,9 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void complexPropertyNullValueNotAllowed() throws Exception {
final String locationProperty = "{\"Location\":null}";
JsonReader reader = prepareReader(locationProperty);
- EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType().getProperty("Location");
+ EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees").getEntityType()
+ .getProperty("Location");
EdmFacets facets = mock(EdmFacets.class);
when(facets.isNullable()).thenReturn(false);
when(property.getFacets()).thenReturn(facets);
@@ -511,7 +563,8 @@ public class JsonPropertyConsumerTest extends BaseTest {
public void complexPropertyEmpty() throws Exception {
final String cityProperty = "{\"d\":{\"City\":{}}}";
JsonReader reader = prepareReader(cityProperty);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
final Map<String, Object> propertyData = new JsonPropertyConsumer().readPropertyStandalone(reader, property, null);
assertNotNull(propertyData);
@@ -524,9 +577,11 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test(expected = EntityProviderException.class)
public void complexPropertyMetadataInvalidTag() throws Exception {
- String complexPropertyJson = "{\"__metadata\":{\"invalid\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}";
+ String complexPropertyJson =
+ "{\"__metadata\":{\"invalid\":\"RefScenario.c_City\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}";
JsonReader reader = prepareReader(complexPropertyJson);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
EntityComplexPropertyInfo entityPropertyInfo = (EntityComplexPropertyInfo) EntityInfoAggregator.create(property);
new JsonPropertyConsumer().readPropertyValue(reader, entityPropertyInfo, null);
@@ -534,9 +589,11 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test(expected = EntityProviderException.class)
public void complexPropertyMetadataInvalidTypeContent() throws Exception {
- String complexPropertyJson = "{\"__metadata\":{\"type\":\"Invalid\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}";
+ String complexPropertyJson =
+ "{\"__metadata\":{\"type\":\"Invalid\"},\"PostalCode\":\"69124\",\"CityName\":\"Heidelberg\"}";
JsonReader reader = prepareReader(complexPropertyJson);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getComplexType("RefScenario", "c_Location").getProperty("City");
EntityComplexPropertyInfo entityPropertyInfo = (EntityComplexPropertyInfo) EntityInfoAggregator.create(property);
new JsonPropertyConsumer().readPropertyValue(reader, entityPropertyInfo, null);
@@ -548,7 +605,8 @@ public class JsonPropertyConsumerTest extends BaseTest {
return reader;
}
- private Map<String, Object> execute(final EdmProperty edmProperty, final JsonReader reader) throws EntityProviderException {
+ private Map<String, Object> execute(final EdmProperty edmProperty, final JsonReader reader)
+ throws EntityProviderException {
JsonPropertyConsumer jpc = new JsonPropertyConsumer();
Map<String, Object> resultMap = jpc.readPropertyStandalone(reader, edmProperty, null);
return resultMap;
@@ -561,7 +619,9 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test(expected = EntityProviderException.class)
public void invalidDoubleClosingBrackets() throws Exception {
String simplePropertyJson = "{\"d\":{\"Name\":\"Team 1\"}}}";
- EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams").getEntityType().getProperty("Name");
+ EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams").getEntityType()
+ .getProperty("Name");
JsonReader reader = prepareReader(simplePropertyJson);
new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, null);
@@ -570,7 +630,9 @@ public class JsonPropertyConsumerTest extends BaseTest {
@Test(expected = EntityProviderException.class)
public void invalidDoubleClosingBracketsWithoutD() throws Exception {
String simplePropertyJson = "{\"Name\":\"Team 1\"}}";
- EdmProperty edmProperty = (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams").getEntityType().getProperty("Name");
+ EdmProperty edmProperty =
+ (EdmProperty) MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams").getEntityType()
+ .getProperty("Name");
JsonReader reader = prepareReader(simplePropertyJson);
new JsonPropertyConsumer().readPropertyStandalone(reader, edmProperty, null);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
index ba671dc..3b04e0f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
index d67354a..af916ad 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
[57/59] [abbrv] git commit: cleanup jpa core
Posted by ch...@apache.org.
cleanup jpa core
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/02a598bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/02a598bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/02a598bd
Branch: refs/heads/master
Commit: 02a598bdce717c6e6282012725315ac5141a80a6
Parents: da6d5ca
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 15:24:28 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 15:24:28 2013 +0200
----------------------------------------------------------------------
.../processor/core/jpa/ODataEntityParser.java | 38 ++--
.../core/jpa/ODataExpressionParser.java | 115 ++++++----
.../processor/core/jpa/ODataJPAContextImpl.java | 26 +--
.../core/jpa/ODataJPAProcessorDefault.java | 86 +++++---
.../core/jpa/ODataJPAResponseBuilder.java | 159 +++++++++-----
.../core/jpa/access/data/JPAEntity.java | 87 ++++----
.../core/jpa/access/data/JPAEntityParser.java | 83 ++++----
.../core/jpa/access/data/JPAExpandCallBack.java | 51 +++--
.../jpa/access/data/JPAFunctionContext.java | 35 +--
.../processor/core/jpa/access/data/JPALink.java | 53 +++--
.../core/jpa/access/data/JPAProcessorImpl.java | 58 ++---
.../core/jpa/access/model/EdmTypeConvertor.java | 32 +--
.../access/model/JPAEdmMappingModelService.java | 35 +--
.../jpa/access/model/JPAEdmNameBuilder.java | 49 +++--
.../core/jpa/access/model/JPATypeConvertor.java | 48 +++--
.../core/jpa/edm/ODataJPAEdmProvider.java | 29 +--
.../ODataJPAMessageServiceDefault.java | 35 +--
.../core/jpa/factory/ODataJPAFactoryImpl.java | 26 +--
.../core/jpa/jpql/JPQLJoinSelectContext.java | 36 ++--
.../jpa/jpql/JPQLJoinSelectSingleContext.java | 36 ++--
.../JPQLJoinSelectSingleStatementBuilder.java | 29 +--
.../core/jpa/jpql/JPQLJoinStatementBuilder.java | 42 ++--
.../core/jpa/jpql/JPQLSelectContext.java | 36 ++--
.../core/jpa/jpql/JPQLSelectSingleContext.java | 31 +--
.../jpql/JPQLSelectSingleStatementBuilder.java | 29 +--
.../jpa/jpql/JPQLSelectStatementBuilder.java | 33 +--
.../core/jpa/model/JPAEdmAssociation.java | 44 ++--
.../core/jpa/model/JPAEdmAssociationEnd.java | 35 +--
.../core/jpa/model/JPAEdmAssociationSet.java | 32 +--
.../core/jpa/model/JPAEdmBaseViewImpl.java | 29 +--
.../core/jpa/model/JPAEdmComplexType.java | 45 ++--
.../core/jpa/model/JPAEdmEntityContainer.java | 26 +--
.../core/jpa/model/JPAEdmEntitySet.java | 26 +--
.../core/jpa/model/JPAEdmEntityType.java | 32 +--
.../processor/core/jpa/model/JPAEdmFacets.java | 32 +--
.../core/jpa/model/JPAEdmFunctionImport.java | 53 +++--
.../processor/core/jpa/model/JPAEdmKey.java | 31 +--
.../core/jpa/model/JPAEdmMappingImpl.java | 26 +--
.../processor/core/jpa/model/JPAEdmModel.java | 26 +--
.../jpa/model/JPAEdmNavigationProperty.java | 29 +--
.../core/jpa/model/JPAEdmProperty.java | 86 ++++----
.../jpa/model/JPAEdmReferentialConstraint.java | 35 +--
.../model/JPAEdmReferentialConstraintRole.java | 41 ++--
.../processor/core/jpa/model/JPAEdmSchema.java | 31 +--
.../core/jpa/ODataExpressionParserTest.java | 212 ++++++++++++-------
.../core/jpa/ODataJPAContextImplTest.java | 26 +--
.../core/jpa/ODataJPAProcessorDefaultTest.java | 83 +++++---
.../core/jpa/ODataJPAResponseBuilderTest.java | 32 +--
.../jpa/access/data/JPAEntityParserTest.java | 40 ++--
.../JPAEntityParserTestForStaticMethods.java | 35 +--
.../core/jpa/access/data/JPAEntityTest.java | 30 +--
.../jpa/access/data/JPAExpandCallBackTest.java | 32 +--
.../jpa/access/data/JPAFunctionContextTest.java | 29 +--
.../jpa/access/data/JPAProcessorImplTest.java | 46 ++--
.../model/JPAEdmMappingModelServiceTest.java | 65 +++---
.../jpa/access/model/JPAEdmNameBuilderTest.java | 26 +--
.../jpa/access/model/JPATypeConvertorTest.java | 34 +--
.../core/jpa/common/ODataJPATestConstants.java | 26 +--
.../edm/ODataJPAEdmProviderNegativeTest.java | 36 ++--
.../core/jpa/edm/ODataJPAEdmProviderTest.java | 56 +++--
.../core/jpa/jpql/JPQLBuilderFactoryTest.java | 47 ++--
.../core/jpa/jpql/JPQLJoinContextTest.java | 26 +--
.../jpql/JPQLJoinSelectSingleContextTest.java | 26 +--
...PQLJoinSelectSingleStatementBuilderTest.java | 49 +++--
.../jpa/jpql/JPQLJoinStatementBuilderTest.java | 40 ++--
.../jpa/jpql/JPQLSelectContextImplTest.java | 44 ++--
.../jpql/JPQLSelectSingleContextImplTest.java | 29 +--
.../JPQLSelectSingleStatementBuilderTest.java | 41 ++--
.../jpql/JPQLSelectStatementBuilderTest.java | 45 ++--
.../core/jpa/mock/ODataJPAContextMock.java | 26 +--
.../core/jpa/mock/data/EdmMockUtil.java | 26 +--
.../core/jpa/mock/data/EdmMockUtilV2.java | 155 +++++++-------
.../core/jpa/mock/data/JPATypeMock.java | 34 +--
.../core/jpa/mock/data/ODataEntryMockUtil.java | 44 ++--
.../core/jpa/mock/data/SalesOrderHeader.java | 26 +--
.../core/jpa/mock/data/SalesOrderLineItem.java | 26 +--
.../jpa/mock/data/SalesOrderLineItemKey.java | 26 +--
.../core/jpa/mock/model/EdmSchemaMock.java | 38 ++--
.../core/jpa/mock/model/JPAAttributeMock.java | 26 +--
.../jpa/mock/model/JPACustomProcessorMock.java | 39 ++--
.../model/JPACustomProcessorNegativeMock.java | 26 +--
.../core/jpa/mock/model/JPAEdmMockData.java | 26 +--
.../core/jpa/mock/model/JPAEmbeddableMock.java | 26 +--
.../jpa/mock/model/JPAEmbeddableTypeMock.java | 26 +--
.../core/jpa/mock/model/JPAEntityTypeMock.java | 26 +--
.../core/jpa/mock/model/JPAJavaMemberMock.java | 26 +--
.../core/jpa/mock/model/JPAManagedTypeMock.java | 26 +--
.../core/jpa/mock/model/JPAMetaModelMock.java | 26 +--
.../jpa/mock/model/JPAPluralAttributeMock.java | 26 +--
.../mock/model/JPASingularAttributeMock.java | 26 +--
.../jpa/model/JPAEdmAssociationEndTest.java | 29 +--
.../jpa/model/JPAEdmAssociationSetTest.java | 32 +--
.../core/jpa/model/JPAEdmAssociationTest.java | 38 ++--
.../core/jpa/model/JPAEdmBaseViewImplTest.java | 26 +--
.../core/jpa/model/JPAEdmComplexTypeTest.java | 26 +--
.../jpa/model/JPAEdmEntityContainerTest.java | 28 +--
.../core/jpa/model/JPAEdmEntitySetTest.java | 26 +--
.../core/jpa/model/JPAEdmEntityTypeTest.java | 26 +--
.../jpa/model/JPAEdmFunctionImportTest.java | 35 +--
.../processor/core/jpa/model/JPAEdmKeyTest.java | 29 +--
.../core/jpa/model/JPAEdmModelTest.java | 26 +--
.../jpa/model/JPAEdmNavigationPropertyTest.java | 26 +--
.../core/jpa/model/JPAEdmPropertyTest.java | 41 ++--
.../JPAEdmReferentialConstraintRoleTest.java | 40 ++--
.../model/JPAEdmReferentialConstraintTest.java | 40 ++--
.../core/jpa/model/JPAEdmSchemaTest.java | 28 +--
.../core/jpa/model/JPAEdmTestModelView.java | 37 ++--
107 files changed, 2415 insertions(+), 1975 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java
index f4df2c5..ee54290 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
@@ -53,7 +53,8 @@ public final class ODataEntityParser {
throws ODataBadRequestException {
ODataEntry entryValues;
try {
- EntityProviderReadProperties entityProviderProperties = EntityProviderReadProperties.init().mergeSemantic(merge).build();
+ EntityProviderReadProperties entityProviderProperties =
+ EntityProviderReadProperties.init().mergeSemantic(merge).build();
entryValues = EntityProvider.readEntry(requestContentType, entitySet, content, entityProviderProperties);
} catch (EntityProviderException e) {
throw new ODataBadRequestException(ODataBadRequestException.BODY, e);
@@ -80,7 +81,8 @@ public final class ODataEntityParser {
return uriInfo;
}
- public final UriInfo parseLink(final EdmEntitySet entitySet, final InputStream content, final String contentType) throws ODataJPARuntimeException {
+ public final UriInfo parseLink(final EdmEntitySet entitySet, final InputStream content, final String contentType)
+ throws ODataJPARuntimeException {
String uriString = null;
UriInfo uri = null;
@@ -90,7 +92,8 @@ public final class ODataEntityParser {
ODataContext odataContext = context.getODataContext();
final String serviceRoot = odataContext.getPathInfo().getServiceRoot().toString();
- final String path = uriString.startsWith(serviceRoot.toString()) ? uriString.substring(serviceRoot.length()) : uriString;
+ final String path =
+ uriString.startsWith(serviceRoot.toString()) ? uriString.substring(serviceRoot.length()) : uriString;
final PathSegment pathSegment = new PathSegment() {
@Override
@@ -116,7 +119,8 @@ public final class ODataEntityParser {
}
- public List<UriInfo> parseLinks(final EdmEntitySet entitySet, final InputStream content, final String contentType) throws ODataJPARuntimeException {
+ public List<UriInfo> parseLinks(final EdmEntitySet entitySet, final InputStream content, final String contentType)
+ throws ODataJPARuntimeException {
List<String> uriList = new ArrayList<String>();
List<UriInfo> uriInfoList = new ArrayList<UriInfo>();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
index 448138b..8c69634 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
@@ -54,8 +54,8 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement;
/**
* This class contains utility methods for parsing the filter expressions built by core library from user OData Query.
*
- *
- *
+ *
+ *
*/
public class ODataExpressionParser {
@@ -71,7 +71,8 @@ public class ODataExpressionParser {
* @throws ODataException
*/
- public static String parseToJPAWhereExpression(final CommonExpression whereExpression, final String tableAlias) throws ODataException {
+ public static String parseToJPAWhereExpression(final CommonExpression whereExpression, final String tableAlias)
+ throws ODataException {
switch (whereExpression.getKind()) {
case UNARY:
final UnaryExpression unaryExpression = (UnaryExpression) whereExpression;
@@ -94,7 +95,10 @@ public class ODataExpressionParser {
return parseToJPAWhereExpression(((FilterExpression) whereExpression).getExpression(), tableAlias);
case BINARY:
final BinaryExpression binaryExpression = (BinaryExpression) whereExpression;
- if ((binaryExpression.getLeftOperand().getKind() == ExpressionKind.METHOD) && ((binaryExpression.getOperator() == BinaryOperator.EQ) || (binaryExpression.getOperator() == BinaryOperator.NE)) && (((MethodExpression) binaryExpression.getLeftOperand()).getMethod() == MethodOperator.SUBSTRINGOF)) {
+ if ((binaryExpression.getLeftOperand().getKind() == ExpressionKind.METHOD)
+ && ((binaryExpression.getOperator() == BinaryOperator.EQ) ||
+ (binaryExpression.getOperator() == BinaryOperator.NE))
+ && (((MethodExpression) binaryExpression.getLeftOperand()).getMethod() == MethodOperator.SUBSTRINGOF)) {
methodFlag = 1;
}
final String left = parseToJPAWhereExpression(binaryExpression.getLeftOperand(), tableAlias);
@@ -102,7 +106,8 @@ public class ODataExpressionParser {
switch (binaryExpression.getOperator()) {
case AND:
- return left + JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND + JPQLStatement.DELIMITER.SPACE + right;
+ return left + JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND + JPQLStatement.DELIMITER.SPACE
+ + right;
case OR:
return left + JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.OR + JPQLStatement.DELIMITER.SPACE + right;
case EQ:
@@ -124,7 +129,9 @@ public class ODataExpressionParser {
}
case PROPERTY:
- String returnStr = tableAlias + JPQLStatement.DELIMITER.PERIOD + ((EdmProperty) ((PropertyExpression) whereExpression).getEdmProperty()).getMapping().getInternalName();
+ String returnStr =
+ tableAlias + JPQLStatement.DELIMITER.PERIOD
+ + ((EdmProperty) ((PropertyExpression) whereExpression).getEdmProperty()).getMapping().getInternalName();
return returnStr;
case MEMBER:
@@ -138,23 +145,33 @@ public class ODataExpressionParser {
memberExpStr = JPQLStatement.DELIMITER.PERIOD + memberExpStr;
}
i++;
- memberExpStr = ((EdmProperty) ((PropertyExpression) member.getProperty()).getEdmProperty()).getMapping().getInternalName() + memberExpStr;
+ memberExpStr =
+ ((EdmProperty) ((PropertyExpression) member.getProperty()).getEdmProperty()).getMapping().getInternalName()
+ + memberExpStr;
tempExp = member.getPath();
}
- memberExpStr = ((EdmProperty) ((PropertyExpression) tempExp).getEdmProperty()).getMapping().getInternalName() + JPQLStatement.DELIMITER.PERIOD + memberExpStr;
+ memberExpStr =
+ ((EdmProperty) ((PropertyExpression) tempExp).getEdmProperty()).getMapping().getInternalName()
+ + JPQLStatement.DELIMITER.PERIOD + memberExpStr;
return tableAlias + JPQLStatement.DELIMITER.PERIOD + memberExpStr;
case LITERAL:
final LiteralExpression literal = (LiteralExpression) whereExpression;
final EdmSimpleType literalType = (EdmSimpleType) literal.getEdmType();
- String value = literalType.valueToString(literalType.valueOfString(literal.getUriLiteral(), EdmLiteralKind.URI, null, literalType.getDefaultType()), EdmLiteralKind.DEFAULT, null);
+ String value =
+ literalType.valueToString(literalType.valueOfString(literal.getUriLiteral(), EdmLiteralKind.URI, null,
+ literalType.getDefaultType()), EdmLiteralKind.DEFAULT, null);
return evaluateComparingExpression(value, literalType);
case METHOD:
final MethodExpression methodExpression = (MethodExpression) whereExpression;
String first = parseToJPAWhereExpression(methodExpression.getParameters().get(0), tableAlias);
- final String second = methodExpression.getParameterCount() > 1 ? parseToJPAWhereExpression(methodExpression.getParameters().get(1), tableAlias) : null;
- String third = methodExpression.getParameterCount() > 2 ? parseToJPAWhereExpression(methodExpression.getParameters().get(2), tableAlias) : null;
+ final String second =
+ methodExpression.getParameterCount() > 1 ? parseToJPAWhereExpression(methodExpression.getParameters().get(1),
+ tableAlias) : null;
+ String third =
+ methodExpression.getParameterCount() > 2 ? parseToJPAWhereExpression(methodExpression.getParameters().get(2),
+ tableAlias) : null;
switch (methodExpression.getMethod()) {
case SUBSTRING:
@@ -165,8 +182,7 @@ public class ODataExpressionParser {
if (methodFlag == 1) {
methodFlag = 0;
return String.format("(CASE WHEN (%s LIKE '%%%s%%') THEN TRUE ELSE FALSE END)", second, first);
- }
- else {
+ } else {
return String.format("(CASE WHEN (%s LIKE '%%%s%%') THEN TRUE ELSE FALSE END) = true", second, first);
}
case TOLOWER:
@@ -215,7 +231,8 @@ public class ODataExpressionParser {
* @return a map of JPA attributes and their sort order
* @throws ODataJPARuntimeException
*/
- public static HashMap<String, String> parseToJPAOrderByExpression(final OrderByExpression orderByExpression, final String tableAlias) throws ODataJPARuntimeException {
+ public static HashMap<String, String> parseToJPAOrderByExpression(final OrderByExpression orderByExpression,
+ final String tableAlias) throws ODataJPARuntimeException {
HashMap<String, String> orderByMap = new HashMap<String, String>();
if (orderByExpression != null && orderByExpression.getOrders() != null) {
List<OrderExpression> orderBys = orderByExpression.getOrders();
@@ -224,7 +241,9 @@ public class ODataExpressionParser {
for (OrderExpression orderBy : orderBys) {
try {
- orderByField = ((EdmProperty) ((PropertyExpression) orderBy.getExpression()).getEdmProperty()).getMapping().getInternalName();
+ orderByField =
+ ((EdmProperty) ((PropertyExpression) orderBy.getExpression()).getEdmProperty()).getMapping()
+ .getInternalName();
orderByDirection = (orderBy.getSortOrder() == SortOrder.asc) ? EMPTY : "DESC"; //$NON-NLS-1$
orderByMap.put(tableAlias + JPQLStatement.DELIMITER.PERIOD + orderByField, orderByDirection);
} catch (EdmException e) {
@@ -242,7 +261,8 @@ public class ODataExpressionParser {
* @return the evaluated where expression
*/
- public static String parseKeyPredicates(final List<KeyPredicate> keyPredicates, final String tableAlias) throws ODataJPARuntimeException {
+ public static String parseKeyPredicates(final List<KeyPredicate> keyPredicates, final String tableAlias)
+ throws ODataJPARuntimeException {
String literal = null;
String propertyName = null;
EdmSimpleType edmSimpleType = null;
@@ -263,11 +283,13 @@ public class ODataExpressionParser {
literal = evaluateComparingExpression(literal, edmSimpleType);
- if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance() || edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
+ if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance()
+ || edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
literal = literal.substring(literal.indexOf('\''), literal.indexOf('}'));
}
- keyFilters.append(tableAlias + JPQLStatement.DELIMITER.PERIOD + propertyName + JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.EQ + JPQLStatement.DELIMITER.SPACE + literal);
+ keyFilters.append(tableAlias + JPQLStatement.DELIMITER.PERIOD + propertyName + JPQLStatement.DELIMITER.SPACE
+ + JPQLStatement.Operator.EQ + JPQLStatement.DELIMITER.SPACE + literal);
}
if (keyFilters.length() > 0) {
return keyFilters.toString();
@@ -282,15 +304,19 @@ public class ODataExpressionParser {
* @param value
* @param edmSimpleType
* @return the evaluated expression
- * @throws ODataJPARuntimeException
+ * @throws ODataJPARuntimeException
*/
- private static String evaluateComparingExpression(String value, final EdmSimpleType edmSimpleType) throws ODataJPARuntimeException {
+ private static String evaluateComparingExpression(String value, final EdmSimpleType edmSimpleType)
+ throws ODataJPARuntimeException {
- if (edmSimpleType == EdmSimpleTypeKind.String.getEdmSimpleTypeInstance() || edmSimpleType == EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance()) {
+ if (edmSimpleType == EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()
+ || edmSimpleType == EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance()) {
value = "\'" + value + "\'"; //$NON-NLS-1$ //$NON-NLS-2$
- } else if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance() || edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
+ } else if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance()
+ || edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
try {
- Calendar datetime = (Calendar) edmSimpleType.valueOfString(value, EdmLiteralKind.DEFAULT, null, edmSimpleType.getDefaultType());
+ Calendar datetime =
+ (Calendar) edmSimpleType.valueOfString(value, EdmLiteralKind.DEFAULT, null, edmSimpleType.getDefaultType());
String year = String.format("%04d", datetime.get(Calendar.YEAR));
String month = String.format("%02d", datetime.get(Calendar.MONTH) + 1);
@@ -299,7 +325,12 @@ public class ODataExpressionParser {
String min = String.format("%02d", datetime.get(Calendar.MINUTE));
String sec = String.format("%02d", datetime.get(Calendar.SECOND));
- value = JPQLStatement.DELIMITER.LEFT_BRACE + JPQLStatement.KEYWORD.TIMESTAMP + JPQLStatement.DELIMITER.SPACE + "\'" + year + JPQLStatement.DELIMITER.HYPHEN + month + JPQLStatement.DELIMITER.HYPHEN + day + JPQLStatement.DELIMITER.SPACE + hour + JPQLStatement.DELIMITER.COLON + min + JPQLStatement.DELIMITER.COLON + sec + JPQLStatement.KEYWORD.OFFSET + "\'" + JPQLStatement.DELIMITER.RIGHT_BRACE;
+ value =
+ JPQLStatement.DELIMITER.LEFT_BRACE + JPQLStatement.KEYWORD.TIMESTAMP + JPQLStatement.DELIMITER.SPACE + "\'"
+ + year + JPQLStatement.DELIMITER.HYPHEN + month + JPQLStatement.DELIMITER.HYPHEN + day
+ + JPQLStatement.DELIMITER.SPACE + hour + JPQLStatement.DELIMITER.COLON + min
+ + JPQLStatement.DELIMITER.COLON + sec + JPQLStatement.KEYWORD.OFFSET + "\'"
+ + JPQLStatement.DELIMITER.RIGHT_BRACE;
} catch (EdmSimpleTypeException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
@@ -307,13 +338,16 @@ public class ODataExpressionParser {
} else if (edmSimpleType == EdmSimpleTypeKind.Time.getEdmSimpleTypeInstance()) {
try {
- Calendar time = (Calendar) edmSimpleType.valueOfString(value, EdmLiteralKind.DEFAULT, null, edmSimpleType.getDefaultType());
+ Calendar time =
+ (Calendar) edmSimpleType.valueOfString(value, EdmLiteralKind.DEFAULT, null, edmSimpleType.getDefaultType());
String hourValue = String.format("%02d", time.get(Calendar.HOUR_OF_DAY));
String minValue = String.format("%02d", time.get(Calendar.MINUTE));
String secValue = String.format("%02d", time.get(Calendar.SECOND));
- value = "\'" + hourValue + JPQLStatement.DELIMITER.COLON + minValue + JPQLStatement.DELIMITER.COLON + secValue + "\'";
+ value =
+ "\'" + hourValue + JPQLStatement.DELIMITER.COLON + minValue + JPQLStatement.DELIMITER.COLON + secValue
+ + "\'";
} catch (EdmSimpleTypeException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
}
@@ -324,7 +358,8 @@ public class ODataExpressionParser {
return value;
}
- public static HashMap<String, String> parseKeyPropertiesToJPAOrderByExpression(final List<EdmProperty> edmPropertylist, final String tableAlias) throws ODataJPARuntimeException {
+ public static HashMap<String, String> parseKeyPropertiesToJPAOrderByExpression(
+ final List<EdmProperty> edmPropertylist, final String tableAlias) throws ODataJPARuntimeException {
HashMap<String, String> orderByMap = new HashMap<String, String>();
String propertyName = null;
for (EdmProperty edmProperty : edmPropertylist) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImpl.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImpl.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImpl.java
index e7ad2f9..21c17b7 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImpl.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java
index fb76ca4..1d5929d 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
@@ -47,27 +47,32 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
}
@Override
- public ODataResponse readEntitySet(final GetEntitySetUriInfo uriParserResultView, final String contentType) throws ODataException {
+ public ODataResponse readEntitySet(final GetEntitySetUriInfo uriParserResultView, final String contentType)
+ throws ODataException {
List<?> jpaEntities = jpaProcessor.process(uriParserResultView);
- ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntities, uriParserResultView, contentType, oDataJPAContext);
+ ODataResponse oDataResponse =
+ ODataJPAResponseBuilder.build(jpaEntities, uriParserResultView, contentType, oDataJPAContext);
return oDataResponse;
}
@Override
- public ODataResponse readEntity(final GetEntityUriInfo uriParserResultView, final String contentType) throws ODataException {
+ public ODataResponse readEntity(final GetEntityUriInfo uriParserResultView, final String contentType)
+ throws ODataException {
Object jpaEntity = jpaProcessor.process(uriParserResultView);
- ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
+ ODataResponse oDataResponse =
+ ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
return oDataResponse;
}
@Override
- public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriParserResultView, final String contentType) throws ODataException {
+ public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriParserResultView, final String contentType)
+ throws ODataException {
long jpaEntityCount = jpaProcessor.process(uriParserResultView);
@@ -77,7 +82,8 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
}
@Override
- public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
long jpaEntityCount = jpaProcessor.process(uriInfo);
@@ -87,17 +93,20 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
}
@Override
- public ODataResponse createEntity(final PostUriInfo uriParserResultView, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse createEntity(final PostUriInfo uriParserResultView, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
List<Object> createdJpaEntityList = jpaProcessor.process(uriParserResultView, content, requestContentType);
- ODataResponse oDataResponse = ODataJPAResponseBuilder.build(createdJpaEntityList, uriParserResultView, contentType, oDataJPAContext);
+ ODataResponse oDataResponse =
+ ODataJPAResponseBuilder.build(createdJpaEntityList, uriParserResultView, contentType, oDataJPAContext);
return oDataResponse;
}
@Override
- public ODataResponse updateEntity(final PutMergePatchUriInfo uriParserResultView, final InputStream content, final String requestContentType, final boolean merge, final String contentType) throws ODataException {
+ public ODataResponse updateEntity(final PutMergePatchUriInfo uriParserResultView, final InputStream content,
+ final String requestContentType, final boolean merge, final String contentType) throws ODataException {
Object jpaEntity = jpaProcessor.process(uriParserResultView, content, requestContentType);
@@ -107,7 +116,8 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
}
@Override
- public ODataResponse deleteEntity(final DeleteUriInfo uriParserResultView, final String contentType) throws ODataException {
+ public ODataResponse deleteEntity(final DeleteUriInfo uriParserResultView, final String contentType)
+ throws ODataException {
Object deletedObj = jpaProcessor.process(uriParserResultView, contentType);
@@ -116,47 +126,56 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
}
@Override
- public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriParserResultView, final String contentType) throws ODataException {
+ public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriParserResultView,
+ final String contentType) throws ODataException {
List<Object> resultEntity = jpaProcessor.process(uriParserResultView);
- ODataResponse oDataResponse = ODataJPAResponseBuilder.build(resultEntity, uriParserResultView, contentType, oDataJPAContext);
+ ODataResponse oDataResponse =
+ ODataJPAResponseBuilder.build(resultEntity, uriParserResultView, contentType, oDataJPAContext);
return oDataResponse;
}
@Override
- public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriParserResultView, final String contentType) throws ODataException {
+ public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriParserResultView,
+ final String contentType) throws ODataException {
List<Object> result = jpaProcessor.process(uriParserResultView);
- ODataResponse oDataResponse = ODataJPAResponseBuilder.build(result, uriParserResultView, contentType, oDataJPAContext);
+ ODataResponse oDataResponse =
+ ODataJPAResponseBuilder.build(result, uriParserResultView, contentType, oDataJPAContext);
return oDataResponse;
}
@Override
- public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriParserResultView, final String contentType) throws ODataException {
+ public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriParserResultView, final String contentType)
+ throws ODataException {
Object jpaEntity = jpaProcessor.process(uriParserResultView);
- ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
+ ODataResponse oDataResponse =
+ ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
return oDataResponse;
}
@Override
- public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriParserResultView, final String contentType) throws ODataException {
+ public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriParserResultView, final String contentType)
+ throws ODataException {
List<Object> jpaEntity = jpaProcessor.process(uriParserResultView);
- ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
+ ODataResponse oDataResponse =
+ ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
return oDataResponse;
}
@Override
- public ODataResponse createEntityLink(final PostUriInfo uriParserResultView, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse createEntityLink(final PostUriInfo uriParserResultView, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
jpaProcessor.process(uriParserResultView, content, requestContentType, contentType);
@@ -164,7 +183,8 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
}
@Override
- public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriParserResultView, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriParserResultView, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
jpaProcessor.process(uriParserResultView, content, requestContentType, contentType);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java
index 65a26f6..f0d2923 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
@@ -66,7 +66,8 @@ import org.apache.olingo.odata2.processor.core.jpa.access.data.JPAExpandCallBack
public final class ODataJPAResponseBuilder {
/* Response for Read Entity Set */
- public static <T> ODataResponse build(final List<T> jpaEntities, final GetEntitySetUriInfo resultsView, final String contentType, final ODataJPAContext odataJPAContext) throws ODataJPARuntimeException {
+ public static <T> ODataResponse build(final List<T> jpaEntities, final GetEntitySetUriInfo resultsView,
+ final String contentType, final ODataJPAContext odataJPAContext) throws ODataJPARuntimeException {
EdmEntityType edmEntityType = null;
ODataResponse odataResponse = null;
@@ -80,7 +81,8 @@ public final class ODataJPAResponseBuilder {
final List<SelectItem> selectedItems = resultsView.getSelect();
if (selectedItems != null && selectedItems.size() > 0) {
for (Object jpaEntity : jpaEntities) {
- edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, buildSelectItemList(selectedItems, edmEntityType));
+ edmPropertyValueMap =
+ jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, buildSelectItemList(selectedItems, edmEntityType));
edmEntityList.add(edmPropertyValueMap);
}
} else {
@@ -94,7 +96,8 @@ public final class ODataJPAResponseBuilder {
int count = 0;
for (Object jpaEntity : jpaEntities) {
Map<String, Object> relationShipMap = edmEntityList.get(count);
- HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(jpaEntity, constructListofNavProperty(expandList));
+ HashMap<String, Object> navigationMap =
+ jpaResultParser.parse2EdmNavigationValueMap(jpaEntity, constructListofNavProperty(expandList));
relationShipMap.putAll(navigationMap);
count++;
}
@@ -103,7 +106,8 @@ public final class ODataJPAResponseBuilder {
EntityProviderWriteProperties feedProperties = null;
feedProperties = getEntityProviderProperties(odataJPAContext, resultsView, edmEntityList);
- odataResponse = EntityProvider.writeFeed(contentType, resultsView.getTargetEntitySet(), edmEntityList, feedProperties);
+ odataResponse =
+ EntityProvider.writeFeed(contentType, resultsView.getTargetEntitySet(), edmEntityList, feedProperties);
odataResponse = ODataResponse.fromResponse(odataResponse).status(HttpStatusCodes.OK).build();
} catch (EntityProviderException e) {
@@ -116,7 +120,9 @@ public final class ODataJPAResponseBuilder {
}
/* Response for Read Entity */
- public static ODataResponse build(final Object jpaEntity, final GetEntityUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException, ODataNotFoundException {
+ public static ODataResponse build(final Object jpaEntity, final GetEntityUriInfo resultsView,
+ final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException,
+ ODataNotFoundException {
List<ArrayList<NavigationPropertySegment>> expandList = null;
if (jpaEntity == null) {
@@ -133,19 +139,23 @@ public final class ODataJPAResponseBuilder {
JPAEntityParser jpaResultParser = new JPAEntityParser();
final List<SelectItem> selectedItems = resultsView.getSelect();
if (selectedItems != null && selectedItems.size() > 0) {
- edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, buildSelectItemList(selectedItems, resultsView.getTargetEntitySet().getEntityType()));
+ edmPropertyValueMap =
+ jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, buildSelectItemList(selectedItems, resultsView
+ .getTargetEntitySet().getEntityType()));
} else {
edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, edmEntityType);
}
expandList = resultsView.getExpand();
if (expandList != null && expandList.size() != 0) {
- HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(jpaEntity, constructListofNavProperty(expandList));
+ HashMap<String, Object> navigationMap =
+ jpaResultParser.parse2EdmNavigationValueMap(jpaEntity, constructListofNavProperty(expandList));
edmPropertyValueMap.putAll(navigationMap);
}
EntityProviderWriteProperties feedProperties = null;
feedProperties = getEntityProviderProperties(oDataJPAContext, resultsView);
- odataResponse = EntityProvider.writeEntry(contentType, resultsView.getTargetEntitySet(), edmPropertyValueMap, feedProperties);
+ odataResponse =
+ EntityProvider.writeEntry(contentType, resultsView.getTargetEntitySet(), edmPropertyValueMap, feedProperties);
odataResponse = ODataResponse.fromResponse(odataResponse).status(HttpStatusCodes.OK).build();
@@ -159,7 +169,8 @@ public final class ODataJPAResponseBuilder {
}
/* Response for $count */
- public static ODataResponse build(final long jpaEntityCount, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException {
+ public static ODataResponse build(final long jpaEntityCount, final ODataJPAContext oDataJPAContext)
+ throws ODataJPARuntimeException {
ODataResponse odataResponse = null;
try {
@@ -173,7 +184,9 @@ public final class ODataJPAResponseBuilder {
/* Response for Create Entity */
@SuppressWarnings("unchecked")
- public static ODataResponse build(final List<Object> createdObjectList, final PostUriInfo uriInfo, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException, ODataNotFoundException {
+ public static ODataResponse build(final List<Object> createdObjectList, final PostUriInfo uriInfo,
+ final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException,
+ ODataNotFoundException {
if (createdObjectList == null || createdObjectList.size() == 0 || createdObjectList.get(0) == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
@@ -191,9 +204,12 @@ public final class ODataJPAResponseBuilder {
edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(createdObjectList.get(0), edmEntityType);
List<ArrayList<NavigationPropertySegment>> expandList = null;
- if (createdObjectList.get(1) != null && ((Map<EdmNavigationProperty, EdmEntitySet>) createdObjectList.get(1)).size() > 0) {
+ if (createdObjectList.get(1) != null
+ && ((Map<EdmNavigationProperty, EdmEntitySet>) createdObjectList.get(1)).size() > 0) {
expandList = getExpandList((Map<EdmNavigationProperty, EdmEntitySet>) createdObjectList.get(1));
- HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(createdObjectList.get(0), constructListofNavProperty(expandList));
+ HashMap<String, Object> navigationMap =
+ jpaResultParser.parse2EdmNavigationValueMap(createdObjectList.get(0),
+ constructListofNavProperty(expandList));
edmPropertyValueMap.putAll(navigationMap);
}
EntityProviderWriteProperties feedProperties = null;
@@ -203,7 +219,8 @@ public final class ODataJPAResponseBuilder {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
- odataResponse = EntityProvider.writeEntry(contentType, uriInfo.getTargetEntitySet(), edmPropertyValueMap, feedProperties);
+ odataResponse =
+ EntityProvider.writeEntry(contentType, uriInfo.getTargetEntitySet(), edmPropertyValueMap, feedProperties);
odataResponse = ODataResponse.fromResponse(odataResponse).status(HttpStatusCodes.CREATED).build();
@@ -217,7 +234,8 @@ public final class ODataJPAResponseBuilder {
}
/* Response for Update Entity */
- public static ODataResponse build(final Object updatedObject, final PutMergePatchUriInfo putUriInfo) throws ODataJPARuntimeException, ODataNotFoundException {
+ public static ODataResponse build(final Object updatedObject, final PutMergePatchUriInfo putUriInfo)
+ throws ODataJPARuntimeException, ODataNotFoundException {
if (updatedObject == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
}
@@ -225,7 +243,8 @@ public final class ODataJPAResponseBuilder {
}
/* Response for Delete Entity */
- public static ODataResponse build(final Object deletedObject, final DeleteUriInfo deleteUriInfo) throws ODataJPARuntimeException, ODataNotFoundException {
+ public static ODataResponse build(final Object deletedObject, final DeleteUriInfo deleteUriInfo)
+ throws ODataJPARuntimeException, ODataNotFoundException {
if (deletedObject == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
@@ -234,7 +253,8 @@ public final class ODataJPAResponseBuilder {
}
/* Response for Function Import Single Result */
- public static ODataResponse build(final Object result, final GetFunctionImportUriInfo resultsView) throws ODataJPARuntimeException {
+ public static ODataResponse build(final Object result, final GetFunctionImportUriInfo resultsView)
+ throws ODataJPARuntimeException {
try {
final EdmFunctionImport functionImport = resultsView.getFunctionImport();
@@ -260,7 +280,9 @@ public final class ODataJPAResponseBuilder {
}
/* Response for Function Import Multiple Result */
- public static ODataResponse build(final List<Object> resultList, final GetFunctionImportUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException, ODataNotFoundException {
+ public static ODataResponse build(final List<Object> resultList, final GetFunctionImportUriInfo resultsView,
+ final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException,
+ ODataNotFoundException {
ODataResponse odataResponse = null;
@@ -274,7 +296,9 @@ public final class ODataJPAResponseBuilder {
try {
EntityProviderWriteProperties feedProperties = null;
- feedProperties = EntityProviderWriteProperties.serviceRoot(oDataJPAContext.getODataContext().getPathInfo().getServiceRoot()).build();
+ feedProperties =
+ EntityProviderWriteProperties.serviceRoot(oDataJPAContext.getODataContext().getPathInfo().getServiceRoot())
+ .build();
functionImport = resultsView.getFunctionImport();
edmType = functionImport.getReturnType().getType();
@@ -299,7 +323,8 @@ public final class ODataJPAResponseBuilder {
result = resultList.get(0);
}
- odataResponse = EntityProvider.writeFunctionImport(contentType, resultsView.getFunctionImport(), result, feedProperties);
+ odataResponse =
+ EntityProvider.writeFunctionImport(contentType, resultsView.getFunctionImport(), result, feedProperties);
odataResponse = ODataResponse.fromResponse(odataResponse).status(HttpStatusCodes.OK).build();
} catch (EdmException e) {
@@ -318,7 +343,9 @@ public final class ODataJPAResponseBuilder {
}
/* Response for Read Entity Link */
- public static ODataResponse build(final Object jpaEntity, final GetEntityLinkUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataNotFoundException, ODataJPARuntimeException {
+ public static ODataResponse build(final Object jpaEntity, final GetEntityLinkUriInfo resultsView,
+ final String contentType, final ODataJPAContext oDataJPAContext) throws ODataNotFoundException,
+ ODataJPARuntimeException {
if (jpaEntity == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
@@ -335,7 +362,9 @@ public final class ODataJPAResponseBuilder {
JPAEntityParser jpaResultParser = new JPAEntityParser();
edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, edmEntityType.getKeyProperties());
- EntityProviderWriteProperties entryProperties = EntityProviderWriteProperties.serviceRoot(oDataJPAContext.getODataContext().getPathInfo().getServiceRoot()).build();
+ EntityProviderWriteProperties entryProperties =
+ EntityProviderWriteProperties.serviceRoot(oDataJPAContext.getODataContext().getPathInfo().getServiceRoot())
+ .build();
ODataResponse response = EntityProvider.writeLink(contentType, entitySet, edmPropertyValueMap, entryProperties);
@@ -350,7 +379,8 @@ public final class ODataJPAResponseBuilder {
}
/* Response for Read Entity Links */
- public static <T> ODataResponse build(final List<T> jpaEntities, final GetEntitySetLinksUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException {
+ public static <T> ODataResponse build(final List<T> jpaEntities, final GetEntitySetLinksUriInfo resultsView,
+ final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException {
EdmEntityType edmEntityType = null;
ODataResponse odataResponse = null;
@@ -381,7 +411,9 @@ public final class ODataJPAResponseBuilder {
}
ODataContext context = oDataJPAContext.getODataContext();
- EntityProviderWriteProperties entryProperties = EntityProviderWriteProperties.serviceRoot(context.getPathInfo().getServiceRoot()).inlineCountType(resultsView.getInlineCount()).inlineCount(count).build();
+ EntityProviderWriteProperties entryProperties =
+ EntityProviderWriteProperties.serviceRoot(context.getPathInfo().getServiceRoot()).inlineCountType(
+ resultsView.getInlineCount()).inlineCount(count).build();
odataResponse = EntityProvider.writeLinks(contentType, entitySet, edmEntityList, entryProperties);
@@ -396,15 +428,17 @@ public final class ODataJPAResponseBuilder {
}
/*
- * This method handles $inlinecount request. It also modifies the list of results in case of
+ * This method handles $inlinecount request. It also modifies the list of results in case of
* $inlinecount and $top/$skip combinations. Specific to LinksUriInfo. //TODO
*
* @param edmEntityList
- * @param resultsView
+ *
+ * @param resultsView
*
* @return
*/
- private static Integer getInlineCountForNonFilterQueryLinks(final List<Map<String, Object>> edmEntityList, final GetEntitySetLinksUriInfo resultsView) {
+ private static Integer getInlineCountForNonFilterQueryLinks(final List<Map<String, Object>> edmEntityList,
+ final GetEntitySetLinksUriInfo resultsView) {
// when $skip and/or $top is present with $inlinecount, first get the total count
Integer count = null;
if (resultsView.getInlineCount() == InlineCount.ALLPAGES) {
@@ -431,7 +465,9 @@ public final class ODataJPAResponseBuilder {
* Method to build the entity provider Property.Callbacks for $expand would
* be registered here
*/
- private static EntityProviderWriteProperties getEntityProviderProperties(final ODataJPAContext odataJPAContext, final GetEntitySetUriInfo resultsView, final List<Map<String, Object>> edmEntityList) throws ODataJPARuntimeException {
+ private static EntityProviderWriteProperties getEntityProviderProperties(final ODataJPAContext odataJPAContext,
+ final GetEntitySetUriInfo resultsView, final List<Map<String, Object>> edmEntityList)
+ throws ODataJPARuntimeException {
ODataEntityProviderPropertiesBuilder entityFeedPropertiesBuilder = null;
Integer count = null;
@@ -446,11 +482,14 @@ public final class ODataJPAResponseBuilder {
}
try {
- entityFeedPropertiesBuilder = EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
+ entityFeedPropertiesBuilder =
+ EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
entityFeedPropertiesBuilder.inlineCount(count);
entityFeedPropertiesBuilder.inlineCountType(resultsView.getInlineCount());
- ExpandSelectTreeNode expandSelectTree = UriParser.createExpandSelectTree(resultsView.getSelect(), resultsView.getExpand());
- entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext().getPathInfo().getServiceRoot(), expandSelectTree, resultsView.getExpand()));
+ ExpandSelectTreeNode expandSelectTree =
+ UriParser.createExpandSelectTree(resultsView.getSelect(), resultsView.getExpand());
+ entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext()
+ .getPathInfo().getServiceRoot(), expandSelectTree, resultsView.getExpand()));
entityFeedPropertiesBuilder.expandSelectTree(expandSelectTree);
} catch (ODataException e) {
@@ -461,11 +500,11 @@ public final class ODataJPAResponseBuilder {
}
/*
- * This method handles $inlinecount request. It also modifies the list of results in case of
+ * This method handles $inlinecount request. It also modifies the list of results in case of
* $inlinecount and $top/$skip combinations. Specific to Entity Set. //TODO
- *
*/
- private static Integer getInlineCountForNonFilterQueryEntitySet(final List<Map<String, Object>> edmEntityList, final GetEntitySetUriInfo resultsView) {
+ private static Integer getInlineCountForNonFilterQueryEntitySet(final List<Map<String, Object>> edmEntityList,
+ final GetEntitySetUriInfo resultsView) {
// when $skip and/or $top is present with $inlinecount, first get the total count
Integer count = null;
if (resultsView.getInlineCount() == InlineCount.ALLPAGES) {
@@ -488,14 +527,17 @@ public final class ODataJPAResponseBuilder {
return count;
}
- private static EntityProviderWriteProperties getEntityProviderProperties(final ODataJPAContext odataJPAContext, final GetEntityUriInfo resultsView) throws ODataJPARuntimeException {
+ private static EntityProviderWriteProperties getEntityProviderProperties(final ODataJPAContext odataJPAContext,
+ final GetEntityUriInfo resultsView) throws ODataJPARuntimeException {
ODataEntityProviderPropertiesBuilder entityFeedPropertiesBuilder = null;
ExpandSelectTreeNode expandSelectTree = null;
try {
- entityFeedPropertiesBuilder = EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
+ entityFeedPropertiesBuilder =
+ EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
expandSelectTree = UriParser.createExpandSelectTree(resultsView.getSelect(), resultsView.getExpand());
entityFeedPropertiesBuilder.expandSelectTree(expandSelectTree);
- entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext().getPathInfo().getServiceRoot(), expandSelectTree, resultsView.getExpand()));
+ entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext()
+ .getPathInfo().getServiceRoot(), expandSelectTree, resultsView.getExpand()));
} catch (ODataException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
@@ -503,14 +545,18 @@ public final class ODataJPAResponseBuilder {
return entityFeedPropertiesBuilder.build();
}
- private static EntityProviderWriteProperties getEntityProviderPropertiesforPost(final ODataJPAContext odataJPAContext, final PostUriInfo resultsView, final List<ArrayList<NavigationPropertySegment>> expandList) throws ODataJPARuntimeException {
+ private static EntityProviderWriteProperties getEntityProviderPropertiesforPost(
+ final ODataJPAContext odataJPAContext, final PostUriInfo resultsView,
+ final List<ArrayList<NavigationPropertySegment>> expandList) throws ODataJPARuntimeException {
ODataEntityProviderPropertiesBuilder entityFeedPropertiesBuilder = null;
ExpandSelectTreeNode expandSelectTree = null;
try {
- entityFeedPropertiesBuilder = EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
+ entityFeedPropertiesBuilder =
+ EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
expandSelectTree = UriParser.createExpandSelectTree(null, expandList);
entityFeedPropertiesBuilder.expandSelectTree(expandSelectTree);
- entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext().getPathInfo().getServiceRoot(), expandSelectTree, expandList));
+ entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext()
+ .getPathInfo().getServiceRoot(), expandSelectTree, expandList));
} catch (ODataException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
@@ -518,7 +564,8 @@ public final class ODataJPAResponseBuilder {
return entityFeedPropertiesBuilder.build();
}
- private static List<ArrayList<NavigationPropertySegment>> getExpandList(final Map<EdmNavigationProperty, EdmEntitySet> navPropEntitySetMap) {
+ private static List<ArrayList<NavigationPropertySegment>> getExpandList(
+ final Map<EdmNavigationProperty, EdmEntitySet> navPropEntitySetMap) {
List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
ArrayList<NavigationPropertySegment> navigationPropertySegmentList = new ArrayList<NavigationPropertySegment>();
for (Map.Entry<EdmNavigationProperty, EdmEntitySet> entry : navPropEntitySetMap.entrySet()) {
@@ -542,7 +589,8 @@ public final class ODataJPAResponseBuilder {
return expandList;
}
- private static List<EdmProperty> buildSelectItemList(final List<SelectItem> selectItems, final EdmEntityType entity) throws ODataJPARuntimeException {
+ private static List<EdmProperty> buildSelectItemList(final List<SelectItem> selectItems, final EdmEntityType entity)
+ throws ODataJPARuntimeException {
boolean flag = false;
List<EdmProperty> selectPropertyList = new ArrayList<EdmProperty>();
try {
@@ -568,7 +616,8 @@ public final class ODataJPAResponseBuilder {
return selectPropertyList;
}
- private static List<EdmNavigationProperty> constructListofNavProperty(final List<ArrayList<NavigationPropertySegment>> expandList) {
+ private static List<EdmNavigationProperty> constructListofNavProperty(
+ final List<ArrayList<NavigationPropertySegment>> expandList) {
List<EdmNavigationProperty> navigationPropertyList = new ArrayList<EdmNavigationProperty>();
for (ArrayList<NavigationPropertySegment> navpropSegment : expandList) {
navigationPropertyList.add(navpropSegment.get(0).getNavigationProperty());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntity.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntity.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntity.java
index 2e03fbd..7045cd5 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntity.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntity.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -71,7 +71,8 @@ public class JPAEntity {
}
@SuppressWarnings("unchecked")
- private void write(final Map<String, Object> oDataEntryProperties, final boolean isCreate) throws ODataJPARuntimeException {
+ private void write(final Map<String, Object> oDataEntryProperties, final boolean isCreate)
+ throws ODataJPARuntimeException {
try {
EdmStructuralType structuralType = null;
@@ -85,7 +86,8 @@ public class JPAEntity {
}
if (accessModifiersWrite == null) {
- accessModifiersWrite = jpaEntityParser.getAccessModifiers(jpaEntity, oDataEntityType, JPAEntityParser.ACCESS_MODIFIER_SET);
+ accessModifiersWrite =
+ jpaEntityParser.getAccessModifiers(jpaEntity, oDataEntityType, JPAEntityParser.ACCESS_MODIFIER_SET);
}
if (oDataEntityType == null || oDataEntryProperties == null) {
@@ -93,10 +95,10 @@ public class JPAEntity {
.throwException(ODataJPARuntimeException.GENERAL, null);
}
- final HashMap<String, String> embeddableKeys = jpaEntityParser.getJPAEmbeddableKeyMap(jpaEntity.getClass().getName());
+ final HashMap<String, String> embeddableKeys =
+ jpaEntityParser.getJPAEmbeddableKeyMap(jpaEntity.getClass().getName());
Set<String> propertyNames = null;
- if (embeddableKeys != null)
- {
+ if (embeddableKeys != null) {
setEmbeddableKeyProperty(embeddableKeys, oDataEntityType.getKeyProperties(), oDataEntryProperties, jpaEntity);
propertyNames = new HashSet<String>();
propertyNames.addAll(oDataEntryProperties.keySet());
@@ -132,7 +134,9 @@ public class JPAEntity {
case NAVIGATION:
case ENTITY:
structuralType = (EdmStructuralType) edmTyped.getType();
- accessModifier = jpaEntityParser.getAccessModifier(jpaEntity, (EdmNavigationProperty) edmTyped, JPAEntityParser.ACCESS_MODIFIER_SET);
+ accessModifier =
+ jpaEntityParser.getAccessModifier(jpaEntity, (EdmNavigationProperty) edmTyped,
+ JPAEntityParser.ACCESS_MODIFIER_SET);
EdmEntitySet edmRelatedEntitySet = oDataEntitySet.getRelatedEntitySet((EdmNavigationProperty) edmTyped);
List<ODataEntry> relatedEntries = (List<ODataEntry>) oDataEntryProperties.get(propertyName);
List<Object> relatedJPAEntites = new ArrayList<Object>();
@@ -222,21 +226,25 @@ public class JPAEntity {
}
@SuppressWarnings("unchecked")
- protected void setComplexProperty(Method accessModifier, final Object jpaEntity, final EdmStructuralType edmComplexType, final HashMap<String, Object> propertyValue)
- throws EdmException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException, ODataJPARuntimeException {
+ protected void setComplexProperty(Method accessModifier, final Object jpaEntity,
+ final EdmStructuralType edmComplexType, final HashMap<String, Object> propertyValue)
+ throws EdmException, IllegalAccessException, IllegalArgumentException, InvocationTargetException,
+ InstantiationException, ODataJPARuntimeException {
JPAEdmMapping mapping = (JPAEdmMapping) edmComplexType.getMapping();
Object embeddableObject = mapping.getJPAType().newInstance();
accessModifier.invoke(jpaEntity, embeddableObject);
- HashMap<String, Method> accessModifiers = jpaEntityParser.getAccessModifiers(embeddableObject, edmComplexType, JPAEntityParser.ACCESS_MODIFIER_SET);
+ HashMap<String, Method> accessModifiers =
+ jpaEntityParser.getAccessModifiers(embeddableObject, edmComplexType, JPAEntityParser.ACCESS_MODIFIER_SET);
for (String edmPropertyName : edmComplexType.getPropertyNames()) {
EdmTyped edmTyped = (EdmTyped) edmComplexType.getProperty(edmPropertyName);
accessModifier = accessModifiers.get(edmPropertyName);
if (edmTyped.getType().getKind().toString().equals(EdmTypeKind.COMPLEX.toString())) {
EdmStructuralType structualType = (EdmStructuralType) edmTyped.getType();
- setComplexProperty(accessModifier, embeddableObject, structualType, (HashMap<String, Object>) propertyValue.get(edmPropertyName));
+ setComplexProperty(accessModifier, embeddableObject, structualType, (HashMap<String, Object>) propertyValue
+ .get(edmPropertyName));
} else {
setProperty(accessModifier, embeddableObject, propertyValue.get(edmPropertyName));
}
@@ -247,39 +255,35 @@ public class JPAEntity {
IllegalAccessException, IllegalArgumentException, InvocationTargetException {
if (entityPropertyValue != null) {
Class<?> parameterType = method.getParameterTypes()[0];
- if (parameterType.equals(char[].class))
- {
+ if (parameterType.equals(char[].class)) {
char[] characters = ((String) entityPropertyValue).toCharArray();
method.invoke(entity, characters);
- }
- else if (parameterType.equals(char.class)) {
+ } else if (parameterType.equals(char.class)) {
char c = ((String) entityPropertyValue).charAt(0);
method.invoke(entity, c);
- }
- else if (parameterType.equals(Character[].class))
- {
+ } else if (parameterType.equals(Character[].class)) {
Character[] characters = JPAEntityParser.toCharacterArray((String) entityPropertyValue);
method.invoke(entity, (Object) characters);
- }
- else if (parameterType.equals(Character.class)) {
+ } else if (parameterType.equals(Character.class)) {
Character c = Character.valueOf(((String) entityPropertyValue).charAt(0));
method.invoke(entity, c);
- }
- else
+ } else {
method.invoke(entity, entityPropertyValue);
+ }
}
}
- protected void setEmbeddableKeyProperty(final HashMap<String, String> embeddableKeys, final List<EdmProperty> oDataEntryKeyProperties,
+ protected void setEmbeddableKeyProperty(final HashMap<String, String> embeddableKeys,
+ final List<EdmProperty> oDataEntryKeyProperties,
final Map<String, Object> oDataEntryProperties, final Object entity)
- throws ODataJPARuntimeException, EdmException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
+ throws ODataJPARuntimeException, EdmException, IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, InstantiationException {
HashMap<String, Object> embeddableObjMap = new HashMap<String, Object>();
List<EdmProperty> leftODataEntryKeyProperties = new ArrayList<EdmProperty>();
HashMap<String, String> leftEmbeddableKeys = new HashMap<String, String>();
- for (EdmProperty edmProperty : oDataEntryKeyProperties)
- {
+ for (EdmProperty edmProperty : oDataEntryKeyProperties) {
if (oDataEntryProperties.containsKey(edmProperty.getName()) == false) {
continue;
}
@@ -306,11 +310,10 @@ public class JPAEntity {
method = jpaEntityParser.getAccessModifierSet(embeddableObj, methodPartName);
Object simpleObj = oDataEntryProperties.get(edmProperty.getName());
method.invoke(embeddableObj, simpleObj);
- }
- else if (embeddableKeyNameSplit.length > 2) // Deeply nested
- {
+ } else if (embeddableKeyNameSplit.length > 2) { // Deeply nested
leftODataEntryKeyProperties.add(edmProperty);
- leftEmbeddableKeys.put(edmPropertyName, embeddableKeyNameComposite.split(embeddableKeyNameSplit[0] + ".", 2)[1]);
+ leftEmbeddableKeys
+ .put(edmPropertyName, embeddableKeyNameComposite.split(embeddableKeyNameSplit[0] + ".", 2)[1]);
setEmbeddableKeyProperty(leftEmbeddableKeys, leftODataEntryKeyProperties, oDataEntryProperties, embeddableObj);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java
index f424fa2..fad4b9b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -66,7 +66,7 @@ public final class JPAEntityParser {
* @param jpaEntity
* @param selectedItems
* @return a Hash Map of Properties and values for given selected properties
- * of an EdmEntity Type
+ * of an EdmEntity Type
* @throws ODataJPARuntimeException
*/
@@ -306,31 +306,31 @@ public final class JPAEntityParser {
return accessModifierMap;
}
- public static Object getProperty(Method method, Object entity) throws ODataJPARuntimeException {
+ public static Object getProperty(final Method method, final Object entity) throws ODataJPARuntimeException {
Object propertyValue = null;
try {
Class<?> returnType = method.getReturnType();
- if (returnType.equals(char[].class))
- {
+ if (returnType.equals(char[].class)) {
char[] ch = (char[]) method.invoke(entity);
- if (ch != null)
+ if (ch != null) {
propertyValue = (String) String.valueOf((char[]) method.invoke(entity));
- }
- else if (returnType.equals(Character[].class))
+ }
+ } else if (returnType.equals(Character[].class)) {
propertyValue = (String) toString((Character[]) method.invoke(entity));
- else if (returnType.equals(char.class)) {
+ } else if (returnType.equals(char.class)) {
char c = (Character) method.invoke(entity);
- if (c != '\u0000')
+ if (c != '\u0000') {
propertyValue = (String) String.valueOf(c);
- }
- else if (returnType.equals(Character.class)) {
+ }
+ } else if (returnType.equals(Character.class)) {
Character c = (Character) method.invoke(entity);
- if (c != null)
+ if (c != null) {
propertyValue = toString(new Character[] { c });
- }
- else
+ }
+ } else {
propertyValue = method.invoke(entity);
+ }
} catch (IllegalAccessException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (IllegalArgumentException e) {
@@ -341,30 +341,38 @@ public final class JPAEntityParser {
return propertyValue;
}
- public static String toString(Character[] input) {
- if (input == null) return null;
+ public static String toString(final Character[] input) {
+ if (input == null) {
+ return null;
+ }
StringBuilder builder = new StringBuilder();
- for (int i = 0; i < input.length; i++) {
- if (input[i] == null) continue;
- builder.append(input[i].charValue());
+ for (Character element : input) {
+ if (element == null) {
+ continue;
+ }
+ builder.append(element.charValue());
}
return builder.toString();
}
- public static Character[] toCharacterArray(String input) {
- if (input == null) return null;
+ public static Character[] toCharacterArray(final String input) {
+ if (input == null) {
+ return null;
+ }
Character[] characters = new Character[input.length()];
char[] chars = ((String) input).toCharArray();
- for (int i = 0; i < input.length(); i++)
+ for (int i = 0; i < input.length(); i++) {
characters[i] = new Character(chars[i]);
+ }
return characters;
}
- public static String getAccessModifierName(final String propertyName, final EdmMapping mapping, final String accessModifier)
+ public static String getAccessModifierName(final String propertyName, final EdmMapping mapping,
+ final String accessModifier)
throws ODataJPARuntimeException {
String name = null;
StringBuilder builder = new StringBuilder();
@@ -408,7 +416,8 @@ public final class JPAEntityParser {
}
- public Method getAccessModifier(final Object jpaEntity, final EdmNavigationProperty navigationProperty, final String accessModifier)
+ public Method getAccessModifier(final Object jpaEntity, final EdmNavigationProperty navigationProperty,
+ final String accessModifier)
throws ODataJPARuntimeException {
try {
[40/59] [abbrv] cleanup of odata fit tests
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
index 913f5f1..3bb834c 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -28,19 +28,18 @@ import java.lang.reflect.Field;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
-import org.custommonkey.xmlunit.XMLAssert;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.ref.model.DataContainer;
import org.apache.olingo.odata2.ref.model.Photo;
import org.apache.olingo.odata2.ref.processor.ListsProcessor;
import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
+import org.custommonkey.xmlunit.XMLAssert;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading a single entity in XML format.
- *
+ *
*/
public class EntryXmlReadOnlyTest extends AbstractRefXmlTest {
@@ -69,7 +68,11 @@ public class EntryXmlReadOnlyTest extends AbstractRefXmlTest {
response = callUri("Rooms('1')?$expand=nr_Employees");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
// assertNull(response.getFirstHeader(HttpHeaders.ETAG));
- assertXpathEvaluatesTo(EMPLOYEE_1_NAME, "/atom:entry/atom:link[@href=\"Rooms('1')/nr_Employees\"]/m:inline/atom:feed/atom:entry/m:properties/d:EmployeeName", getBody(response));
+ assertXpathEvaluatesTo(
+ EMPLOYEE_1_NAME,
+ "/atom:entry/atom:link[@href=\"Rooms('1')/nr_Employees\"]" +
+ "/m:inline/atom:feed/atom:entry/m:properties/d:EmployeeName",
+ getBody(response));
response = callUri("Container2.Photos(Id=1,Type='image%2Fpng')");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
@@ -80,7 +83,8 @@ public class EntryXmlReadOnlyTest extends AbstractRefXmlTest {
response = callUri("Container2.Photos(Id=4,Type='foo')");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
- assertXpathEvaluatesTo("Container2.Photos(Id=4,Type='foo')/$value", "/atom:entry/atom:content/@src", getBody(response));
+ assertXpathEvaluatesTo("Container2.Photos(Id=4,Type='foo')/$value", "/atom:entry/atom:content/@src",
+ getBody(response));
notFound("Managers('5')");
notFound("Managers('1%2C2')");
@@ -104,7 +108,8 @@ public class EntryXmlReadOnlyTest extends AbstractRefXmlTest {
dataContainer.getPhotos().add(new Photo(42, "strange Photo", "% :/?#[]@ !$&'()*+,;="));
// Check that percent-decoding and -encoding works as expected.
- final String url = "Container2.Photos(Id=42,Type='%25%20%3A%2F%3F%23%5B%5D%40%20%21%24%26%27%28%29%2A%2B%2C%3B%3D')";
+ final String url =
+ "Container2.Photos(Id=42,Type='%25%20%3A%2F%3F%23%5B%5D%40%20%21%24%26%27%28%29%2A%2B%2C%3B%3D')";
final String expected = url.replace("%27", "''");
final HttpResponse response = callUri(url);
final String body = getBody(response);
@@ -119,15 +124,27 @@ public class EntryXmlReadOnlyTest extends AbstractRefXmlTest {
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
String body = getBody(response);
assertXpathEvaluatesTo(EMPLOYEE_5_NAME, "/atom:entry/m:properties/d:EmployeeName", body);
- assertXpathEvaluatesTo(EMPLOYEE_3_NAME, "/atom:entry/atom:link[@href=\"Employees('5')/ne_Manager\"]/m:inline/atom:entry/m:properties/d:EmployeeName", body);
+ assertXpathEvaluatesTo(EMPLOYEE_3_NAME,
+ "/atom:entry/atom:link[@href=\"Employees('5')/ne_Manager\"]/m:inline/atom:entry/m:properties/d:EmployeeName",
+ body);
response = callUri("Rooms('3')?$expand=nr_Employees/ne_Manager");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
body = getBody(response);
assertXpathEvaluatesTo("3", "/atom:entry/atom:content[@type=\"application/xml\"]/m:properties/d:Id", body);
- assertXpathEvaluatesTo("1", "count(/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry)", body);
- assertXpathEvaluatesTo(EMPLOYEE_5_NAME, "/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry/m:properties/d:EmployeeName", body);
- assertXpathEvaluatesTo(EMPLOYEE_3_NAME, "/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry/atom:link[@href=\"Employees('5')/ne_Manager\"]/m:inline/atom:entry/m:properties/d:EmployeeName", body);
+ assertXpathEvaluatesTo("1",
+ "count(/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry)", body);
+ assertXpathEvaluatesTo(
+ EMPLOYEE_5_NAME,
+ "/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]" +
+ "/m:inline/atom:feed/atom:entry/m:properties/d:EmployeeName",
+ body);
+ assertXpathEvaluatesTo(
+ EMPLOYEE_3_NAME,
+ "/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]" +
+ "/m:inline/atom:feed/atom:entry/atom:link[@href=\"Employees('5')/ne_Manager\"]" +
+ "/m:inline/atom:entry/m:properties/d:EmployeeName",
+ body);
notFound("Employees('3')?$expand=noNavProp");
badRequest("Employees('3')?$expand=Age");
@@ -155,22 +172,38 @@ public class EntryXmlReadOnlyTest extends AbstractRefXmlTest {
assertEquals(entry, getBody(callUri("Employees('6')?$select=*,Age")));
assertEquals(entry, getBody(callUri("Employees('6')?$select=*,ne_Room")));
- checkUri("Container2.Photos(Id=4,Type='foo')?$select=%D0%A1%D0%BE%D0%B4%D0%B5%D1%80%D0%B6%D0%B0%D0%BD%D0%B8%D0%B5,Id");
+ checkUri("Container2.Photos(Id=4,Type='foo')?$select=%D0%A1%D0%BE%D0%B4%D0%B5%D1%80%D0%B6" +
+ "%D0%B0%D0%BD%D0%B8%D0%B5,Id");
response = callUri("Employees('6')?$expand=ne_Room&$select=ne_Room/Version");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
body = getBody(response);
- assertXpathEvaluatesTo("2", "/atom:entry/atom:link[@href=\"Employees('6')/ne_Room\"]/m:inline/atom:entry/atom:content[@type=\"application/xml\"]/m:properties/d:Version", body);
+ assertXpathEvaluatesTo(
+ "2",
+ "/atom:entry/atom:link[@href=\"Employees('6')/ne_Room\"]/m:inline/atom:entry/atom:content" +
+ "[@type=\"application/xml\"]/m:properties/d:Version",
+ body);
assertXpathNotExists("/atom:entry/m:properties/d:Location", body);
- assertXpathNotExists("/atom:entry/atom:link[@href=\"Employees('6')/ne_Room\"]/m:inline/atom:entry/atom:content[@type=\"application/xml\"]/m:properties/d:Seats", body);
+ assertXpathNotExists(
+ "/atom:entry/atom:link[@href=\"Employees('6')/ne_Room\"]/m:inline/atom:entry/atom:content" +
+ "[@type=\"application/xml\"]/m:properties/d:Seats",
+ body);
response = callUri("Rooms('3')?$expand=nr_Employees/ne_Team&$select=nr_Employees/ne_Team/Name");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
body = getBody(response);
- assertXpathEvaluatesTo("Team 2", "/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry/atom:link[@href=\"Employees('5')/ne_Team\"]/m:inline/atom:entry/atom:content/m:properties/d:Name", body);
+ assertXpathEvaluatesTo(
+ "Team 2",
+ "/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry" +
+ "/atom:link[@href=\"Employees('5')/ne_Team\"]/m:inline/atom:entry/atom:content/m:properties/d:Name",
+ body);
assertXpathNotExists("/atom:entry/atom:content/m:properties", body);
- assertXpathNotExists("/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry/m:properties", body);
- assertXpathNotExists("/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry/atom:link[@href=\"Employees('5')/ne_Team\"]/m:inline/atom:entry/atom:content/m:properties/d:Id", body);
+ assertXpathNotExists(
+ "/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry/m:properties", body);
+ assertXpathNotExists(
+ "/atom:entry/atom:link[@href=\"Rooms('3')/nr_Employees\"]/m:inline/atom:feed/atom:entry" +
+ "/atom:link[@href=\"Employees('5')/ne_Team\"]/m:inline/atom:entry/atom:content/m:properties/d:Id",
+ body);
notFound("Teams('3')?$select=noProp");
notFound("Teams()?$select=nt_Employees/noProp");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
index 2f1aeeb..1d78e42 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -22,13 +22,12 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading entity sets in JSON format.
- *
+ *
*/
public class FeedJsonReadOnlyTest extends AbstractRefTest {
@@ -122,7 +121,9 @@ public class FeedJsonReadOnlyTest extends AbstractRefTest {
@Test
public void feedWithTwoLevelInline() throws Exception {
- final HttpResponse response = callUri("Employees()?$expand=ne_Room/nr_Building&$select=Age,ne_Room/Seats,ne_Room/nr_Building/Name&$top=2&$format=json");
+ final HttpResponse response =
+ callUri("Employees()?$expand=ne_Room/nr_Building&$select=Age,ne_Room/Seats,ne_Room/nr_Building/Name&" +
+ "$top=2&$format=json");
checkMediaType(response, HttpContentType.APPLICATION_JSON);
assertEquals("{\"d\":{\"results\":[{\"__metadata\":{"
+ "\"id\":\"" + getEndpoint() + "Employees('1')\","
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
index 7e21881..93a30ca 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -24,14 +24,13 @@ import static org.custommonkey.xmlunit.XMLAssert.assertXpathNotExists;
import static org.junit.Assert.assertFalse;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading entity sets in XML format.
- *
+ *
*/
public class FeedXmlReadOnlyTest extends AbstractRefXmlTest {
@@ -173,7 +172,9 @@ public class FeedXmlReadOnlyTest extends AbstractRefXmlTest {
assertXpathEvaluatesTo("1", "count(/atom:feed/atom:entry)", body);
assertXpathEvaluatesTo(EMPLOYEE_2_NAME, "/atom:feed/atom:entry[1]/atom:title", body);
- response = callUri("Employees?$filter=indexof(ImageUrl,EmployeeId)%20mod%20(Age%20sub%2028)%20eq%20month(EntryDate)%20mul%203%20div%2027%20sub%201");
+ response =
+ callUri("Employees?$filter=indexof(ImageUrl,EmployeeId)%20mod%20(Age%20sub%2028)%20eq%20month" +
+ "(EntryDate)%20mul%203%20div%2027%20sub%201");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=feed");
body = getBody(response);
assertXpathEvaluatesTo("1", "count(/atom:feed/atom:entry)", body);
@@ -208,7 +209,8 @@ public class FeedXmlReadOnlyTest extends AbstractRefXmlTest {
assertXpathEvaluatesTo(EMPLOYEE_2_NAME, "/atom:entry/atom:title", getBody(response));
checkUri("Employees('1')/ne_Room/nr_Employees('1')?$filter=EmployeeId%20eq%20'1'");
- checkUri("Container2.Photos(Id=4,Type='foo')?$filter=%D0%A1%D0%BE%D0%B4%D0%B5%D1%80%D0%B6%D0%B0%D0%BD%D0%B8%D0%B5%20eq%20'%D0%9F%D1%80%D0%BE%D0%B4%D1%83%D0%BA%D1%82'");
+ checkUri("Container2.Photos(Id=4,Type='foo')?$filter=%D0%A1%D0%BE%D0%B4%D0%B5%D1%80%D0%B6%D0%B0%D0%BD%" +
+ "D0%B8%D0%B5%20eq%20'%D0%9F%D1%80%D0%BE%D0%B4%D1%83%D0%BA%D1%82'");
notFound("Employees('4')?$filter=Age%20eq%2099");
notFound("Rooms('1')/nr_Employees('1')?$filter=Age%20eq%2099");
@@ -245,17 +247,24 @@ public class FeedXmlReadOnlyTest extends AbstractRefXmlTest {
@Test
public void nextLinkQueryOptions() throws Exception {
- final HttpResponse response = callUri("Rooms?$format=atom&$filter=true&$inlinecount=none&$orderby=Name&$skiptoken=1&$skip=0&$top=200&$expand=nr_Building&$select=Seats");
+ final HttpResponse response =
+ callUri("Rooms?$format=atom&$filter=true&$inlinecount=none&$orderby=Name&$skiptoken=1&$skip=0&$top=200" +
+ "&$expand=nr_Building&$select=Seats");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=feed");
final String body = getBody(response);
- assertXpathEvaluatesTo("Rooms?$format=atom&$filter=true&$inlinecount=none&$orderby=Name&$top=200&$expand=nr_Building&$select=Seats&$skiptoken=97", "/atom:feed/atom:link[@rel='next']/@href", body);
+ assertXpathEvaluatesTo(
+ "Rooms?$format=atom&$filter=true&$inlinecount=none&$orderby=Name&$top=200&$expand=nr_Building" +
+ "&$select=Seats&$skiptoken=97",
+ "/atom:feed/atom:link[@rel='next']/@href", body);
}
@Test
public void nextLinkNavigation() throws Exception {
// We have to create one entry to have one more than the paging size.
final String requestBody = getBody(callUri("Rooms('1')")).replaceAll("<link.+?/>", "");
- HttpResponse response = postUri("Buildings('3')/nb_Rooms", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Buildings('3')/nb_Rooms", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY,
+ HttpStatusCodes.CREATED);
getBody(response);
response = callUri("Buildings('3')/nb_Rooms");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
index 00cdd0d..c6ff8dc 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -22,14 +22,13 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading function-import output in JSON format.
- *
+ *
*/
public class FunctionImportJsonTest extends AbstractRefTest {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
index fb11b42..b04ab21 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -27,14 +27,13 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading function-import output in XML format.
- *
+ *
*/
public class FunctionImportXmlTest extends AbstractRefXmlTest {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
index 0c07944..9a0e0fc 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
@@ -1,33 +1,32 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.junit.Test;
/**
* Tests employing the reference scenario changing links in JSON format.
- *
+ *
*/
public final class LinksJsonChangeTest extends AbstractRefTest {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
index a6425c7..29b8cbc 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
@@ -1,33 +1,32 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
import static org.junit.Assert.assertEquals;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading links in JSON format.
- *
+ *
*/
public final class LinksJsonReadOnlyTest extends AbstractRefTest {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
index 1a71b79..8bb66fb 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
@@ -1,35 +1,34 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.junit.Test;
/**
* Tests employing the reference scenario changing links in XML format.
- *
+ *
*/
public final class LinksXmlChangeTest extends AbstractRefTest {
@@ -55,12 +54,14 @@ public final class LinksXmlChangeTest extends AbstractRefTest {
assertEquals(XML_DECLARATION + requestBody, getBody(callUri(uriString)));
final String uriString2 = "Rooms('1')/$links/nr_Employees('1')";
- callUri(ODataHttpMethod.PATCH, uriString2, null, null, requestBody.replace("Rooms", "Employees"), HttpContentType.APPLICATION_XML, HttpStatusCodes.NO_CONTENT);
+ callUri(ODataHttpMethod.PATCH, uriString2, null, null, requestBody.replace("Rooms", "Employees"),
+ HttpContentType.APPLICATION_XML, HttpStatusCodes.NO_CONTENT);
notFound(uriString2);
checkUri(uriString2.replace("Employees('1')", "Employees('3')"));
putUri(uriString.replace("'2'", "'99'"), requestBody, HttpContentType.APPLICATION_XML, HttpStatusCodes.NOT_FOUND);
putUri(uriString, requestBody.replace("'3'", "'999'"), HttpContentType.APPLICATION_XML, HttpStatusCodes.NOT_FOUND);
- putUri("Teams('1')/nt_Employees('2')/$links/ne_Room", requestBody, HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
+ putUri("Teams('1')/nt_Employees('2')/$links/ne_Room", requestBody, HttpContentType.APPLICATION_XML,
+ HttpStatusCodes.BAD_REQUEST);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
index 4fdf877..8424839 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -23,13 +23,12 @@ import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
import static org.junit.Assert.assertFalse;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading links in XML format
- *
+ *
*/
public final class LinksXmlReadOnlyTest extends AbstractRefXmlTest {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
index 30c8e37..c472ef0 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -22,14 +22,13 @@ import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
import static org.junit.Assert.assertFalse;
import org.apache.http.HttpResponse;
+import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.junit.Before;
import org.junit.Test;
-import org.apache.olingo.odata2.api.commons.HttpContentType;
-
/**
* Tests employing the reference scenario reading the metadata document in XML format
- *
+ *
*/
public class MetadataTest extends AbstractRefXmlTest {
@@ -60,151 +59,441 @@ public class MetadataTest extends AbstractRefXmlTest {
@Test
public void testEntityTypes() throws Exception {
- //Employee
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Key", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Key/edm:PropertyRef[@Name='EmployeeId']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='EmployeeId' and @Type='Edm.String' and @Nullable='false']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='EmployeeName' and @Type='Edm.String' and @m:FC_TargetPath='SyndicationTitle']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='ManagerId' and @Type='Edm.String']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='RoomId' and @Type='Edm.String']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='TeamId' and @Type='Edm.String' and @MaxLength='2']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='Location' and @Type='RefScenario.c_Location']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='Age' and @Type='Edm.Int16']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='EntryDate' and @Type='Edm.DateTime' and @Nullable='true' and @m:FC_TargetPath='SyndicationUpdated']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Property[@Name='ImageUrl' and @Type='Edm.String']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:NavigationProperty[@Name='ne_Manager' and @Relationship='RefScenario.ManagerEmployees' and @FromRole='r_Employees' and @ToRole='r_Manager']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:NavigationProperty[@Name='ne_Team' and @Relationship='RefScenario.TeamEmployees' and @FromRole='r_Employees' and @ToRole='r_Team']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:NavigationProperty[@Name='ne_Room' and @Relationship='RefScenario.RoomEmployees' and @FromRole='r_Employees' and @ToRole='r_Room']", payload);
-
- //Team
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Team' and @BaseType='RefScenario.Base']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Team' and @BaseType='RefScenario.Base']/edm:Property[@Name='isScrumTeam' and @Type='Edm.Boolean' and @Nullable='true']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Team' and @BaseType='RefScenario.Base']/edm:NavigationProperty[@Name='nt_Employees' and @Relationship='RefScenario.TeamEmployees' and @FromRole='r_Team' and @ToRole='r_Employees']", payload);
-
- //Room
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and @BaseType='RefScenario.Base']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and @BaseType='RefScenario.Base']/edm:Property[@Name='Seats' and @Type='Edm.Int16']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and @BaseType='RefScenario.Base']/edm:Property[@Name='Version' and @Type='Edm.Int16' and @ConcurrencyMode='Fixed']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and @BaseType='RefScenario.Base']/edm:NavigationProperty[@Name='nr_Employees' and @Relationship='RefScenario.RoomEmployees' and @FromRole='r_Room' and @ToRole='r_Employees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and @BaseType='RefScenario.Base']/edm:NavigationProperty[@Name='nr_Building' and @Relationship='RefScenario.BuildingRooms' and @FromRole='r_Room' and @ToRole='r_Building']", payload);
-
- //Manager
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Manager' and @BaseType='RefScenario.Employee' and @m:HasStream='true']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Manager' and @BaseType='RefScenario.Employee' and @m:HasStream='true']/edm:NavigationProperty[@Name='nm_Employees' and @Relationship='RefScenario.ManagerEmployees' and @FromRole='r_Manager' and @ToRole='r_Employees']", payload);
-
- //Building
+ // Employee
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']", payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and @m:HasStream='true']/edm:Key",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and " +
+ "@m:HasStream='true']/edm:Key/edm:PropertyRef[@Name='EmployeeId']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and" +
+ " @m:HasStream='true']/edm:Property[@Name='EmployeeId' and @Type='Edm.String' and @Nullable='false']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and" +
+ " @m:HasStream='true']/edm:Property[@Name='EmployeeName' and @Type='Edm.String' and " +
+ "@m:FC_TargetPath='SyndicationTitle']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and " +
+ "@m:HasStream='true']/edm:Property[@Name='ManagerId' and @Type='Edm.String']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and " +
+ "@m:HasStream='true']/edm:Property[@Name='RoomId' and @Type='Edm.String']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and " +
+ "@m:HasStream='true']/edm:Property[@Name='TeamId' and @Type='Edm.String' and @MaxLength='2']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and" +
+ " @m:HasStream='true']/edm:Property[@Name='Location' and @Type='RefScenario.c_Location']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and " +
+ "@m:HasStream='true']/edm:Property[@Name='Age' and @Type='Edm.Int16']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and " +
+ "@m:HasStream='true']/edm:Property[@Name='EntryDate' and @Type='Edm.DateTime' and " +
+ "@Nullable='true' and @m:FC_TargetPath='SyndicationUpdated']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and " +
+ "@m:HasStream='true']/edm:Property[@Name='ImageUrl' and @Type='Edm.String']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and" +
+ " @m:HasStream='true']/edm:NavigationProperty[@Name='ne_Manager' and " +
+ "@Relationship='RefScenario.ManagerEmployees' and @FromRole='r_Employees' and @ToRole='r_Manager']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and" +
+ " @m:HasStream='true']/edm:NavigationProperty[@Name='ne_Team' and " +
+ "@Relationship='RefScenario.TeamEmployees' and @FromRole='r_Employees' and @ToRole='r_Team']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Employee' and " +
+ "@m:HasStream='true']/edm:NavigationProperty[@Name='ne_Room' and " +
+ "@Relationship='RefScenario.RoomEmployees' and @FromRole='r_Employees' and @ToRole='r_Room']",
+ payload);
+
+ // Team
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Team' and @BaseType='RefScenario.Base']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Team' and " +
+ "@BaseType='RefScenario.Base']/edm:Property[@Name='isScrumTeam' and @Type='Edm.Boolean' and @Nullable='true']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Team' and " +
+ "@BaseType='RefScenario.Base']/edm:NavigationProperty[@Name='nt_Employees' and " +
+ "@Relationship='RefScenario.TeamEmployees' and @FromRole='r_Team' and @ToRole='r_Employees']",
+ payload);
+
+ // Room
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and @BaseType='RefScenario.Base']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and " +
+ "@BaseType='RefScenario.Base']/edm:Property[@Name='Seats' and @Type='Edm.Int16']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and " +
+ "@BaseType='RefScenario.Base']/edm:Property[@Name='Version' and @Type='Edm.Int16' and " +
+ "@ConcurrencyMode='Fixed']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and" +
+ " @BaseType='RefScenario.Base']/edm:NavigationProperty[@Name='nr_Employees' and " +
+ "@Relationship='RefScenario.RoomEmployees' and @FromRole='r_Room' and @ToRole='r_Employees']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Room' and " +
+ "@BaseType='RefScenario.Base']/edm:NavigationProperty[@Name='nr_Building' and " +
+ "@Relationship='RefScenario.BuildingRooms' and @FromRole='r_Room' and @ToRole='r_Building']",
+ payload);
+
+ // Manager
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Manager' and " +
+ "@BaseType='RefScenario.Employee' and @m:HasStream='true']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Manager' and " +
+ "@BaseType='RefScenario.Employee' and @m:HasStream='true']/edm:NavigationProperty[@Name='nm_Employees' and " +
+ "@Relationship='RefScenario.ManagerEmployees' and @FromRole='r_Manager' and @ToRole='r_Employees']",
+ payload);
+
+ // Building
assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']", payload);
assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Key", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Key/edm:PropertyRef[@Name='Id']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Property[@Name='Id' and @Type='Edm.String' and @Nullable='false']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Property[@Name='Name' and @Type='Edm.String' and @m:FC_TargetPath='SyndicationAuthorName']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Property[@Name='Image' and @Type='Edm.Binary']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:NavigationProperty[@Name='nb_Rooms' and @Relationship='RefScenario.BuildingRooms' and @FromRole='r_Building' and @ToRole='r_Room']", payload);
-
- //Base
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']/edm:Key", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']/edm:Key/edm:PropertyRef[@Name='Id']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']/edm:Property[@Name='Id' and @Type='Edm.String' and @Nullable='false' and @DefaultValue='1']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']/edm:Property[@Name='Name' and @Type='Edm.String' and @m:FC_TargetPath='SyndicationTitle']", payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Key/edm:PropertyRef[@Name='Id']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Property[@Name='Id' and " +
+ "@Type='Edm.String' and @Nullable='false']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Property[@Name='Name' and " +
+ "@Type='Edm.String' and @m:FC_TargetPath='SyndicationAuthorName']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:Property[@Name='Image' and " +
+ "@Type='Edm.Binary']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Building']/edm:NavigationProperty" +
+ "[@Name='nb_Rooms' and @Relationship='RefScenario.BuildingRooms' and @FromRole='r_Building' and " +
+ "@ToRole='r_Room']",
+ payload);
+
+ // Base
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']/edm:Key", payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']" +
+ "/edm:Key/edm:PropertyRef[@Name='Id']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']" +
+ "/edm:Property[@Name='Id' and @Type='Edm.String' and @Nullable='false' and @DefaultValue='1']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType[@Name='Base' and @Abstract='true']" +
+ "/edm:Property[@Name='Name' and @Type='Edm.String' and @m:FC_TargetPath='SyndicationTitle']",
+ payload);
}
@Test
public void testComplexTypes() throws Exception {
- //Location
+ // Location
assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_Location']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_Location']/edm:Property[@Name='City' and @Type='RefScenario.c_City']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_Location']/edm:Property[@Name='Country' and @Type='Edm.String']", payload);
-
- //Location
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_Location']/edm:Property[@Name='City' and " +
+ "@Type='RefScenario.c_City']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_Location']/edm:Property[@Name='Country' " +
+ "and @Type='Edm.String']",
+ payload);
+
+ // Location
assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_City']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_City']/edm:Property[@Name='PostalCode' and @Type='Edm.String']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_City']/edm:Property[@Name='CityName' and @Type='Edm.String']", payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_City']/edm:Property[@Name='PostalCode' " +
+ "and @Type='Edm.String']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType[@Name='c_City']/edm:Property[@Name='CityName' " +
+ "and @Type='Edm.String']",
+ payload);
}
@Test
public void testAssociation() throws Exception {
- //ManagerEmployees
+ // ManagerEmployees
assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='ManagerEmployees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='ManagerEmployees']/edm:End[@Type='RefScenario.Employee' and @Multiplicity='*' and @Role='r_Employees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='ManagerEmployees']/edm:End[@Type='RefScenario.Manager' and @Multiplicity='1' and @Role='r_Manager']", payload);
-
- //TeamEmployees
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='ManagerEmployees']" +
+ "/edm:End[@Type='RefScenario.Employee' and @Multiplicity='*' and @Role='r_Employees']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='ManagerEmployees']" +
+ "/edm:End[@Type='RefScenario.Manager' and @Multiplicity='1' and @Role='r_Manager']",
+ payload);
+
+ // TeamEmployees
assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='TeamEmployees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='TeamEmployees']/edm:End[@Type='RefScenario.Employee' and @Multiplicity='*' and @Role='r_Employees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='TeamEmployees']/edm:End[@Type='RefScenario.Team' and @Multiplicity='1' and @Role='r_Team']", payload);
-
- //RoomEmployees
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='TeamEmployees']" +
+ "/edm:End[@Type='RefScenario.Employee' and @Multiplicity='*' and @Role='r_Employees']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='TeamEmployees']" +
+ "/edm:End[@Type='RefScenario.Team' and @Multiplicity='1' and @Role='r_Team']",
+ payload);
+
+ // RoomEmployees
assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='RoomEmployees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='RoomEmployees']/edm:End[@Type='RefScenario.Employee' and @Multiplicity='*' and @Role='r_Employees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='RoomEmployees']/edm:End[@Type='RefScenario.Room' and @Multiplicity='1' and @Role='r_Room']", payload);
-
- //BuildingRooms
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='RoomEmployees']" +
+ "/edm:End[@Type='RefScenario.Employee' and @Multiplicity='*' and @Role='r_Employees']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='RoomEmployees']" +
+ "/edm:End[@Type='RefScenario.Room' and @Multiplicity='1' and @Role='r_Room']",
+ payload);
+
+ // BuildingRooms
assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='BuildingRooms']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='BuildingRooms']/edm:End[@Type='RefScenario.Building' and @Multiplicity='1' and @Role='r_Building']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='BuildingRooms']/edm:End[@Type='RefScenario.Room' and @Multiplicity='*' and @Role='r_Room']", payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='BuildingRooms']" +
+ "/edm:End[@Type='RefScenario.Building' and @Multiplicity='1' and @Role='r_Building']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:Association[@Name='BuildingRooms']" +
+ "/edm:End[@Type='RefScenario.Room' and @Multiplicity='*' and @Role='r_Room']",
+ payload);
}
@Test
public void testEntityContainer() throws Exception {
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']", payload);
-
- //EntitySets
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Employees' and @EntityType='RefScenario.Employee']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Teams' and @EntityType='RefScenario.Team']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Rooms' and @EntityType='RefScenario.Room']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Managers' and @EntityType='RefScenario.Manager']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Buildings' and @EntityType='RefScenario.Building']", payload);
-
- //AssociationSets
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='ManagerEmployees' and @Association='RefScenario.ManagerEmployees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='ManagerEmployees' and @Association='RefScenario.ManagerEmployees']/edm:End[@EntitySet='Managers' and @Role='r_Manager']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='ManagerEmployees' and @Association='RefScenario.ManagerEmployees']/edm:End[@EntitySet='Employees' and @Role='r_Employees']", payload);
-
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='TeamEmployees' and @Association='RefScenario.TeamEmployees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='TeamEmployees' and @Association='RefScenario.TeamEmployees']/edm:End[@EntitySet='Teams' and @Role='r_Team']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='TeamEmployees' and @Association='RefScenario.TeamEmployees']/edm:End[@EntitySet='Employees' and @Role='r_Employees']", payload);
-
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='RoomEmployees' and @Association='RefScenario.RoomEmployees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='RoomEmployees' and @Association='RefScenario.RoomEmployees']/edm:End[@EntitySet='Rooms' and @Role='r_Room']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='RoomEmployees' and @Association='RefScenario.RoomEmployees']/edm:End[@EntitySet='Employees' and @Role='r_Employees']", payload);
-
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='BuildingRooms' and @Association='RefScenario.BuildingRooms']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='BuildingRooms' and @Association='RefScenario.BuildingRooms']/edm:End[@EntitySet='Buildings' and @Role='r_Building']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='BuildingRooms' and @Association='RefScenario.BuildingRooms']/edm:End[@EntitySet='Rooms' and @Role='r_Room']", payload);
-
- //FunctionImports
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='EmployeeSearch' and @ReturnType='Collection(RefScenario.Employee)' and @m:HttpMethod='GET' and @EntitySet='Employees']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='EmployeeSearch' and @ReturnType='Collection(RefScenario.Employee)' and @m:HttpMethod='GET' and @EntitySet='Employees']/edm:Parameter[@Name='q' and @Type='Edm.String' and @Nullable='true']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='AllLocations' and @ReturnType='Collection(RefScenario.c_Location)' and @m:HttpMethod='GET']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='AllUsedRoomIds' and @ReturnType='Collection(Edm.String)' and @m:HttpMethod='GET']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='MaximalAge' and @ReturnType='Edm.Int16' and @m:HttpMethod='GET']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='MostCommonLocation' and @ReturnType='RefScenario.c_Location' and @m:HttpMethod='GET']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='ManagerPhoto' and @ReturnType='Edm.Binary' and @m:HttpMethod='GET']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='ManagerPhoto' and @ReturnType='Edm.Binary' and @m:HttpMethod='GET']/edm:Parameter[@Name='Id' and @Type='Edm.String' and @Nullable='false']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and @m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='OldestEmployee' and @ReturnType='RefScenario.Employee' and @m:HttpMethod='GET' and @EntitySet='Employees']", payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']",
+ payload);
+
+ // EntitySets
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Employees' and @EntityType='RefScenario.Employee']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Teams' and @EntityType='RefScenario.Team']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Rooms' and @EntityType='RefScenario.Room']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Managers' and @EntityType='RefScenario.Manager']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:EntitySet[@Name='Buildings' and @EntityType='RefScenario.Building']",
+ payload);
+
+ // AssociationSets
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='ManagerEmployees' and " +
+ "@Association='RefScenario.ManagerEmployees']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='ManagerEmployees' and " +
+ "@Association='RefScenario.ManagerEmployees']/edm:End[@EntitySet='Managers' and @Role='r_Manager']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='ManagerEmployees' and " +
+ "@Association='RefScenario.ManagerEmployees']/edm:End[@EntitySet='Employees' and @Role='r_Employees']",
+ payload);
+
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='TeamEmployees' and " +
+ "@Association='RefScenario.TeamEmployees']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='TeamEmployees' and " +
+ "@Association='RefScenario.TeamEmployees']/edm:End[@EntitySet='Teams' and @Role='r_Team']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='TeamEmployees' and " +
+ "@Association='RefScenario.TeamEmployees']/edm:End[@EntitySet='Employees' and @Role='r_Employees']",
+ payload);
+
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='RoomEmployees' and " +
+ "@Association='RefScenario.RoomEmployees']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='RoomEmployees' and " +
+ "@Association='RefScenario.RoomEmployees']/edm:End[@EntitySet='Rooms' and @Role='r_Room']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='RoomEmployees' and " +
+ "@Association='RefScenario.RoomEmployees']/edm:End[@EntitySet='Employees' and @Role='r_Employees']",
+ payload);
+
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='BuildingRooms' and " +
+ "@Association='RefScenario.BuildingRooms']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='BuildingRooms' and " +
+ "@Association='RefScenario.BuildingRooms']/edm:End[@EntitySet='Buildings' and @Role='r_Building']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:AssociationSet[@Name='BuildingRooms' and " +
+ "@Association='RefScenario.BuildingRooms']/edm:End[@EntitySet='Rooms' and @Role='r_Room']",
+ payload);
+
+ // FunctionImports
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='EmployeeSearch' and " +
+ "@ReturnType='Collection(RefScenario.Employee)' and @m:HttpMethod='GET' and @EntitySet='Employees']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='EmployeeSearch' and " +
+ "@ReturnType='Collection(RefScenario.Employee)' and @m:HttpMethod='GET' and " +
+ "@EntitySet='Employees']/edm:Parameter[@Name='q' and @Type='Edm.String' and @Nullable='true']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='AllLocations' and " +
+ "@ReturnType='Collection(RefScenario.c_Location)' and @m:HttpMethod='GET']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='AllUsedRoomIds' and " +
+ "@ReturnType='Collection(Edm.String)' and @m:HttpMethod='GET']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='MaximalAge' and " +
+ "@ReturnType='Edm.Int16' and @m:HttpMethod='GET']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='MostCommonLocation' " +
+ "and @ReturnType='RefScenario.c_Location' and @m:HttpMethod='GET']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='ManagerPhoto' and " +
+ "@ReturnType='Edm.Binary' and @m:HttpMethod='GET']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='ManagerPhoto' and " +
+ "@ReturnType='Edm.Binary' and @m:HttpMethod='GET']/edm:Parameter[@Name='Id' and @Type='Edm.String' and " +
+ "@Nullable='false']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityContainer[@Name='Container1' and " +
+ "@m:IsDefaultEntityContainer='true']/edm:FunctionImport[@Name='OldestEmployee' and " +
+ "@ReturnType='RefScenario.Employee' and @m:HttpMethod='GET' and @EntitySet='Employees']",
+ payload);
}
@Test
public void testSchema2() throws Exception {
- //EntityType
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Key", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Key/edm:PropertyRef[@Name='Id']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Key/edm:PropertyRef[@Name='Type']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='Id' and @Type='Edm.Int32' and @Nullable='false' and @ConcurrencyMode='Fixed']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='Name' and @Type='Edm.String' and @m:FC_TargetPath='SyndicationTitle']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='Type' and @Type='Edm.String' and @Nullable='false']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='ImageUrl' and @Type='Edm.String' and @m:FC_TargetPath='SyndicationAuthorUri']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='Image' and @Type='Edm.Binary']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='BinaryData' and @Type='Edm.Binary' and @Nullable='true' and @m:MimeType='image/jpeg']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='Содержание' and @Type='Edm.String' and @Nullable='true' and @m:FC_KeepInContent='false' and @m:FC_NsPrefix='ру' and @m:FC_NsUri='http://localhost' and @m:FC_TargetPath='Содержание']", payload);
-
- //EntityContainer
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityContainer[@Name='Container2']", payload);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityContainer[@Name='Container2']/edm:EntitySet[@Name='Photos' and @EntityType='RefScenario2.Photo']", payload);
+ // EntityType
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']" +
+ "/edm:EntityType[@Name='Photo' and @m:HasStream='true']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']" +
+ "/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Key",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']" +
+ "/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Key/edm:PropertyRef[@Name='Id']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']" +
+ "/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Key/edm:PropertyRef[@Name='Type']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']" +
+ "/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='Id' and @Type='Edm.Int32' and " +
+ "@Nullable='false' and @ConcurrencyMode='Fixed']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']" +
+ "/edm:EntityType[@Name='Photo' and @m:HasStream='true']/edm:Property[@Name='Name' and @Type='Edm.String' and " +
+ "@m:FC_TargetPath='SyndicationTitle']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and " +
+ "@m:HasStream='true']/edm:Property[@Name='Type' and @Type='Edm.String' and @Nullable='false']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and " +
+ "@m:HasStream='true']/edm:Property[@Name='ImageUrl' and @Type='Edm.String' and " +
+ "@m:FC_TargetPath='SyndicationAuthorUri']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and " +
+ "@m:HasStream='true']/edm:Property[@Name='Image' and @Type='Edm.Binary']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and " +
+ "@m:HasStream='true']/edm:Property[@Name='BinaryData' and @Type='Edm.Binary' and @Nullable='true' and " +
+ "@m:MimeType='image/jpeg']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityType[@Name='Photo' and " +
+ "@m:HasStream='true']/edm:Property[@Name='Содержание' and @Type='Edm.String' and @Nullable='true' and " +
+ "@m:FC_KeepInContent='false' and @m:FC_NsPrefix='ру' and @m:FC_NsUri='http://localhost' and " +
+ "@m:FC_TargetPath='Содержание']",
+ payload);
+
+ // EntityContainer
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']/edm:EntityContainer[@Name='Container2']",
+ payload);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/edm:Schema[@Namespace='RefScenario2']" +
+ "/edm:EntityContainer[@Name='Container2']/edm:EntitySet[@Name='Photos' and @EntityType='RefScenario2.Photo']",
+ payload);
}
}
[09/59] [abbrv] Clean up of odata api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
index 1fd61ef..bb0b96b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import java.util.List;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmAnnotations holds all annotation attributes and elements for a specific CSDL element.
- *
+ *
*/
public interface EdmAnnotations {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java
index ffbee04..5f7c1bc 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,8 +22,8 @@ package org.apache.olingo.odata2.api.edm;
* @org.apache.olingo.odata2.DoNotImplement
* A CSDL Association element
*
- * <p>EdmAssociation defines the relationship of two entity types.
- *
+ * <p>EdmAssociation defines the relationship of two entity types.
+ *
*/
public interface EdmAssociation extends EdmType {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java
index 43dc3d9..8dc439c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
* A CSDL AssociationEnd element
*
* <p>EdmAssociationEnd defines one side of the relationship of two entity types.
- *
+ *
*/
public interface EdmAssociationEnd {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java
index 07a173f..0dd20ca 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
* A CSDL AssociationSet element
*
* <p>EdmAssociationSet defines the relationship of two entity sets.
- *
+ *
*/
public interface EdmAssociationSet extends EdmNamed {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java
index 87c7f26..3acb0a1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
* A CSDL AssociationSetEnd element
*
* <p>EdmAssociationSetEnd defines one side of the relationship of two entity sets.
- *
+ *
*/
public interface EdmAssociationSetEnd {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java
index d00268f..27caf4f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,9 +20,9 @@ package org.apache.olingo.odata2.api.edm;
/**
* <p>A CSDL ComplexType element.</p>
- * <p>EdmComplexType holds a set of related information like {@link EdmSimpleType}
- * properties and EdmComplexType properties.
- *
+ * <p>EdmComplexType holds a set of related information like {@link EdmSimpleType} properties and EdmComplexType
+ * properties.
+ *
* @org.apache.olingo.odata2.DoNotImplement
*/
public interface EdmComplexType extends EdmStructuralType {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java
index 307d84f..540353f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,8 +21,9 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmConcurrencyMode can be applied to any primitive Entity Data Model (EDM) type.
- * <p>Possible values are "None", which is the default, and "Fixed". Fixed implies that the property should be used for optimistic concurrency checks.
- *
+ * <p>Possible values are "None", which is the default, and "Fixed". Fixed implies that the property should be used for
+ * optimistic concurrency checks.
+ *
*/
public enum EdmConcurrencyMode {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java
index c1027c5..51ff83c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,8 +22,8 @@ package org.apache.olingo.odata2.api.edm;
* @org.apache.olingo.odata2.DoNotImplement
* EdmContentType is used for Feed Customization.
* <p>It specifies the content type of the value of the property being mapped via a customizable feed mapping.
- * This value can be "text", "html" or "xhtml".
- *
+ * This value can be "text", "html" or "xhtml".
+ *
*/
public enum EdmContentKind {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java
index 87ed5f5..643383a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* Customizable Feed property mappings for the AtomPub Format as defined in the OData specification.
- *
+ *
*/
public interface EdmCustomizableFeedMappings {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
index dcd7c49..5570f67 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
* @org.apache.olingo.odata2.DoNotImplement
* EdmElement is the base interface for {@link EdmParameter} and {@link EdmProperty} and provides
* the information by which facets further specialize the usage of the type.
- *
+ *
*/
public interface EdmElement extends EdmMappable, EdmTyped {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
index 4f44aa8..b953680 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
* A CSDL EntityContainer element
*
* <p>EdmEntityContainer hold the information of EntitySets, FunctionImports and AssociationSets contained
- *
+ *
*/
public interface EdmEntityContainer extends EdmNamed {
@@ -58,5 +58,6 @@ public interface EdmEntityContainer extends EdmNamed {
* @return {@link EdmAssociationSet}
* @throws EdmException
*/
- EdmAssociationSet getAssociationSet(EdmEntitySet sourceEntitySet, EdmNavigationProperty navigationProperty) throws EdmException;
+ EdmAssociationSet getAssociationSet(EdmEntitySet sourceEntitySet, EdmNavigationProperty navigationProperty)
+ throws EdmException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
index d97edaf..f097be5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,8 +21,8 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* A CSDL EntitySet element
- * <p>EdmEntitySet is the container for entity type instances as described in the OData protocol.
- *
+ * <p>EdmEntitySet is the container for entity type instances as described in the OData protocol.
+ *
*/
public interface EdmEntitySet extends EdmMappable, EdmNamed {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
index 0913e98..d18e3f5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,8 +23,8 @@ import java.net.URI;
/**
* @org.apache.olingo.odata2.DoNotImplement
* Objects of this class contain information about one entity set inside the EntityDataModel.
- *
- *
+ *
+ *
*/
public interface EdmEntitySetInfo {
@@ -44,7 +44,8 @@ public interface EdmEntitySetInfo {
public boolean isDefaultEntityContainer();
/**
- * We use a {@link URI} object here to ensure the right encoding. If a string representation is needed the toASCIIString() method can be used.
+ * We use a {@link URI} object here to ensure the right encoding. If a string representation is needed the
+ * toASCIIString() method can be used.
* @return the uri to this entity set e.g. "Employees"
*/
public URI getEntitySetUri();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
index 92abe01..6f1a907 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,11 +22,10 @@ import java.util.List;
/**
* <p>A CSDL EntityType element.</p>
- * <p>EdmEntityType holds a set of related information like {@link EdmSimpleType}
- * properties and {@link EdmComplexType} properties and in addition to a
- * {@link EdmComplexType complex type} it provides information about key properties,
- * customizable feed mappings and {@link EdmNavigationProperty navigation properties}.
- *
+ * <p>EdmEntityType holds a set of related information like {@link EdmSimpleType} properties and {@link EdmComplexType}
+ * properties and in addition to a {@link EdmComplexType complex type} it provides information about key properties,
+ * customizable feed mappings and {@link EdmNavigationProperty navigation properties}.
+ *
* @org.apache.olingo.odata2.DoNotImplement
*/
public interface EdmEntityType extends EdmStructuralType {
@@ -48,7 +47,7 @@ public interface EdmEntityType extends EdmStructuralType {
/**
* Indicates if the entity type is treated as Media Link Entry
* with associated Media Resource.
- * @return <code>true</code> if the entity type is a Media Link Entry
+ * @return <code>true</code> if the entity type is a Media Link Entry
* @throws EdmException
*/
boolean hasStream() throws EdmException;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
index 4b60e04..5c828cc 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
/**
* @org.apache.olingo.odata2.DoNotImplement
* An exception for problems regarding the Entity Data Model.
- *
+ *
*/
public class EdmException extends ODataMessageException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
index 6cb1ad8..6832fb6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
* @org.apache.olingo.odata2.DoNotImplement
* <p>A Facet is an element defined in CSDL that provides information
* that specializes the usage of a type.</p>
- *
+ *
*/
public interface EdmFacets {
@@ -42,7 +42,7 @@ public interface EdmFacets {
/**
* Get the maximum length of the type in use
- *
+ *
* @return the maximum length of the type in use as Integer
*/
Integer getMaxLength();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
index d94b53d..6b5fa4f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -30,7 +30,7 @@ import java.util.Collection;
* <li>{@link EdmSimpleType} or a collection of simple types
* <li>{@link EdmEntityType} or a collection of entity types
* <li>{@link EdmEntitySet}
- *
+ *
*/
public interface EdmFunctionImport extends EdmMappable, EdmNamed {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
index f600e1e..e788d76 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,9 +25,8 @@ package org.apache.olingo.odata2.api.edm;
* from the default representation mainly in the additional presence of type
* indicators (prefixes or suffixes, respectively); since the type information
* is stored here separately, the default representation is more appropriate.
- * Should the URI representation be needed, it can be re-created by calling
- * {@link EdmSimpleType#toUriLiteral}.</p>
- *
+ * Should the URI representation be needed, it can be re-created by calling {@link EdmSimpleType#toUriLiteral}.</p>
+ *
* @see EdmLiteralKind
*/
public final class EdmLiteral {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
index 42a12c2..0d21f52 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,15 +23,17 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
/**
* @org.apache.olingo.odata2.DoNotImplement
* Exception for violation of the OData URI construction rules, resulting in a 400 Bad Request response
- *
+ *
*/
public class EdmLiteralException extends EdmException {
private static final long serialVersionUID = 1L;
public static final MessageReference NOTEXT = createMessageReference(EdmLiteralException.class, "NOTEXT");
- public static final MessageReference LITERALFORMAT = createMessageReference(EdmLiteralException.class, "LITERALFORMAT");
- public static final MessageReference UNKNOWNLITERAL = createMessageReference(EdmLiteralException.class, "UNKNOWNLITERAL");
+ public static final MessageReference LITERALFORMAT = createMessageReference(EdmLiteralException.class,
+ "LITERALFORMAT");
+ public static final MessageReference UNKNOWNLITERAL = createMessageReference(EdmLiteralException.class,
+ "UNKNOWNLITERAL");
public EdmLiteralException(final MessageReference MessageReference) {
super(MessageReference);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
index d477f02..b4d34a0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmLiteralKind indicates the format of an EDM literal.
- *
+ *
*/
public enum EdmLiteralKind {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
index 975a240..9d14e16 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmMappable can be applied to CSDL elements to associate additional information.
- *
+ *
*/
public interface EdmMappable {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
index 3d605c7..750b407 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmMapping holds custom mapping information which can be applied to a CSDL element.
- *
+ *
*/
public interface EdmMapping {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
index c450454..e38ffb2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,10 +24,10 @@ package org.apache.olingo.odata2.api.edm;
* an association end can relate to:
* <dl>
* <dt>0..1</dt><dd>one or none</dd>
- * <dt> 1</dt><dd>exactly one</dd>
- * <dt> *</dt><dd>many</dd>
- * </dl></p>
- *
+ * <dt> 1</dt><dd>exactly one</dd>
+ * <dt> *</dt><dd>many</dd>
+ * </dl></p>
+ *
*/
public enum EdmMultiplicity {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
index 2066aca..22ca834 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,11 +21,11 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmName is the base interface for nearly all CSDL constructs.
- *
+ *
*/
public interface EdmNamed {
- /**
+ /**
* @return name as String
* @throws EdmException
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
index 6f50183..293c009 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
* A CSDL NavigationProperty element
*
* <p>EdmNavigationProperty allows navigation from one entity type to another via a relationship.
- *
+ *
*/
public interface EdmNavigationProperty extends EdmTyped, EdmMappable {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
index 951a170..fc1d6b2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,8 +21,9 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* A CSDL FunctionImportParameter element
- * <p>EdmParameter defines a function import parameter (which is used as input parameter). FunctionImports are described in {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport} or in the OData protocol.
- *
+ * <p>EdmParameter defines a function import parameter (which is used as input parameter). FunctionImports are described
+ * in {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport} or in the OData protocol.
+ *
*/
public interface EdmParameter extends EdmElement {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
index 6ec3954..a81367b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
* A CSDL Property element
* <p>EdmProperty defines a simple type or a complex type.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface EdmProperty extends EdmElement {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java
index 3dcc12f..ffe51c6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java
index 779368e..c7b8a31 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import java.util.List;
/**
* @org.apache.olingo.odata2.DoNotImplement
* <p>EdmReferentialConstraintRole indicates the role of the association end
- *
+ *
*/
public interface EdmReferentialConstraintRole {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
index 195e784..9b5b770 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,9 +25,10 @@ import org.apache.olingo.odata2.api.exception.ODataException;
/**
* @org.apache.olingo.odata2.DoNotImplement
- * This interface gives access to the metadata of a service, the calculated Data Service Version and an info list of all entity sets inside this EntityDataModel.
- *
- *
+ * This interface gives access to the metadata of a service, the calculated Data Service Version and an info list of all
+ * entity sets inside this EntityDataModel.
+ *
+ *
*/
public interface EdmServiceMetadata {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
index 53500e0..99da498 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -32,14 +32,18 @@ package org.apache.olingo.odata2.api.edm;
* <tr><td>Byte</td><td>{@link Short}, {@link Byte}, {@link Integer}, {@link Long}</td></tr>
* <tr><td>DateTime</td><td>{@link java.util.Calendar}, {@link java.util.Date}, {@link Long}</td></tr>
* <tr><td>DateTimeOffset</td><td>{@link java.util.Calendar}, {@link java.util.Date}, {@link Long}</td></tr>
- * <tr><td>Decimal</td><td>{@link java.math.BigDecimal}, {@link java.math.BigInteger}, {@link Double}, {@link Float}, {@link Byte}, {@link Short}, {@link Integer}, {@link Long}</td></tr>
- * <tr><td>Double</td><td>{@link Double}, {@link Float}, {@link java.math.BigDecimal}, {@link Byte}, {@link Short}, {@link Integer}, {@link Long}</td></tr>
+ * <tr><td>Decimal</td><td>{@link java.math.BigDecimal}, {@link java.math.BigInteger}, {@link Double}, {@link Float},
+ * {@link Byte}, {@link Short}, {@link Integer}, {@link Long}</td></tr>
+ * <tr><td>Double</td><td>{@link Double}, {@link Float}, {@link java.math.BigDecimal}, {@link Byte}, {@link Short},
+ * {@link Integer}, {@link Long}</td></tr>
* <tr><td>Guid</td><td>{@link java.util.UUID}</td></tr>
* <tr><td>Int16</td><td>{@link Short}, {@link Byte}, {@link Integer}, {@link Long}</td></tr>
* <tr><td>Int32</td><td>{@link Integer}, {@link Byte}, {@link Short}, {@link Long}</td></tr>
- * <tr><td>Int64</td><td>{@link Long}, {@link Byte}, {@link Short}, {@link Integer}, {@link java.math.BigInteger}</td></tr>
+ * <tr><td>Int64</td><td>{@link Long}, {@link Byte}, {@link Short}, {@link Integer}, {@link java.math.BigInteger}
+ * </td></tr>
* <tr><td>SByte</td><td>{@link Byte}, {@link Short}, {@link Integer}, {@link Long}</td></tr>
- * <tr><td>Single</td><td>{@link Float}, {@link Double}, {@link java.math.BigDecimal}, {@link Byte}, {@link Short}, {@link Integer}, {@link Long}</td></tr>
+ * <tr><td>Single</td><td>{@link Float}, {@link Double}, {@link java.math.BigDecimal}, {@link Byte}, {@link Short},
+ * {@link Integer}, {@link Long}</td></tr>
* <tr><td>String</td><td>{@link String}</td></tr>
* <tr><td>Time</td><td>{@link java.util.Calendar}, {@link java.util.Date}, {@link Long}</td></tr>
* </tbody>
@@ -52,7 +56,7 @@ package org.apache.olingo.odata2.api.edm;
* are also considered.
* The EDM simple types <code>DateTime</code>, <code>DateTimeOffset</code>, and
* <code>Time</code> can have a <code>Precision</code> facet.
- * <code>Decimal</code> can have the facets <code>Precision</code> and <code>Scale</code>.</p>
+ * <code>Decimal</code> can have the facets <code>Precision</code> and <code>Scale</code>.</p>
* <p>
* <table frame="box" rules="all">
* <thead>
@@ -61,24 +65,30 @@ package org.apache.olingo.odata2.api.edm;
* <tbody>
* <tr><td><b>DateTimeOffset</b></td>
* <td>
- * When an time string is parsed to an according <code>EdmDateTimeOffset</code> object it is assumed that this time string represents the local time with a timezone set.
+ * When an time string is parsed to an according <code>EdmDateTimeOffset</code> object it is assumed that this time
+ * string represents the local time with a timezone set.
* <br/>
- * As an example, when the following time string <code>"2012-02-29T15:33:00-04:00"</code> is parsed it is assumed that we have the local time ("15:33:00") which is in a timezone with an offset from UTC of "-04:00".
- * Hence the result is a calendar object within the local time (which is "15:33:00") and the according timezone offset ("-04:00") which then results in the UTC time of "19:33:00+00:00" ("15:33:00" - "-04:00" -> "19:33:00 UTC").
+ * As an example, when the following time string <code>"2012-02-29T15:33:00-04:00"</code> is parsed it is assumed that
+ * we have the local time ("15:33:00") which is in a timezone with an offset from UTC of "-04:00".
+ * Hence the result is a calendar object within the local time (which is "15:33:00") and the according timezone offset
+ * ("-04:00") which then results in the UTC time of "19:33:00+00:00" ("15:33:00" - "-04:00" -> "19:33:00 UTC").
* <br/>
- * As further explanation about our date time handling I reference to the following ISO specification: ISO 8601 - http://en.wikipedia.org/wiki/ISO_8601 and the copied section:
+ * As further explanation about our date time handling I reference to the following ISO specification: ISO 8601 -
+ * http://en.wikipedia.org/wiki/ISO_8601 and the copied section:
* Time_offsets_from_UTC - http://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC
* <blockquote>>
- * The following times all refer to the same moment: "18:30Z", "22:30+04:00", and "15:00-03:30". Nautical time zone letters are not used with the exception of Z.
- * To calculate UTC time one has to subtract the offset from the local time, e.g. for "15:00-03:30" do 15:00 - (-03:30) to get 18:30 UTC.
+ * The following times all refer to the same moment: "18:30Z", "22:30+04:00", and "15:00-03:30". Nautical time zone
+ * letters are not used with the exception of Z.
+ * To calculate UTC time one has to subtract the offset from the local time, e.g. for "15:00-03:30" do 15:00 - (-03:30)
+ * to get 18:30 UTC.
* </blockquote>
- * <em>The behavior of our ABAP OData Library and Microsoft examples is the same as described above.</em>
+ * <em>The behavior of our ABAP OData Library and Microsoft examples is the same as described above.</em>
* </td>
* </tr>
* </tbody>
* </table></p>
* </p>
- *
+ *
* @org.apache.olingo.odata2.DoNotImplement
*/
public interface EdmSimpleType extends EdmType {
@@ -88,8 +98,8 @@ public interface EdmSimpleType extends EdmType {
/**
* Checks type compatibility.
- *
- * @param simpleType the {@link EdmSimpleType} to be tested for compatibility
+ *
+ * @param simpleType the {@link EdmSimpleType} to be tested for compatibility
* @return <code>true</code> if the provided type is compatible to this type
*/
public boolean isCompatible(EdmSimpleType simpleType);
@@ -103,10 +113,10 @@ public interface EdmSimpleType extends EdmType {
/**
* Validates literal value.
- *
- * @param value the literal value
- * @param literalKind the kind of literal representation of value
- * @param facets additional constraints for parsing (optional)
+ *
+ * @param value the literal value
+ * @param literalKind the kind of literal representation of value
+ * @param facets additional constraints for parsing (optional)
* @return <code>true</code> if the validation is successful
* @see EdmLiteralKind
* @see EdmFacets
@@ -115,27 +125,28 @@ public interface EdmSimpleType extends EdmType {
/**
* Converts literal representation of value to system data type.
- *
- * @param value the literal representation of value
- * @param literalKind the kind of literal representation of value
- * @param facets additional constraints for parsing (optional)
- * @param returnType the class of the returned value; it must be one of the
- * list in the documentation of {@link EdmSimpleType}
+ *
+ * @param value the literal representation of value
+ * @param literalKind the kind of literal representation of value
+ * @param facets additional constraints for parsing (optional)
+ * @param returnType the class of the returned value; it must be one of the
+ * list in the documentation of {@link EdmSimpleType}
* @return the value as an instance of the class the parameter <code>returnType</code> indicates
* @see EdmLiteralKind
* @see EdmFacets
*/
- public <T> T valueOfString(String value, EdmLiteralKind literalKind, EdmFacets facets, Class<T> returnType) throws EdmSimpleTypeException;
+ public <T> T valueOfString(String value, EdmLiteralKind literalKind, EdmFacets facets, Class<T> returnType)
+ throws EdmSimpleTypeException;
/**
* <p>Converts system data type to literal representation of value.</p>
* <p>Returns <code>null</code> if value is <code>null</code>
* and the facets allow the <code>null</code> value.</p>
- *
- * @param value the Java value as Object; its type must be one of the list
- * in the documentation of {@link EdmSimpleType}
- * @param literalKind the requested kind of literal representation
- * @param facets additional constraints for formatting (optional)
+ *
+ * @param value the Java value as Object; its type must be one of the list
+ * in the documentation of {@link EdmSimpleType}
+ * @param literalKind the requested kind of literal representation
+ * @param facets additional constraints for formatting (optional)
* @return literal representation as String
* @see EdmLiteralKind
* @see EdmFacets
@@ -144,8 +155,8 @@ public interface EdmSimpleType extends EdmType {
/**
* Converts default literal representation to URI literal representation.
- *
- * @param literal the literal in default representation
+ *
+ * @param literal the literal in default representation
* @return URI literal representation as String
*/
public String toUriLiteral(String literal) throws EdmSimpleTypeException;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
index ce756c8..771623c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
/**
* @org.apache.olingo.odata2.DoNotImplement
* Exception for parsing errors with {@link EdmSimpleType}s
- *
+ *
*/
public class EdmSimpleTypeException extends EdmException {
@@ -31,18 +31,28 @@ public class EdmSimpleTypeException extends EdmException {
public static final MessageReference COMMON = createMessageReference(EdmSimpleTypeException.class, "COMMON");
- public static final MessageReference LITERAL_KIND_MISSING = createMessageReference(EdmSimpleTypeException.class, "LITERAL_KIND_MISSING");
- public static final MessageReference LITERAL_KIND_NOT_SUPPORTED = createMessageReference(EdmSimpleTypeException.class, "LITERAL_KIND_NOT_SUPPORTED");
+ public static final MessageReference LITERAL_KIND_MISSING = createMessageReference(EdmSimpleTypeException.class,
+ "LITERAL_KIND_MISSING");
+ public static final MessageReference LITERAL_KIND_NOT_SUPPORTED = createMessageReference(
+ EdmSimpleTypeException.class, "LITERAL_KIND_NOT_SUPPORTED");
- public static final MessageReference LITERAL_NULL_NOT_ALLOWED = createMessageReference(EdmSimpleTypeException.class, "LITERAL_NULL_NOT_ALLOWED");
- public static final MessageReference LITERAL_ILLEGAL_CONTENT = createMessageReference(EdmSimpleTypeException.class, "LITERAL_ILLEGAL_CONTENT");
- public static final MessageReference LITERAL_FACETS_NOT_MATCHED = createMessageReference(EdmSimpleTypeException.class, "LITERAL_FACETS_NOT_MATCHED");
- public static final MessageReference LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE = createMessageReference(EdmSimpleTypeException.class, "LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE");
+ public static final MessageReference LITERAL_NULL_NOT_ALLOWED = createMessageReference(EdmSimpleTypeException.class,
+ "LITERAL_NULL_NOT_ALLOWED");
+ public static final MessageReference LITERAL_ILLEGAL_CONTENT = createMessageReference(EdmSimpleTypeException.class,
+ "LITERAL_ILLEGAL_CONTENT");
+ public static final MessageReference LITERAL_FACETS_NOT_MATCHED = createMessageReference(
+ EdmSimpleTypeException.class, "LITERAL_FACETS_NOT_MATCHED");
+ public static final MessageReference LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE = createMessageReference(
+ EdmSimpleTypeException.class, "LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE");
- public static final MessageReference VALUE_TYPE_NOT_SUPPORTED = createMessageReference(EdmSimpleTypeException.class, "VALUE_TYPE_NOT_SUPPORTED");
- public static final MessageReference VALUE_NULL_NOT_ALLOWED = createMessageReference(EdmSimpleTypeException.class, "VALUE_NULL_NOT_ALLOWED");
- public static final MessageReference VALUE_ILLEGAL_CONTENT = createMessageReference(EdmSimpleTypeException.class, "VALUE_ILLEGAL_CONTENT");
- public static final MessageReference VALUE_FACETS_NOT_MATCHED = createMessageReference(EdmSimpleTypeException.class, "VALUE_FACETS_NOT_MATCHED");
+ public static final MessageReference VALUE_TYPE_NOT_SUPPORTED = createMessageReference(EdmSimpleTypeException.class,
+ "VALUE_TYPE_NOT_SUPPORTED");
+ public static final MessageReference VALUE_NULL_NOT_ALLOWED = createMessageReference(EdmSimpleTypeException.class,
+ "VALUE_NULL_NOT_ALLOWED");
+ public static final MessageReference VALUE_ILLEGAL_CONTENT = createMessageReference(EdmSimpleTypeException.class,
+ "VALUE_ILLEGAL_CONTENT");
+ public static final MessageReference VALUE_FACETS_NOT_MATCHED = createMessageReference(EdmSimpleTypeException.class,
+ "VALUE_FACETS_NOT_MATCHED");
public EdmSimpleTypeException(final MessageReference messageReference) {
super(messageReference);
@@ -56,7 +66,8 @@ public class EdmSimpleTypeException extends EdmException {
super(messageReference, errorCode);
}
- public EdmSimpleTypeException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
+ public EdmSimpleTypeException(final MessageReference messageReference, final Throwable cause,
+ final String errorCode) {
super(messageReference, cause, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
index 8c170af..82a82b8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* This facade is used as a hook into the core implementation.
- *
+ *
*/
public interface EdmSimpleTypeFacade {
[31/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java
index 8873a89..7c31a16 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -39,7 +39,7 @@ import com.google.gson.stream.JsonReader;
/**
* Reads the OData service document (JSON).
- *
+ *
*/
public class JsonServiceDocumentConsumer {
private static final String DEFAULT_CHARSET = "UTF-8";
@@ -63,11 +63,14 @@ public class JsonServiceDocumentConsumer {
reader.peek();
reader.close();
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final IllegalStateException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return new ServiceDocumentImpl().setEntitySetsInfo(entitySets);
}
@@ -104,13 +107,15 @@ public class JsonServiceDocumentConsumer {
private JsonReader createJsonReader(final InputStream in) throws EntityProviderException {
if (in == null) {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent(("Got not supported NULL object as content to de-serialize.")));
+ throw new EntityProviderException(EntityProviderException.INVALID_STATE
+ .addContent(("Got not supported NULL object as content to de-serialize.")));
}
InputStreamReader isReader;
try {
isReader = new InputStreamReader(in, DEFAULT_CHARSET);
} catch (final UnsupportedEncodingException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return new JsonReader(isReader);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
index d065d4d..6559b9d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.core.ep.aggregator.EntityInfoAggregator;
/**
* Xml entity (content type dependent) consumer for reading input (from <code>content</code>).
*
- *
+ *
*/
public class XmlEntityConsumer {
@@ -51,7 +51,8 @@ public class XmlEntityConsumer {
super();
}
- public ODataFeed readFeed(final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataFeed readFeed(final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
XMLStreamReader reader = null;
EntityProviderException cachedException = null;
@@ -65,7 +66,9 @@ public class XmlEntityConsumer {
cachedException = e;
throw cachedException;
} catch (XMLStreamException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -75,14 +78,16 @@ public class XmlEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
}
}
- public ODataEntry readEntry(final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataEntry readEntry(final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
XMLStreamReader reader = null;
EntityProviderException cachedException = null;
@@ -95,7 +100,9 @@ public class XmlEntityConsumer {
cachedException = e;
throw cachedException;
} catch (XMLStreamException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -105,24 +112,29 @@ public class XmlEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
}
}
- public Map<String, Object> readProperty(final EdmProperty edmProperty, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public Map<String, Object> readProperty(final EdmProperty edmProperty, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
XMLStreamReader reader = null;
EntityProviderException cachedException = null;
XmlPropertyConsumer xec = new XmlPropertyConsumer();
try {
reader = createStaxReader(content);
- Map<String, Object> result = xec.readProperty(reader, edmProperty, properties.getMergeSemantic(), properties.getTypeMappings());
+ Map<String, Object> result =
+ xec.readProperty(reader, edmProperty, properties.getMergeSemantic(), properties.getTypeMappings());
return result;
} catch (XMLStreamException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -132,18 +144,21 @@ public class XmlEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
}
}
- public Object readPropertyValue(final EdmProperty edmProperty, final InputStream content) throws EntityProviderException {
+ public Object readPropertyValue(final EdmProperty edmProperty, final InputStream content)
+ throws EntityProviderException {
return readPropertyValue(edmProperty, content, null);
}
- public Object readPropertyValue(final EdmProperty edmProperty, final InputStream content, final Class<?> typeMapping) throws EntityProviderException {
+ public Object readPropertyValue(final EdmProperty edmProperty, final InputStream content, final Class<?> typeMapping)
+ throws EntityProviderException {
try {
final Map<String, Object> result;
EntityProviderReadPropertiesBuilder propertiesBuilder = EntityProviderReadProperties.init().mergeSemantic(false);
@@ -156,7 +171,8 @@ public class XmlEntityConsumer {
}
return result.get(edmProperty.getName());
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -169,7 +185,9 @@ public class XmlEntityConsumer {
reader = createStaxReader(content);
return xlc.readLink(reader, entitySet);
} catch (XMLStreamException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -179,7 +197,8 @@ public class XmlEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
@@ -195,7 +214,9 @@ public class XmlEntityConsumer {
reader = createStaxReader(content);
return xlc.readLinks(reader, entitySet);
} catch (XMLStreamException e) {
- cachedException = new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ cachedException =
+ new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
throw cachedException;
} finally {// NOPMD (suppress DoNotThrowExceptionInFinally)
if (reader != null) {
@@ -205,7 +226,8 @@ public class XmlEntityConsumer {
if (cachedException != null) {
throw cachedException;
} else {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
@@ -224,10 +246,12 @@ public class XmlEntityConsumer {
if (content instanceof InputStream) {
XMLStreamReader streamReader = factory.createXMLStreamReader((InputStream) content, DEFAULT_CHARSET);
- // verify charset encoding set in content is supported (if not set UTF-8 is used as defined in 'http://www.w3.org/TR/2008/REC-xml-20081126/')
+ // verify charset encoding set in content is supported (if not set UTF-8 is used as defined in
+ // 'http://www.w3.org/TR/2008/REC-xml-20081126/')
String characterEncodingInContent = streamReader.getCharacterEncodingScheme();
if (characterEncodingInContent != null && !DEFAULT_CHARSET.equalsIgnoreCase(characterEncodingInContent)) {
- throw new EntityProviderException(EntityProviderException.UNSUPPORTED_CHARACTER_ENCODING.addContent(characterEncodingInContent));
+ throw new EntityProviderException(EntityProviderException.UNSUPPORTED_CHARACTER_ENCODING
+ .addContent(characterEncodingInContent));
}
return streamReader;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
index 4d2775e..47d4eef 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -59,9 +59,10 @@ import org.apache.olingo.odata2.core.uri.ExpandSelectTreeNodeImpl;
/**
* Atom/XML format reader/consumer for entries.
*
- * {@link XmlEntryConsumer} instance can be reused for several {@link #readEntry(XMLStreamReader, EntityInfoAggregator, EntityProviderReadProperties)} calls
+ * {@link XmlEntryConsumer} instance can be reused for several
+ * {@link #readEntry(XMLStreamReader, EntityInfoAggregator, EntityProviderReadProperties)} calls
* but be aware that the instance and their <code>readEntry*</code> methods are <b>NOT THREAD SAFE</b>.
- *
+ *
*/
public class XmlEntryConsumer {
@@ -73,7 +74,8 @@ public class XmlEntryConsumer {
private EntityTypeMapping typeMappings;
private String currentHandledStartTagName;
- public ODataEntry readEntry(final XMLStreamReader reader, final EntityInfoAggregator eia, final EntityProviderReadProperties readProperties) throws EntityProviderException {
+ public ODataEntry readEntry(final XMLStreamReader reader, final EntityInfoAggregator eia,
+ final EntityProviderReadProperties readProperties) throws EntityProviderException {
try {
initialize(readProperties);
@@ -86,9 +88,11 @@ public class XmlEntryConsumer {
return readEntryResult;
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -113,7 +117,8 @@ public class XmlEntryConsumer {
typeMappings = EntityTypeMapping.create(readProperties.getTypeMappings());
}
- private void handleStartedTag(final XMLStreamReader reader, final EntityInfoAggregator eia, final EntityProviderReadProperties readProperties)
+ private void handleStartedTag(final XMLStreamReader reader, final EntityInfoAggregator eia,
+ final EntityProviderReadProperties readProperties)
throws EntityProviderException, XMLStreamException, EdmException {
currentHandledStartTagName = reader.getLocalName();
@@ -135,7 +140,8 @@ public class XmlEntryConsumer {
}
}
- private void readCustomElement(final XMLStreamReader reader, final String tagName, final EntityInfoAggregator eia) throws EdmException, EntityProviderException, XMLStreamException {
+ private void readCustomElement(final XMLStreamReader reader, final String tagName, final EntityInfoAggregator eia)
+ throws EdmException, EntityProviderException, XMLStreamException {
EntityPropertyInfo targetPathInfo = eia.getTargetPathInfo(tagName);
NamespaceContext nsctx = reader.getNamespaceContext();
@@ -212,7 +218,9 @@ public class XmlEntryConsumer {
* @throws XMLStreamException
* @throws EdmException
*/
- private void readLink(final XMLStreamReader reader, final EntityInfoAggregator eia, final EntityProviderReadProperties readProperties) throws EntityProviderException, XMLStreamException, EdmException {
+ private void readLink(final XMLStreamReader reader, final EntityInfoAggregator eia,
+ final EntityProviderReadProperties readProperties) throws EntityProviderException, XMLStreamException,
+ EdmException {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_LINK);
final String rel = reader.getAttributeValue(null, FormatXml.ATOM_REL);
@@ -255,14 +263,16 @@ public class XmlEntryConsumer {
* @throws EntityProviderException
* @throws EdmException
*/
- private void readInlineContent(final XMLStreamReader reader, final EntityInfoAggregator eia, final EntityProviderReadProperties readProperties,
+ private void readInlineContent(final XMLStreamReader reader, final EntityInfoAggregator eia,
+ final EntityProviderReadProperties readProperties,
final String atomLinkType, final String atomLinkRel)
throws XMLStreamException, EntityProviderException, EdmException {
//
String navigationPropertyName = atomLinkRel.substring(Edm.NAMESPACE_REL_2007_08.length());
- EdmNavigationProperty navigationProperty = (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
+ EdmNavigationProperty navigationProperty =
+ (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
EdmEntitySet entitySet = eia.getEntitySet().getRelatedEntitySet(navigationProperty);
EntityInfoAggregator inlineEia = EntityInfoAggregator.create(entitySet);
@@ -273,9 +283,11 @@ public class XmlEntryConsumer {
List<ODataEntry> inlineEntries = new ArrayList<ODataEntry>();
- while (!(reader.isEndElement() && Edm.NAMESPACE_M_2007_08.equals(reader.getNamespaceURI()) && FormatXml.M_INLINE.equals(reader.getLocalName()))) {
+ while (!(reader.isEndElement() && Edm.NAMESPACE_M_2007_08.equals(reader.getNamespaceURI()) && FormatXml.M_INLINE
+ .equals(reader.getLocalName()))) {
- if (reader.isStartElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI()) && FormatXml.ATOM_ENTRY.equals(reader.getLocalName())) {
+ if (reader.isStartElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())
+ && FormatXml.ATOM_ENTRY.equals(reader.getLocalName())) {
XmlEntryConsumer xec = new XmlEntryConsumer();
ODataEntry inlineEntry = xec.readEntry(reader, inlineEia, inlineProperties);
inlineEntries.add(inlineEntry);
@@ -298,10 +310,12 @@ public class XmlEntryConsumer {
* @param navigationProperty
* @param isFeed
* @param inlineEntries
- * @throws EntityProviderException
+ * @throws EntityProviderException
*/
- private void updateReadProperties(final EntityProviderReadProperties readProperties, final String navigationPropertyName,
- final EdmNavigationProperty navigationProperty, final boolean isFeed, final List<ODataEntry> inlineEntries) throws EntityProviderException {
+ private void updateReadProperties(final EntityProviderReadProperties readProperties,
+ final String navigationPropertyName,
+ final EdmNavigationProperty navigationProperty, final boolean isFeed, final List<ODataEntry> inlineEntries)
+ throws EntityProviderException {
Object entry = extractODataEntity(isFeed, inlineEntries);
OnReadInlineContent callback = readProperties.getCallback();
if (callback == null) {
@@ -313,13 +327,15 @@ public class XmlEntryConsumer {
}
/**
- * Updates the expand select tree ({@link #expandSelectTree}) for this {@link ReadEntryResult} ({@link #readEntryResult}).
+ * Updates the expand select tree ({@link #expandSelectTree}) for this {@link ReadEntryResult} (
+ * {@link #readEntryResult}).
*
* @param navigationPropertyName
* @param inlineEntries
- * @throws EntityProviderException
+ * @throws EntityProviderException
*/
- private void updateExpandSelectTree(final String navigationPropertyName, final List<ODataEntry> inlineEntries) throws EntityProviderException {
+ private void updateExpandSelectTree(final String navigationPropertyName, final List<ODataEntry> inlineEntries)
+ throws EntityProviderException {
expandSelectTree.setExpanded();
ExpandSelectTreeNodeImpl subNode = getExpandSelectTreeNode(inlineEntries);
expandSelectTree.putLink(navigationPropertyName, subNode);
@@ -330,10 +346,12 @@ public class XmlEntryConsumer {
* {@link ExpandSelectTreeNodeImpl}.
*
* @param inlineEntries entries which are checked for existing {@link ExpandSelectTreeNodeImpl}
- * @return {@link ExpandSelectTreeNodeImpl} from the <code>inlineEntries</code> or if none exists create a new {@link ExpandSelectTreeNodeImpl}.
+ * @return {@link ExpandSelectTreeNodeImpl} from the <code>inlineEntries</code> or if none exists create a new
+ * {@link ExpandSelectTreeNodeImpl}.
* @throws EntityProviderException if an unsupported {@link ExpandSelectTreeNode} implementation was found.
*/
- private ExpandSelectTreeNodeImpl getExpandSelectTreeNode(final List<ODataEntry> inlineEntries) throws EntityProviderException {
+ private ExpandSelectTreeNodeImpl getExpandSelectTreeNode(final List<ODataEntry> inlineEntries)
+ throws EntityProviderException {
if (inlineEntries.isEmpty()) {
return new ExpandSelectTreeNodeImpl();
} else {
@@ -348,7 +366,7 @@ public class XmlEntryConsumer {
}
/**
- * Get a list of {@link ODataEntry}, an empty list, a single {@link ODataEntry} or <code>NULL</code> based on
+ * Get a list of {@link ODataEntry}, an empty list, a single {@link ODataEntry} or <code>NULL</code> based on
* <code>isFeed</code> value and <code>inlineEntries</code> content.
*
* @param isFeed
@@ -357,7 +375,7 @@ public class XmlEntryConsumer {
*/
private Object extractODataEntity(final boolean isFeed, final List<ODataEntry> inlineEntries) {
if (isFeed) {
- //TODO: fill metadata correctly with inline count and inline next link. Both are currently ignored.
+ // TODO: fill metadata correctly with inline count and inline next link. Both are currently ignored.
return new ODataFeedImpl(inlineEntries, new FeedMetadataImpl());
} else if (!inlineEntries.isEmpty()) {
return inlineEntries.get(0);
@@ -375,7 +393,8 @@ public class XmlEntryConsumer {
* @param entry
* @throws EntityProviderException
*/
- private void doCallback(final EntityProviderReadProperties readProperties, final EdmNavigationProperty navigationProperty,
+ private void doCallback(final EntityProviderReadProperties readProperties,
+ final EdmNavigationProperty navigationProperty,
final OnReadInlineContent callback, final boolean isFeed, final Object content) throws EntityProviderException {
try {
@@ -387,20 +406,23 @@ public class XmlEntryConsumer {
callback.handleReadEntry(callbackInfo);
}
} catch (ODataApplicationException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
/**
- * Create {@link EntityProviderReadProperties} which can be used for reading of inline properties/entrys of navigation links within
+ * Create {@link EntityProviderReadProperties} which can be used for reading of inline properties/entrys of navigation
+ * links within
* this current read entry.
*
* @param readProperties
* @param navigationProperty
* @return
- * @throws EntityProviderException
+ * @throws EntityProviderException
*/
- private EntityProviderReadProperties createInlineProperties(final EntityProviderReadProperties readProperties, final EdmNavigationProperty navigationProperty) throws EntityProviderException {
+ private EntityProviderReadProperties createInlineProperties(final EntityProviderReadProperties readProperties,
+ final EdmNavigationProperty navigationProperty) throws EntityProviderException {
final OnReadInlineContent callback = readProperties.getCallback();
EntityProviderReadProperties currentReadProperties = EntityProviderReadProperties.initFrom(readProperties).build();
@@ -410,7 +432,8 @@ public class XmlEntryConsumer {
try {
return callback.receiveReadProperties(currentReadProperties, navigationProperty);
} catch (ODataApplicationException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
@@ -419,30 +442,34 @@ public class XmlEntryConsumer {
* <p>
* Inline content was found and {@link XMLStreamReader} already points to <code><m:inline> tag</code>.
* <br/>
- * <b>ATTENTION</b>: If {@link XMLStreamReader} does not point to the <code><m:inline> tag</code> an exception is thrown.
+ * <b>ATTENTION</b>: If {@link XMLStreamReader} does not point to the <code><m:inline> tag</code> an exception is
+ * thrown.
* </p>
* <p>
* Check whether it is an inline <code>Feed</code> or <code>Entry</code> and validate that...
* <ul>
* <li>...{@link FormatXml#M_INLINE} tag is correctly set.</li>
* <li>...based on {@link EdmMultiplicity} of {@link EdmNavigationProperty} all tags are correctly set.</li>
- * <li>...{@link FormatXml#ATOM_TYPE} tag is correctly set and according to {@link FormatXml#ATOM_ENTRY} or {@link FormatXml#ATOM_FEED} to following tags are available.</li>
+ * <li>...{@link FormatXml#ATOM_TYPE} tag is correctly set and according to {@link FormatXml#ATOM_ENTRY} or
+ * {@link FormatXml#ATOM_FEED} to following tags are available.</li>
* </ul>
*
* For the case that one of above validations fail an {@link EntityProviderException} is thrown.
- * If validation was successful <code>true</code> is returned for <code>Feed</code> and <code>false</code> for <code>Entry</code>
+ * If validation was successful <code>true</code> is returned for <code>Feed</code> and <code>false</code> for
+ * <code>Entry</code>
* multiplicity.
* </p>
*
* @param reader xml content reader which already points to <code><m:inline> tag</code>
- * @param eia all necessary information about the entity
+ * @param eia all necessary information about the entity
* @param type the atom type attribute value of the <code>link</code> tag
* @param navigationPropertyName the navigation property name of the entity
* @return <code>true</code> for <code>Feed</code> and <code>false</code> for <code>Entry</code>
* @throws EntityProviderException is thrown if at least one validation fails.
* @throws EdmException if edm access fails
*/
- private boolean isInlineFeedValidated(final XMLStreamReader reader, final EntityInfoAggregator eia, final String type, final String navigationPropertyName) throws EntityProviderException, EdmException {
+ private boolean isInlineFeedValidated(final XMLStreamReader reader, final EntityInfoAggregator eia,
+ final String type, final String navigationPropertyName) throws EntityProviderException, EdmException {
boolean isFeed = false;
try {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
@@ -452,7 +479,8 @@ public class XmlEntryConsumer {
throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"));
}
- EdmNavigationProperty navigationProperty = (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
+ EdmNavigationProperty navigationProperty =
+ (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
EdmMultiplicity navigationMultiplicity = navigationProperty.getMultiplicity();
switch (navigationMultiplicity) {
@@ -471,7 +499,8 @@ public class XmlEntryConsumer {
return isFeed;
}
- private void validateEntryTags(final XMLStreamReader reader, final ContentType cType) throws XMLStreamException, EntityProviderException {
+ private void validateEntryTags(final XMLStreamReader reader, final ContentType cType) throws XMLStreamException,
+ EntityProviderException {
if (FormatXml.ATOM_ENTRY.equals(cType.getParameters().get(FormatXml.ATOM_TYPE))) {
int next = reader.nextTag();
if (XMLStreamConstants.START_ELEMENT == next) {
@@ -484,7 +513,8 @@ public class XmlEntryConsumer {
}
}
- private void validateFeedTags(final XMLStreamReader reader, final ContentType cType) throws XMLStreamException, EntityProviderException {
+ private void validateFeedTags(final XMLStreamReader reader, final ContentType cType) throws XMLStreamException,
+ EntityProviderException {
if (FormatXml.ATOM_FEED.equals(cType.getParameters().get(FormatXml.ATOM_TYPE))) {
int next = reader.nextTag();
if (XMLStreamConstants.START_ELEMENT == next) {
@@ -497,7 +527,8 @@ public class XmlEntryConsumer {
}
}
- private void readContent(final XMLStreamReader reader, final EntityInfoAggregator eia) throws EntityProviderException, XMLStreamException, EdmException {
+ private void readContent(final XMLStreamReader reader, final EntityInfoAggregator eia)
+ throws EntityProviderException, XMLStreamException, EdmException {
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_CONTENT);
final String contentType = reader.getAttributeValue(null, FormatXml.ATOM_TYPE);
@@ -511,7 +542,8 @@ public class XmlEntryConsumer {
reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_CONTENT);
} else {
throw new EntityProviderException(EntityProviderException.INVALID_STATE
- .addContent("Expected closing 'content' or starting 'properties' but found '" + reader.getLocalName() + "'."));
+ .addContent("Expected closing 'content' or starting 'properties' but found '"
+ + reader.getLocalName() + "'."));
}
mediaMetadata.setContentType(contentType);
@@ -528,7 +560,8 @@ public class XmlEntryConsumer {
reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ID);
}
- private void readProperties(final XMLStreamReader reader, final EntityInfoAggregator entitySet) throws XMLStreamException, EdmException, EntityProviderException {
+ private void readProperties(final XMLStreamReader reader, final EntityInfoAggregator entitySet)
+ throws XMLStreamException, EdmException, EntityProviderException {
// validate namespace
reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_PROPERTIES);
if (entitySet.getEntityType().hasStream()) {
@@ -561,7 +594,8 @@ public class XmlEntryConsumer {
} else if (reader.isEndElement()) {
if (reader.getLocalName().equals(closeTag)) {
closeTag = null;
- } else if (Edm.NAMESPACE_M_2007_08.equals(reader.getNamespaceURI()) && FormatXml.M_PROPERTIES.equals(reader.getLocalName())) {
+ } else if (Edm.NAMESPACE_M_2007_08.equals(reader.getNamespaceURI())
+ && FormatXml.M_PROPERTIES.equals(reader.getLocalName())) {
run = false;
}
}
@@ -571,28 +605,33 @@ public class XmlEntryConsumer {
/**
* Check if the {@link #currentHandledStartTagName} is the same as the <code>expectedTagName</code>.
- * If tag name is not as expected or if {@link #currentHandledStartTagName} is not set an {@link EntityProviderException} is thrown.
+ * If tag name is not as expected or if {@link #currentHandledStartTagName} is not set an
+ * {@link EntityProviderException} is thrown.
*
* @param expectedTagName expected name for {@link #currentHandledStartTagName}
- * @throws EntityProviderException if tag name is not as expected or if {@link #currentHandledStartTagName} is <code>NULL</code>.
+ * @throws EntityProviderException if tag name is not as expected or if {@link #currentHandledStartTagName} is
+ * <code>NULL</code>.
*/
private void checkCurrentHandledStartTag(final String expectedTagName) throws EntityProviderException {
if (currentHandledStartTagName == null) {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent("No current handled start tag name set."));
+ throw new EntityProviderException(EntityProviderException.INVALID_STATE
+ .addContent("No current handled start tag name set."));
} else if (!currentHandledStartTagName.equals(expectedTagName)) {
- throw new EntityProviderException(EntityProviderException.INVALID_PARENT_TAG.addContent(expectedTagName).addContent(currentHandledStartTagName));
+ throw new EntityProviderException(EntityProviderException.INVALID_PARENT_TAG.addContent(expectedTagName)
+ .addContent(currentHandledStartTagName));
}
}
/**
- * Checks if property of currently read tag in {@link XMLStreamReader} is defined in
+ * Checks if property of currently read tag in {@link XMLStreamReader} is defined in
* <code>edm properties namespace</code> {@value Edm#NAMESPACE_D_2007_08}.
*
* If no namespace uri definition is found for namespace prefix of property (<code>tag</code>) an exception is thrown.
*
* @param reader {@link XMLStreamReader} with position at to checked tag
* @return <code>true</code> if property is in <code>edm properties namespace</code>, otherwise <code>false</code>.
- * @throws EntityProviderException If no namespace uri definition is found for namespace prefix of property (<code>tag</code>).
+ * @throws EntityProviderException If no namespace uri definition is found for namespace prefix of property
+ * (<code>tag</code>).
*/
private boolean isEdmNamespaceProperty(final XMLStreamReader reader) throws EntityProviderException {
final String nsUri = reader.getNamespaceURI();
@@ -614,7 +653,8 @@ public class XmlEntryConsumer {
* @return valid {@link EntityPropertyInfo} (which is never <code>NULL</code>).
* @throws EntityProviderException
*/
- private EntityPropertyInfo getValidatedPropertyInfo(final EntityInfoAggregator entitySet, final String name) throws EntityProviderException {
+ private EntityPropertyInfo getValidatedPropertyInfo(final EntityInfoAggregator entitySet, final String name)
+ throws EntityProviderException {
EntityPropertyInfo info = entitySet.getPropertyInfo(name);
if (info == null) {
throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY.addContent(name));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
index b0e2f80..d0df839 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -40,10 +40,11 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
* Atom/XML format reader/consumer for feeds.
*
- * {@link XmlFeedConsumer} instance use {@link XmlEntryConsumer#readEntry(XMLStreamReader, EntityInfoAggregator, EntityProviderReadProperties)}
- * for read/consume of several entries.
+ * {@link XmlFeedConsumer} instance use
+ * {@link XmlEntryConsumer#readEntry(XMLStreamReader, EntityInfoAggregator, EntityProviderReadProperties)} for
+ * read/consume of several entries.
+ *
*
- *
*/
public class XmlFeedConsumer {
@@ -55,7 +56,8 @@ public class XmlFeedConsumer {
* @return {@link ODataFeed} object
* @throws EntityProviderException
*/
- public ODataFeed readFeed(final XMLStreamReader reader, final EntityInfoAggregator eia, final EntityProviderReadProperties readProperties) throws EntityProviderException {
+ public ODataFeed readFeed(final XMLStreamReader reader, final EntityInfoAggregator eia,
+ final EntityProviderReadProperties readProperties) throws EntityProviderException {
try {
// read xml tag
reader.require(XMLStreamConstants.START_DOCUMENT, null, null);
@@ -72,21 +74,25 @@ public class XmlFeedConsumer {
// read feed data (metadata and entries)
return readFeedData(reader, eia, entryReadProperties);
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
/**
- * Read all feed specific data (like <code>inline count</code> and <code>next link</code>) as well as all feed entries (<code>entry</code>).
+ * Read all feed specific data (like <code>inline count</code> and <code>next link</code>) as well as all feed entries
+ * (<code>entry</code>).
*
* @param reader xml stream reader with xml content to be read
* @param eia entity infos for validation and mapping
* @param entryReadProperties properties which are used for read of feed.
- * @return all feed specific data (like <code>inline count</code> and <code>next link</code>) as well as all feed entries (<code>entry</code>).
+ * @return all feed specific data (like <code>inline count</code> and <code>next link</code>) as well as all feed
+ * entries (<code>entry</code>).
* @throws XMLStreamException if malformed xml is read in stream
* @throws EntityProviderException if xml contains invalid data (based on odata specification and edm definition)
*/
- private ODataFeed readFeedData(final XMLStreamReader reader, final EntityInfoAggregator eia, final EntityProviderReadProperties entryReadProperties) throws XMLStreamException, EntityProviderException {
+ private ODataFeed readFeedData(final XMLStreamReader reader, final EntityInfoAggregator eia,
+ final EntityProviderReadProperties entryReadProperties) throws XMLStreamException, EntityProviderException {
FeedMetadataImpl metadata = new FeedMetadataImpl();
XmlEntryConsumer xec = new XmlEntryConsumer();
List<ODataEntry> results = new ArrayList<ODataEntry>();
@@ -106,7 +112,8 @@ public class XmlFeedConsumer {
if (inlineCountNumber >= 0) {
metadata.setInlineCount(inlineCountNumber);
} else {
- throw new EntityProviderException(EntityProviderException.INLINECOUNT_INVALID.addContent(inlineCountNumber));
+ throw new EntityProviderException(EntityProviderException.INLINECOUNT_INVALID
+ .addContent(inlineCountNumber));
}
} catch (NumberFormatException e) {
throw new EntityProviderException(EntityProviderException.INLINECOUNT_INVALID.addContent(""), e);
@@ -166,10 +173,11 @@ public class XmlFeedConsumer {
/**
*
- * @param foundPrefix2NamespaceUri
+ * @param foundPrefix2NamespaceUri
* @throws EntityProviderException
*/
- private void checkAllMandatoryNamespacesAvailable(final Map<String, String> foundPrefix2NamespaceUri) throws EntityProviderException {
+ private void checkAllMandatoryNamespacesAvailable(final Map<String, String> foundPrefix2NamespaceUri)
+ throws EntityProviderException {
if (!foundPrefix2NamespaceUri.containsValue(Edm.NAMESPACE_D_2007_08)) {
throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE.addContent(Edm.NAMESPACE_D_2007_08));
} else if (!foundPrefix2NamespaceUri.containsValue(Edm.NAMESPACE_M_2007_08)) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java
index 72c69ef..9536c62 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -47,7 +47,8 @@ public class XmlLinkConsumer {
reader.next();
return readLink(reader);
} catch (final XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -55,7 +56,8 @@ public class XmlLinkConsumer {
return readTag(reader, Edm.NAMESPACE_D_2007_08, FormatXml.D_URI);
}
- private String readTag(final XMLStreamReader reader, final String namespaceURI, final String localName) throws XMLStreamException {
+ private String readTag(final XMLStreamReader reader, final String namespaceURI, final String localName)
+ throws XMLStreamException {
reader.require(XMLStreamConstants.START_ELEMENT, namespaceURI, localName);
reader.next();
@@ -69,22 +71,21 @@ public class XmlLinkConsumer {
}
/**
- * Reads multiple links with format
- * <pre>
- * {@code
+ * Reads multiple links with format
+ * <pre> {@code
* <links>
* <uri>http://somelink</uri>
* <uri>http://anotherLink</uri>
* <uri>http://somelink/yetAnotherLink</uri>
* </links>
- * }
- * </pre>
+ * } </pre>
* @param reader
* @param entitySet
* @return list of string based links
* @throws EntityProviderException
*/
- public List<String> readLinks(final XMLStreamReader reader, final EdmEntitySet entitySet) throws EntityProviderException {
+ public List<String> readLinks(final XMLStreamReader reader, final EdmEntitySet entitySet)
+ throws EntityProviderException {
try {
List<String> links = new ArrayList<String>();
@@ -106,7 +107,8 @@ public class XmlLinkConsumer {
return links;
} catch (final XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
index 2bd649c..8ecd4d4 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -113,7 +113,8 @@ public class XmlMetadataConsumer {
reader.close();
return dataServices;
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -206,7 +207,8 @@ public class XmlMetadataConsumer {
container.setName(reader.getAttributeValue(null, XmlMetadataConstants.EDM_NAME));
if (reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.EDM_CONTAINER_IS_DEFAULT) != null) {
- container.setDefaultEntityContainer("true".equalsIgnoreCase(reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, "IsDefaultEntityContainer")));
+ container.setDefaultEntityContainer("true".equalsIgnoreCase(reader.getAttributeValue(Edm.NAMESPACE_M_2007_08,
+ "IsDefaultEntityContainer")));
}
container.setExtendz(reader.getAttributeValue(null, XmlMetadataConstants.EDM_CONTAINER_EXTENDZ));
container.setAnnotationAttributes(readAnnotationAttribute(reader));
@@ -229,7 +231,8 @@ public class XmlMetadataConsumer {
}
}
}
- container.setEntitySets(entitySets).setAssociationSets(associationSets).setFunctionImports(functionImports).setAnnotationElements(annotationElements);
+ container.setEntitySets(entitySets).setAssociationSets(associationSets).setFunctionImports(functionImports)
+ .setAnnotationElements(annotationElements);
containerMap.put(new FullQualifiedName(currentNamespace, container.getName()), container);
return container;
@@ -243,7 +246,8 @@ public class XmlMetadataConsumer {
List<AnnotationElement> annotationElements = new ArrayList<AnnotationElement>();
function.setName(reader.getAttributeValue(null, XmlMetadataConstants.EDM_NAME));
- function.setHttpMethod(reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.EDM_FUNCTION_IMPORT_HTTP_METHOD));
+ function.setHttpMethod(reader.getAttributeValue(Edm.NAMESPACE_M_2007_08,
+ XmlMetadataConstants.EDM_FUNCTION_IMPORT_HTTP_METHOD));
function.setEntitySet(reader.getAttributeValue(null, XmlMetadataConstants.EDM_ENTITY_SET));
ReturnType returnType = new ReturnType();
String returnTypeString = reader.getAttributeValue(null, XmlMetadataConstants.EDM_FUNCTION_IMPORT_RETURN);
@@ -319,7 +323,9 @@ public class XmlMetadataConsumer {
.addContent(XmlMetadataConstants.EDM_ASSOCIATION).addContent(XmlMetadataConstants.EDM_ASSOCIATION_SET));
}
associationSet.setAnnotationAttributes(readAnnotationAttribute(reader));
- while (reader.hasNext() && !(reader.isEndElement() && edmNamespace.equals(reader.getNamespaceURI()) && XmlMetadataConstants.EDM_ASSOCIATION_SET.equals(reader.getLocalName()))) {
+ while (reader.hasNext()
+ && !(reader.isEndElement() && edmNamespace.equals(reader.getNamespaceURI())
+ && XmlMetadataConstants.EDM_ASSOCIATION_SET.equals(reader.getLocalName()))) {
reader.next();
if (reader.isStartElement()) {
extractNamespaces(reader);
@@ -335,7 +341,8 @@ public class XmlMetadataConsumer {
}
}
if (ends.size() != 2) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Count of AssociationSet ends should be 2"));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Count of AssociationSet ends should be 2"));
} else {
associationSet.setEnd1(ends.get(0)).setEnd2(ends.get(1));
}
@@ -395,15 +402,18 @@ public class XmlMetadataConsumer {
}
}
if (associationEnds.size() < 2 && associationEnds.size() > 2) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Count of association ends should be 2"));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Count of association ends should be 2"));
}
- association.setEnd1(associationEnds.get(0)).setEnd2(associationEnds.get(1)).setAnnotationElements(annotationElements);
+ association.setEnd1(associationEnds.get(0)).setEnd2(associationEnds.get(1)).setAnnotationElements(
+ annotationElements);
associationsMap.put(new FullQualifiedName(currentNamespace, association.getName()), association);
return association;
}
- private ReferentialConstraint readReferentialConstraint(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ private ReferentialConstraint readReferentialConstraint(final XMLStreamReader reader) throws XMLStreamException,
+ EntityProviderException {
reader.require(XMLStreamConstants.START_ELEMENT, edmNamespace, XmlMetadataConstants.EDM_ASSOCIATION_CONSTRAINT);
ReferentialConstraint refConstraint = new ReferentialConstraint();
List<AnnotationElement> annotationElements = new ArrayList<AnnotationElement>();
@@ -416,10 +426,12 @@ public class XmlMetadataConsumer {
extractNamespaces(reader);
currentHandledStartTagName = reader.getLocalName();
if (XmlMetadataConstants.EDM_ASSOCIATION_PRINCIPAL.equals(currentHandledStartTagName)) {
- reader.require(XMLStreamConstants.START_ELEMENT, edmNamespace, XmlMetadataConstants.EDM_ASSOCIATION_PRINCIPAL);
+ reader
+ .require(XMLStreamConstants.START_ELEMENT, edmNamespace, XmlMetadataConstants.EDM_ASSOCIATION_PRINCIPAL);
refConstraint.setPrincipal(readReferentialConstraintRole(reader));
} else if (XmlMetadataConstants.EDM_ASSOCIATION_DEPENDENT.equals(currentHandledStartTagName)) {
- reader.require(XMLStreamConstants.START_ELEMENT, edmNamespace, XmlMetadataConstants.EDM_ASSOCIATION_DEPENDENT);
+ reader
+ .require(XMLStreamConstants.START_ELEMENT, edmNamespace, XmlMetadataConstants.EDM_ASSOCIATION_DEPENDENT);
refConstraint.setDependent(readReferentialConstraintRole(reader));
} else {
annotationElements.add(readAnnotationElement(reader));
@@ -430,7 +442,8 @@ public class XmlMetadataConsumer {
return refConstraint;
}
- private ReferentialConstraintRole readReferentialConstraintRole(final XMLStreamReader reader) throws EntityProviderException, XMLStreamException {
+ private ReferentialConstraintRole readReferentialConstraintRole(final XMLStreamReader reader)
+ throws EntityProviderException, XMLStreamException {
ReferentialConstraintRole rcRole = new ReferentialConstraintRole();
rcRole.setRole(reader.getAttributeValue(null, XmlMetadataConstants.EDM_ROLE));
List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
@@ -466,7 +479,8 @@ public class XmlMetadataConsumer {
complexType.setBaseType(extractFQName(baseType));
}
if (reader.getAttributeValue(null, XmlMetadataConstants.EDM_TYPE_ABSTRACT) != null) {
- complexType.setAbstract("true".equalsIgnoreCase(reader.getAttributeValue(null, XmlMetadataConstants.EDM_TYPE_ABSTRACT)));
+ complexType.setAbstract("true".equalsIgnoreCase(reader.getAttributeValue(null,
+ XmlMetadataConstants.EDM_TYPE_ABSTRACT)));
}
complexType.setAnnotationAttributes(readAnnotationAttribute(reader));
while (reader.hasNext()
@@ -509,7 +523,8 @@ public class XmlMetadataConsumer {
}
if (reader.getAttributeValue(null, XmlMetadataConstants.EDM_TYPE_ABSTRACT) != null) {
- entityType.setAbstract("true".equalsIgnoreCase(reader.getAttributeValue(null, XmlMetadataConstants.EDM_TYPE_ABSTRACT)));
+ entityType.setAbstract("true".equalsIgnoreCase(reader.getAttributeValue(null,
+ XmlMetadataConstants.EDM_TYPE_ABSTRACT)));
}
String baseType = reader.getAttributeValue(null, XmlMetadataConstants.EDM_BASE_TYPE);
if (baseType != null) {
@@ -535,7 +550,8 @@ public class XmlMetadataConsumer {
extractNamespaces(reader);
}
}
- entityType.setKey(key).setProperties(properties).setNavigationProperties(navProperties).setAnnotationElements(annotationElements);
+ entityType.setKey(key).setProperties(properties).setNavigationProperties(navProperties).setAnnotationElements(
+ annotationElements);
if (entityType.getName() != null) {
FullQualifiedName fqName = new FullQualifiedName(currentNamespace, entityType.getName());
entityTypesMap.put(fqName, entityType);
@@ -565,7 +581,8 @@ public class XmlMetadataConsumer {
}
}
}
- return new Key().setKeys(keys).setAnnotationElements(annotationElements).setAnnotationAttributes(annotationAttributes);
+ return new Key().setKeys(keys).setAnnotationElements(annotationElements).setAnnotationAttributes(
+ annotationAttributes);
}
private PropertyRef readPropertyRef(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
@@ -585,7 +602,8 @@ public class XmlMetadataConsumer {
return propertyRef.setAnnotationElements(annotationElements);
}
- private NavigationProperty readNavigationProperty(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ private NavigationProperty readNavigationProperty(final XMLStreamReader reader) throws XMLStreamException,
+ EntityProviderException {
reader.require(XMLStreamConstants.START_ELEMENT, edmNamespace, XmlMetadataConstants.EDM_NAVIGATION_PROPERTY);
NavigationProperty navProperty = new NavigationProperty();
@@ -598,7 +616,8 @@ public class XmlMetadataConsumer {
} else {
throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE
- .addContent(XmlMetadataConstants.EDM_NAVIGATION_RELATIONSHIP).addContent(XmlMetadataConstants.EDM_NAVIGATION_PROPERTY));
+ .addContent(XmlMetadataConstants.EDM_NAVIGATION_RELATIONSHIP).addContent(
+ XmlMetadataConstants.EDM_NAVIGATION_PROPERTY));
}
navProperty.setFromRole(reader.getAttributeValue(null, XmlMetadataConstants.EDM_NAVIGATION_FROM_ROLE));
@@ -649,14 +668,16 @@ public class XmlMetadataConsumer {
return property;
}
- private Property readComplexProperty(final XMLStreamReader reader, final FullQualifiedName fqName) throws XMLStreamException {
+ private Property readComplexProperty(final XMLStreamReader reader, final FullQualifiedName fqName)
+ throws XMLStreamException {
ComplexProperty property = new ComplexProperty();
property.setName(reader.getAttributeValue(null, XmlMetadataConstants.EDM_NAME));
property.setType(fqName);
return property;
}
- private Property readSimpleProperty(final XMLStreamReader reader, final FullQualifiedName fqName) throws XMLStreamException {
+ private Property readSimpleProperty(final XMLStreamReader reader, final FullQualifiedName fqName)
+ throws XMLStreamException {
SimpleProperty property = new SimpleProperty();
property.setName(reader.getAttributeValue(null, XmlMetadataConstants.EDM_NAME));
property.setType(EdmSimpleTypeKind.valueOf(fqName.getName()));
@@ -738,13 +759,15 @@ public class XmlMetadataConsumer {
}
- private AssociationEnd readAssociationEnd(final XMLStreamReader reader) throws EntityProviderException, XMLStreamException {
+ private AssociationEnd readAssociationEnd(final XMLStreamReader reader) throws EntityProviderException,
+ XMLStreamException {
reader.require(XMLStreamConstants.START_ELEMENT, edmNamespace, XmlMetadataConstants.EDM_ASSOCIATION_END);
AssociationEnd associationEnd = new AssociationEnd();
List<AnnotationElement> annotationElements = new ArrayList<AnnotationElement>();
associationEnd.setRole(reader.getAttributeValue(null, XmlMetadataConstants.EDM_ROLE));
- associationEnd.setMultiplicity(EdmMultiplicity.fromLiteral(reader.getAttributeValue(null, XmlMetadataConstants.EDM_ASSOCIATION_MULTIPLICITY)));
+ associationEnd.setMultiplicity(EdmMultiplicity.fromLiteral(reader.getAttributeValue(null,
+ XmlMetadataConstants.EDM_ASSOCIATION_MULTIPLICITY)));
String type = reader.getAttributeValue(null, XmlMetadataConstants.EDM_TYPE);
if (type == null) {
throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE
@@ -761,7 +784,8 @@ public class XmlMetadataConsumer {
if (XmlMetadataConstants.EDM_ASSOCIATION_ONDELETE.equals(currentHandledStartTagName)) {
OnDelete onDelete = new OnDelete();
for (int i = 0; i < EdmAction.values().length; i++) {
- if (EdmAction.values()[i].name().equalsIgnoreCase(reader.getAttributeValue(null, XmlMetadataConstants.EDM_ONDELETE_ACTION))) {
+ if (EdmAction.values()[i].name().equalsIgnoreCase(
+ reader.getAttributeValue(null, XmlMetadataConstants.EDM_ONDELETE_ACTION))) {
onDelete.setAction(EdmAction.values()[i]);
}
}
@@ -820,7 +844,8 @@ public class XmlMetadataConsumer {
&& !mandatoryNamespaces.containsValue(attributeNamespace)
&& !edmNamespaces.contains(attributeNamespace)) {
annotationAttributes.add(new AnnotationAttribute().setName(reader.getAttributeLocalName(i)).
- setPrefix(reader.getAttributePrefix(i)).setNamespace(attributeNamespace).setText(reader.getAttributeValue(i)));
+ setPrefix(reader.getAttributePrefix(i)).setNamespace(attributeNamespace).setText(
+ reader.getAttributeValue(i)));
}
}
if (annotationAttributes.isEmpty()) {
@@ -835,7 +860,8 @@ public class XmlMetadataConsumer {
private void checkMandatoryNamespacesAvailable() throws EntityProviderException {
if (!xmlNamespaceMap.containsValue(Edm.NAMESPACE_EDMX_2007_06)) {
- throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE.addContent(Edm.NAMESPACE_EDMX_2007_06));
+ throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE
+ .addContent(Edm.NAMESPACE_EDMX_2007_06));
} else if (!xmlNamespaceMap.containsValue(Edm.NAMESPACE_M_2007_08)) {
throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE.addContent(Edm.NAMESPACE_M_2007_08));
}
@@ -843,7 +869,8 @@ public class XmlMetadataConsumer {
private void checkEdmNamespace() throws EntityProviderException {
if (!edmNamespaces.contains(edmNamespace)) {
- throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE.addContent(XmlMetadataConstants.EDM_SCHEMA));
+ throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE
+ .addContent(XmlMetadataConstants.EDM_SCHEMA));
}
}
@@ -864,13 +891,15 @@ public class XmlMetadataConsumer {
// Looking for the last dot
String[] names = name.split("\\" + Edm.DELIMITER + "(?=[^\\" + Edm.DELIMITER + "]+$)");
if (names.length != 2) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Attribute should specify a namespace qualified name or an alias qualified name"));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Attribute should specify a namespace qualified name or an alias qualified name"));
} else {
return new FullQualifiedName(names[0], names[1]);
}
}
- private FullQualifiedName validateEntityTypeWithAlias(final FullQualifiedName aliasName) throws EntityProviderException {
+ private FullQualifiedName validateEntityTypeWithAlias(final FullQualifiedName aliasName)
+ throws EntityProviderException {
String namespace = aliasNamespaceMap.get(aliasName.getNamespace());
FullQualifiedName fqName = new FullQualifiedName(namespace, aliasName.getName());
if (!entityTypesMap.containsKey(fqName)) {
@@ -893,20 +922,24 @@ public class XmlMetadataConsumer {
baseEntityType = entityTypesMap.get(baseTypeFQName);
}
if (baseEntityType.getKey() == null) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Missing key for EntityType " + baseEntityType.getName()));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Missing key for EntityType " + baseEntityType.getName()));
}
} else if (entityType.getKey() == null) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Missing key for EntityType " + entityType.getName()));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Missing key for EntityType " + entityType.getName()));
}
}
}
}
- private FullQualifiedName validateComplexTypeWithAlias(final FullQualifiedName aliasName) throws EntityProviderException {
+ private FullQualifiedName validateComplexTypeWithAlias(final FullQualifiedName aliasName)
+ throws EntityProviderException {
String namespace = aliasNamespaceMap.get(aliasName.getNamespace());
FullQualifiedName fqName = new FullQualifiedName(namespace, aliasName.getName());
if (!complexTypesMap.containsKey(fqName)) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Invalid BaseType").addContent(fqName));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Invalid BaseType")
+ .addContent(fqName));
}
return fqName;
}
@@ -929,9 +962,12 @@ public class XmlMetadataConsumer {
for (NavigationProperty navProperty : navProperties) {
if (associationsMap.containsKey(navProperty.getRelationship())) {
Association assoc = associationsMap.get(navProperty.getRelationship());
- if (!(assoc.getEnd1().getRole().equals(navProperty.getFromRole()) ^ assoc.getEnd1().getRole().equals(navProperty.getToRole())
- && (assoc.getEnd2().getRole().equals(navProperty.getFromRole()) ^ assoc.getEnd2().getRole().equals(navProperty.getToRole())))) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Invalid end of association"));
+ if (!(assoc.getEnd1().getRole().equals(navProperty.getFromRole())
+ ^ assoc.getEnd1().getRole().equals(navProperty.getToRole())
+ && (assoc.getEnd2().getRole().equals(navProperty.getFromRole()) ^ assoc.getEnd2().getRole().equals(
+ navProperty.getToRole())))) {
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Invalid end of association"));
}
if (!entityTypesMap.containsKey(assoc.getEnd1().getType())) {
validateEntityTypeWithAlias(assoc.getEnd1().getType());
@@ -964,18 +1000,22 @@ public class XmlMetadataConsumer {
}
}
if (!(end1 && end2)) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Invalid AssociationSet"));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Invalid AssociationSet"));
}
} else {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Invalid AssociationSet"));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Invalid AssociationSet"));
}
}
}
}
- private void validateAssociationEnd(final AssociationSetEnd end, final Association association) throws EntityProviderException {
- if (!(association.getEnd1().getRole().equals(end.getRole()) ^ association.getEnd2().getRole().equals(end.getRole()))) {
+ private void validateAssociationEnd(final AssociationSetEnd end, final Association association)
+ throws EntityProviderException {
+ if (!(association.getEnd1().getRole().equals(end.getRole()) ^
+ association.getEnd2().getRole().equals(end.getRole()))) {
throw new EntityProviderException(EntityProviderException.COMMON.addContent("Invalid Association"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
index 0ce8f1e..28cacef 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -47,11 +47,14 @@ public class XmlPropertyConsumer {
protected static final String TRUE = "true";
protected static final String FALSE = "false";
- public Map<String, Object> readProperty(final XMLStreamReader reader, final EdmProperty property, final boolean merge) throws EntityProviderException {
+ public Map<String, Object>
+ readProperty(final XMLStreamReader reader, final EdmProperty property, final boolean merge)
+ throws EntityProviderException {
return readProperty(reader, property, merge, null);
}
- public Map<String, Object> readProperty(final XMLStreamReader reader, final EdmProperty property, final boolean merge, final Map<String, Object> typeMappings) throws EntityProviderException {
+ public Map<String, Object> readProperty(final XMLStreamReader reader, final EdmProperty property,
+ final boolean merge, final Map<String, Object> typeMappings) throws EntityProviderException {
EntityPropertyInfo eia = EntityInfoAggregator.create(property);
try {
@@ -67,9 +70,11 @@ public class XmlPropertyConsumer {
result.put(eia.getName(), value);
return result;
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -85,7 +90,8 @@ public class XmlPropertyConsumer {
mergeComplexWithDefaultValues((Map<String, Object>) value, (EntityComplexPropertyInfo) epi);
}
- private void mergeComplexWithDefaultValues(final Map<String, Object> complexValue, final EntityComplexPropertyInfo ecpi) {
+ private void mergeComplexWithDefaultValues(final Map<String, Object> complexValue,
+ final EntityComplexPropertyInfo ecpi) {
for (EntityPropertyInfo info : ecpi.getPropertyInfos()) {
Object obj = complexValue.get(info.getName());
if (obj == null) {
@@ -103,7 +109,8 @@ public class XmlPropertyConsumer {
}
}
- protected Object readStartedElement(final XMLStreamReader reader, final EntityPropertyInfo propertyInfo, final EntityTypeMapping typeMappings) throws EntityProviderException, EdmException {
+ protected Object readStartedElement(final XMLStreamReader reader, final EntityPropertyInfo propertyInfo,
+ final EntityTypeMapping typeMappings) throws EntityProviderException, EdmException {
final String name = propertyInfo.getName();
Object result = null;
@@ -123,9 +130,11 @@ public class XmlPropertyConsumer {
} else if (propertyInfo.isComplex()) {
final String typeAttribute = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_TYPE);
if (typeAttribute != null) {
- final String expectedTypeAttributeValue = propertyInfo.getType().getNamespace() + Edm.DELIMITER + propertyInfo.getType().getName();
+ final String expectedTypeAttributeValue =
+ propertyInfo.getType().getNamespace() + Edm.DELIMITER + propertyInfo.getType().getName();
if (!expectedTypeAttributeValue.equals(typeAttribute)) {
- throw new EntityProviderException(EntityProviderException.INVALID_COMPLEX_TYPE.addContent(expectedTypeAttributeValue).addContent(typeAttribute));
+ throw new EntityProviderException(EntityProviderException.INVALID_COMPLEX_TYPE.addContent(
+ expectedTypeAttributeValue).addContent(typeAttribute));
}
}
@@ -133,7 +142,8 @@ public class XmlPropertyConsumer {
Map<String, Object> name2Value = new HashMap<String, Object>();
while (reader.hasNext() && !reader.isEndElement()) {
final String childName = reader.getLocalName();
- final EntityPropertyInfo childProperty = ((EntityComplexPropertyInfo) propertyInfo).getPropertyInfo(childName);
+ final EntityPropertyInfo childProperty =
+ ((EntityComplexPropertyInfo) propertyInfo).getPropertyInfo(childName);
if (childProperty == null) {
throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY.addContent(childName));
}
@@ -149,11 +159,13 @@ public class XmlPropertyConsumer {
return result;
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
- private Object convert(final EntityPropertyInfo property, final String value, final Class<?> typeMapping) throws EdmSimpleTypeException {
+ private Object convert(final EntityPropertyInfo property, final String value, final Class<?> typeMapping)
+ throws EdmSimpleTypeException {
final EdmSimpleType type = (EdmSimpleType) property.getType();
return type.valueOfString(value, EdmLiteralKind.DEFAULT, property.getFacets(),
typeMapping == null ? type.getDefaultType() : typeMapping);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java
index b1cb159..a7d1054 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.entry;
@@ -83,6 +83,7 @@ public class EntryMetadataImpl implements EntryMetadata {
@Override
public String toString() {
- return "EntryMetadataImpl [id=" + id + ", etag=" + etag + ", uri=" + uri + ", associationUris=" + associationUris + "]";
+ return "EntryMetadataImpl [id=" + id + ", etag=" + etag + ", uri=" + uri + ", associationUris=" + associationUris
+ + "]";
}
}
[54/59] [abbrv] cleanup jpa core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParserTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParserTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParserTest.java
index 6ae7e68..390c7fe 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParserTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParserTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
@@ -48,7 +48,6 @@ import org.apache.olingo.odata2.api.uri.expression.PropertyExpression;
import org.apache.olingo.odata2.api.uri.expression.UnaryExpression;
import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
-import org.apache.olingo.odata2.processor.core.jpa.ODataExpressionParser;
import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -66,12 +65,16 @@ public class ODataExpressionParserTest {
private static final String EXPECTED_STR_9 = "gwt1.BuyerAddress, gwt1.BuyerName, gwt1.BuyerId";
private static final String EXPECTED_STR_10 = "gwt1.SalesOrder";
private static final String EXPECTED_STR_11 = "NOT(gwt1.deliveryStatus)";
- private static final String EXPECTED_STR_12 = "(CASE WHEN (gwt1.currencyCode LIKE '%Ru%') THEN TRUE ELSE FALSE END) = true";
+ private static final String EXPECTED_STR_12 =
+ "(CASE WHEN (gwt1.currencyCode LIKE '%Ru%') THEN TRUE ELSE FALSE END) = true";
private static final String EXPECTED_STR_13 = "SUBSTRING(gwt1.currencyCode, 1 + 1 , 2) = 'NR'";
private static final String EXPECTED_STR_14 = "LOWER(gwt1.currencyCode) = 'inr rupees'";
- private static final String EXPECTED_STR_15 = "(CASE WHEN (LOWER(gwt1.currencyCode) LIKE '%nr rupees%') THEN TRUE ELSE FALSE END) = true";
- private static final String EXPECTED_STR_16 = "(CASE WHEN (gwt1.currencyCode LIKE '%INR%') THEN TRUE ELSE FALSE END) = true";
- private static final String EXPECTED_STR_17 = "(CASE WHEN (LOWER(gwt1.currencyCode) LIKE '%nr rupees%') THEN TRUE ELSE FALSE END) = true";
+ private static final String EXPECTED_STR_15 =
+ "(CASE WHEN (LOWER(gwt1.currencyCode) LIKE '%nr rupees%') THEN TRUE ELSE FALSE END) = true";
+ private static final String EXPECTED_STR_16 =
+ "(CASE WHEN (gwt1.currencyCode LIKE '%INR%') THEN TRUE ELSE FALSE END) = true";
+ private static final String EXPECTED_STR_17 =
+ "(CASE WHEN (LOWER(gwt1.currencyCode) LIKE '%nr rupees%') THEN TRUE ELSE FALSE END) = true";
private static final String ADDRESS = "Address";
private static final String CITY = "city";
@@ -95,15 +98,21 @@ public class ODataExpressionParserTest {
try {
String parsedStr = ODataJPATestConstants.EMPTY_STRING;
// Simple Binary query -
- parsedStr = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpressionMockedObj(BinaryOperator.EQ, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1), TABLE_ALIAS);
+ parsedStr =
+ ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpressionMockedObj(BinaryOperator.EQ,
+ ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1), TABLE_ALIAS);
assertEquals(EXPECTED_STR_1, parsedStr);
// complex query -
parsedStr = ODataJPATestConstants.EMPTY_STRING;
- CommonExpression exp1 = getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
- CommonExpression exp2 = getBinaryExpressionMockedObj(BinaryOperator.NE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
- parsedStr = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.AND, exp2), TABLE_ALIAS);
+ CommonExpression exp1 =
+ getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
+ CommonExpression exp2 =
+ getBinaryExpressionMockedObj(BinaryOperator.NE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
+ parsedStr =
+ ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.AND, exp2),
+ TABLE_ALIAS);
assertEquals(EXPECTED_STR_2, parsedStr);
} catch (EdmException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -116,12 +125,18 @@ public class ODataExpressionParserTest {
public void testMoreThanOneBinaryExpression() {
// complex query -
String parsedStr = ODataJPATestConstants.EMPTY_STRING;
- CommonExpression exp1 = getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
- CommonExpression exp2 = getBinaryExpressionMockedObj(BinaryOperator.NE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
+ CommonExpression exp1 =
+ getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
+ CommonExpression exp2 =
+ getBinaryExpressionMockedObj(BinaryOperator.NE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
try {
- parsedStr = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.AND, exp2), TABLE_ALIAS);
+ parsedStr =
+ ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.AND, exp2),
+ TABLE_ALIAS);
assertEquals(EXPECTED_STR_2, parsedStr);
- parsedStr = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.OR, exp2), TABLE_ALIAS);
+ parsedStr =
+ ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.OR, exp2),
+ TABLE_ALIAS);
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -131,7 +146,8 @@ public class ODataExpressionParserTest {
@Test
public void testParseFilterExpression() {
try {
- assertEquals(EXPECTED_STR_10, ODataExpressionParser.parseToJPAWhereExpression(getFilterExpressionMockedObj(ExpressionKind.PROPERTY, SALES_ORDER), TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_10, ODataExpressionParser.parseToJPAWhereExpression(getFilterExpressionMockedObj(
+ ExpressionKind.PROPERTY, SALES_ORDER), TABLE_ALIAS));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -143,17 +159,26 @@ public class ODataExpressionParserTest {
String parsedStr1 = ODataJPATestConstants.EMPTY_STRING;
String parsedStr2 = ODataJPATestConstants.EMPTY_STRING;
- CommonExpression exp1 = getBinaryExpressionMockedObj(BinaryOperator.LT, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
- CommonExpression exp2 = getBinaryExpressionMockedObj(BinaryOperator.LE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
+ CommonExpression exp1 =
+ getBinaryExpressionMockedObj(BinaryOperator.LT, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
+ CommonExpression exp2 =
+ getBinaryExpressionMockedObj(BinaryOperator.LE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
try {
- parsedStr1 = ODataExpressionParser.parseToJPAWhereExpression((BinaryExpression) getBinaryExpression(exp1, BinaryOperator.AND, exp2), TABLE_ALIAS);
+ parsedStr1 =
+ ODataExpressionParser.parseToJPAWhereExpression((BinaryExpression) getBinaryExpression(exp1,
+ BinaryOperator.AND, exp2), TABLE_ALIAS);
assertEquals(EXPECTED_STR_4, parsedStr1);
- CommonExpression exp3 = getBinaryExpressionMockedObj(BinaryOperator.GT, ExpressionKind.PROPERTY, SAMPLE_DATA_LINE_ITEMS, SAMPLE_DATA_2);
- CommonExpression exp4 = getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_AMAZON);
+ CommonExpression exp3 =
+ getBinaryExpressionMockedObj(BinaryOperator.GT, ExpressionKind.PROPERTY, SAMPLE_DATA_LINE_ITEMS,
+ SAMPLE_DATA_2);
+ CommonExpression exp4 =
+ getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_AMAZON);
- parsedStr2 = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp3, BinaryOperator.AND, exp4), TABLE_ALIAS);
+ parsedStr2 =
+ ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp3, BinaryOperator.AND, exp4),
+ TABLE_ALIAS);
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -164,8 +189,12 @@ public class ODataExpressionParserTest {
@Test
public void testParseMemberExpression() {
try {
- assertEquals(EXPECTED_STR_6, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMemberExpressionMockedObj(ADDRESS, CITY), BinaryOperator.EQ, getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3)), TABLE_ALIAS));
- assertEquals(EXPECTED_STR_7, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMultipleMemberExpressionMockedObj(ADDRESS, CITY, AREA), BinaryOperator.EQ, getLiteralExpressionMockedObj(SAMPLE_DATA_BTM)), TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_6, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(
+ getMemberExpressionMockedObj(ADDRESS, CITY), BinaryOperator.EQ,
+ getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3)), TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_7, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(
+ getMultipleMemberExpressionMockedObj(ADDRESS, CITY, AREA), BinaryOperator.EQ,
+ getLiteralExpressionMockedObj(SAMPLE_DATA_BTM)), TABLE_ALIAS));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -174,38 +203,52 @@ public class ODataExpressionParserTest {
@Test
public void testParseMethodExpression() {
try {
- assertEquals(EXPECTED_STR_12, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMethodExpressionMockedObj(MethodOperator.SUBSTRINGOF, "'Ru'", "currencyCode", null, 2), BinaryOperator.EQ, getLiteralExpressionMockedObj("true")), TABLE_ALIAS));
- assertEquals(EXPECTED_STR_13, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMethodExpressionMockedObj(MethodOperator.SUBSTRING, "currencyCode", "1", "2", 3), BinaryOperator.EQ, getLiteralExpressionMockedObj("'NR'")), TABLE_ALIAS));
- assertEquals(EXPECTED_STR_14, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMethodExpressionMockedObj(MethodOperator.TOLOWER, "currencyCode", null, null, 1), BinaryOperator.EQ, getLiteralExpressionMockedObj("'inr rupees'")), TABLE_ALIAS));
- assertEquals(EXPECTED_STR_15, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMultipleMethodExpressionMockedObj(MethodOperator.SUBSTRINGOF, "'nr rupees'", MethodOperator.TOLOWER, "currencyCode", 2, 1), BinaryOperator.EQ, getLiteralExpressionMockedObj("true")), TABLE_ALIAS));
- assertEquals(EXPECTED_STR_16, ODataExpressionParser.parseToJPAWhereExpression(getFilterExpressionForFunctionsMockedObj(MethodOperator.SUBSTRINGOF, "'INR'", null, "currencyCode", 2, null)
- /*getBinaryExpression(
- getMemberExpressionMockedObj(ADDRESS,
- CITY),
- BinaryOperator.EQ,
- getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3))*/, TABLE_ALIAS));
- assertEquals(EXPECTED_STR_17, ODataExpressionParser.parseToJPAWhereExpression(getFilterExpressionForFunctionsMockedObj(MethodOperator.SUBSTRINGOF, "'nr rupees'", MethodOperator.TOLOWER, "currencyCode", 2, 1)
- /*getBinaryExpression(
- getMemberExpressionMockedObj(ADDRESS,
- CITY),
- BinaryOperator.EQ,
- getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3))*/, TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_12, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(
+ getMethodExpressionMockedObj(MethodOperator.SUBSTRINGOF, "'Ru'", "currencyCode", null, 2), BinaryOperator.EQ,
+ getLiteralExpressionMockedObj("true")), TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_13, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(
+ getMethodExpressionMockedObj(MethodOperator.SUBSTRING, "currencyCode", "1", "2", 3), BinaryOperator.EQ,
+ getLiteralExpressionMockedObj("'NR'")), TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_14, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(
+ getMethodExpressionMockedObj(MethodOperator.TOLOWER, "currencyCode", null, null, 1), BinaryOperator.EQ,
+ getLiteralExpressionMockedObj("'inr rupees'")), TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_15, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(
+ getMultipleMethodExpressionMockedObj(MethodOperator.SUBSTRINGOF, "'nr rupees'", MethodOperator.TOLOWER,
+ "currencyCode", 2, 1), BinaryOperator.EQ, getLiteralExpressionMockedObj("true")), TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_16, ODataExpressionParser.parseToJPAWhereExpression(
+ getFilterExpressionForFunctionsMockedObj(MethodOperator.SUBSTRINGOF, "'INR'", null, "currencyCode", 2, null)
+ /*
+ * getBinaryExpression(
+ * getMemberExpressionMockedObj(ADDRESS,
+ * CITY),
+ * BinaryOperator.EQ,
+ * getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3))
+ */, TABLE_ALIAS));
+ assertEquals(EXPECTED_STR_17, ODataExpressionParser.parseToJPAWhereExpression(
+ getFilterExpressionForFunctionsMockedObj(MethodOperator.SUBSTRINGOF, "'nr rupees'", MethodOperator.TOLOWER,
+ "currencyCode", 2, 1)
+ /*
+ * getBinaryExpression(
+ * getMemberExpressionMockedObj(ADDRESS,
+ * CITY),
+ * BinaryOperator.EQ,
+ * getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3))
+ */, TABLE_ALIAS));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
}
- private CommonExpression getMethodExpressionMockedObj(final MethodOperator methodOperator, final String firstName, final String secondName, final String thirdName, final Integer parameterCount) {
+ private CommonExpression getMethodExpressionMockedObj(final MethodOperator methodOperator, final String firstName,
+ final String secondName, final String thirdName, final Integer parameterCount) {
List<CommonExpression> parameters = new ArrayList<CommonExpression>();
if (methodOperator == MethodOperator.SUBSTRINGOF) {
parameters.add(getLiteralExpressionMockedObj(firstName));
parameters.add(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, secondName));
- }
-
- else if (methodOperator == MethodOperator.SUBSTRING) {
+ } else if (methodOperator == MethodOperator.SUBSTRING) {
parameters.add(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, firstName));
parameters.add(getLiteralExpressionMockedObj(secondName));
parameters.add(getLiteralExpressionMockedObj(thirdName));
@@ -224,9 +267,11 @@ public class ODataExpressionParserTest {
return methodExpression;
}
- private CommonExpression getMultipleMethodExpressionMockedObj(final MethodOperator methodOperator1, final String firstName, final MethodOperator methodOperator2, final String secondName, final Integer parameterCount1, final Integer parameterCount2) {
+ private CommonExpression getMultipleMethodExpressionMockedObj(final MethodOperator methodOperator1,
+ final String firstName, final MethodOperator methodOperator2, final String secondName,
+ final Integer parameterCount1, final Integer parameterCount2) {
- //complex query
+ // complex query
List<CommonExpression> parameters = new ArrayList<CommonExpression>();
parameters.add(getLiteralExpressionMockedObj(firstName));
@@ -243,12 +288,14 @@ public class ODataExpressionParserTest {
return methodExpression;
}
- private CommonExpression getMultipleMemberExpressionMockedObj(final String string1, final String string2, final String string3) {
+ private CommonExpression getMultipleMemberExpressionMockedObj(final String string1, final String string2,
+ final String string3) {
MemberExpression memberExpression = EasyMock.createMock(MemberExpression.class);
EasyMock.expect(memberExpression.getPath()).andStubReturn(getMemberExpressionMockedObj(string1, string2));
- EasyMock.expect(memberExpression.getProperty()).andStubReturn(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, string3));
+ EasyMock.expect(memberExpression.getProperty()).andStubReturn(
+ getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, string3));
EasyMock.expect(memberExpression.getKind()).andStubReturn(ExpressionKind.MEMBER);
EasyMock.replay(memberExpression);
@@ -258,7 +305,9 @@ public class ODataExpressionParserTest {
@Test
public void testParseUnaryExpression() {
- UnaryExpression unaryExpression = getUnaryExpressionMockedObj(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, "deliveryStatus"), org.apache.olingo.odata2.api.uri.expression.UnaryOperator.NOT);
+ UnaryExpression unaryExpression =
+ getUnaryExpressionMockedObj(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, "deliveryStatus"),
+ org.apache.olingo.odata2.api.uri.expression.UnaryOperator.NOT);
try {
assertEquals(EXPECTED_STR_11, ODataExpressionParser.parseToJPAWhereExpression(unaryExpression, TABLE_ALIAS));
} catch (ODataException e) {
@@ -267,7 +316,8 @@ public class ODataExpressionParserTest {
}
- private UnaryExpression getUnaryExpressionMockedObj(final CommonExpression operand, final UnaryOperator unaryOperator) {
+ private UnaryExpression
+ getUnaryExpressionMockedObj(final CommonExpression operand, final UnaryOperator unaryOperator) {
UnaryExpression unaryExpression = EasyMock.createMock(UnaryExpression.class);
EasyMock.expect(unaryExpression.getKind()).andStubReturn(ExpressionKind.UNARY);
EasyMock.expect(unaryExpression.getOperand()).andStubReturn(operand);
@@ -279,8 +329,10 @@ public class ODataExpressionParserTest {
private CommonExpression getMemberExpressionMockedObj(final String pathUriLiteral, final String propertyUriLiteral) {
MemberExpression memberExpression = EasyMock.createMock(MemberExpression.class);
- EasyMock.expect(memberExpression.getPath()).andStubReturn(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, pathUriLiteral));
- EasyMock.expect(memberExpression.getProperty()).andStubReturn(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, propertyUriLiteral));
+ EasyMock.expect(memberExpression.getPath()).andStubReturn(
+ getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, pathUriLiteral));
+ EasyMock.expect(memberExpression.getProperty()).andStubReturn(
+ getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, propertyUriLiteral));
EasyMock.expect(memberExpression.getKind()).andStubReturn(ExpressionKind.MEMBER);
EasyMock.replay(memberExpression);
@@ -302,9 +354,11 @@ public class ODataExpressionParserTest {
try {
EasyMock.expect(edmSimpleType.getName()).andReturn(value);
EasyMock.expect(edmSimpleType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.expect(edmSimpleType.valueOfString(value, EdmLiteralKind.URI, getEdmFacetsMockedObj(), null)).andStubReturn(value);
+ EasyMock.expect(edmSimpleType.valueOfString(value, EdmLiteralKind.URI, getEdmFacetsMockedObj(), null))
+ .andStubReturn(value);
EasyMock.expect(edmSimpleType.valueOfString(value, EdmLiteralKind.URI, null, null)).andStubReturn(value);
- EasyMock.expect(edmSimpleType.valueToString(value, EdmLiteralKind.DEFAULT, getEdmFacetsMockedObj())).andStubReturn(value);
+ EasyMock.expect(edmSimpleType.valueToString(value, EdmLiteralKind.DEFAULT, getEdmFacetsMockedObj()))
+ .andStubReturn(value);
EasyMock.expect(edmSimpleType.valueToString(value, EdmLiteralKind.DEFAULT, null)).andStubReturn(value);
} catch (EdmException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -348,10 +402,12 @@ public class ODataExpressionParserTest {
return mockedEdmMapping;
}
- private BinaryExpression getBinaryExpressionMockedObj(final BinaryOperator operator, final ExpressionKind leftOperandExpKind, final String propertyName, final String literalStr) {
+ private BinaryExpression getBinaryExpressionMockedObj(final BinaryOperator operator,
+ final ExpressionKind leftOperandExpKind, final String propertyName, final String literalStr) {
BinaryExpression binaryExpression = EasyMock.createMock(BinaryExpression.class);
EasyMock.expect(binaryExpression.getKind()).andStubReturn(ExpressionKind.BINARY);
- EasyMock.expect(binaryExpression.getLeftOperand()).andStubReturn(getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
+ EasyMock.expect(binaryExpression.getLeftOperand()).andStubReturn(
+ getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
EasyMock.expect(binaryExpression.getOperator()).andStubReturn(operator);
EasyMock.expect(binaryExpression.getRightOperand()).andStubReturn(getLiteralExpressionMockedObj(literalStr));
@@ -359,30 +415,38 @@ public class ODataExpressionParserTest {
return binaryExpression;
}
- private FilterExpression getFilterExpressionMockedObj(final ExpressionKind leftOperandExpKind, final String propertyName) {
+ private FilterExpression getFilterExpressionMockedObj(final ExpressionKind leftOperandExpKind,
+ final String propertyName) {
FilterExpression filterExpression = EasyMock.createMock(FilterExpression.class);
EasyMock.expect(filterExpression.getKind()).andStubReturn(ExpressionKind.FILTER);
- EasyMock.expect(filterExpression.getExpression()).andStubReturn(getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
+ EasyMock.expect(filterExpression.getExpression()).andStubReturn(
+ getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
EasyMock.replay(filterExpression);
return filterExpression;
}
- private FilterExpression getFilterExpressionForFunctionsMockedObj(final MethodOperator methodOperator1, final String firstName, final MethodOperator methodOperator2, final String secondName, final Integer parameterCount1, final Integer parameterCount2) {
- //default value handling of SUBSTRINGOF
+ private FilterExpression getFilterExpressionForFunctionsMockedObj(final MethodOperator methodOperator1,
+ final String firstName, final MethodOperator methodOperator2, final String secondName,
+ final Integer parameterCount1, final Integer parameterCount2) {
+ // default value handling of SUBSTRINGOF
FilterExpression filterExpression = EasyMock.createMock(FilterExpression.class);
EasyMock.expect(filterExpression.getKind()).andStubReturn(ExpressionKind.FILTER);
if ((methodOperator2 != null) && (parameterCount2 != null)) {
- EasyMock.expect(filterExpression.getExpression()).andStubReturn(getMultipleMethodExpressionMockedObj(methodOperator1, firstName, methodOperator2, secondName, parameterCount1, parameterCount2));
+ EasyMock.expect(filterExpression.getExpression()).andStubReturn(
+ getMultipleMethodExpressionMockedObj(methodOperator1, firstName, methodOperator2, secondName,
+ parameterCount1, parameterCount2));
} else {
- EasyMock.expect(filterExpression.getExpression()).andStubReturn(getMethodExpressionMockedObj(methodOperator1, firstName, secondName, null, parameterCount1));
+ EasyMock.expect(filterExpression.getExpression()).andStubReturn(
+ getMethodExpressionMockedObj(methodOperator1, firstName, secondName, null, parameterCount1));
}
EasyMock.replay(filterExpression);
return filterExpression;
}
- private CommonExpression getBinaryExpression(final CommonExpression leftOperand, final BinaryOperator operator, final CommonExpression rightOperand) {
+ private CommonExpression getBinaryExpression(final CommonExpression leftOperand, final BinaryOperator operator,
+ final CommonExpression rightOperand) {
BinaryExpression binaryExpression = EasyMock.createMock(BinaryExpression.class);
EasyMock.expect(binaryExpression.getKind()).andStubReturn(ExpressionKind.BINARY);
EasyMock.expect(binaryExpression.getLeftOperand()).andStubReturn(leftOperand);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java
index 656d861..10e65c0 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java
index baa2570..af20194 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
@@ -101,7 +101,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
Assert.assertNotNull(objODataJPAProcessorDefault.readEntity(getEntityView, HttpContentType.APPLICATION_XML));
} catch (ODataJPAModelException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e1) {//Expected
+ } catch (ODataJPARuntimeException e1) {// Expected
assertTrue(true);
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -112,13 +112,14 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
@Test
public void testcountEntitySet() {
try {
- ODataResponse countEntitySet = objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML);
+ ODataResponse countEntitySet =
+ objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML);
Assert.assertNotNull(countEntitySet);
Object entity = countEntitySet.getEntity();
Assert.assertNotNull(entity);
-
+
byte[] b = new byte[2];
- ((ByteArrayInputStream)entity).read(b);
+ ((ByteArrayInputStream) entity).read(b);
Assert.assertEquals("11", new String(b, Charset.forName("utf-8")));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -130,8 +131,10 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
@Test
public void testExistsEntity() {
try {
- Assert.assertNotNull(objODataJPAProcessorDefault.existsEntity(getEntityCountCountUriInfo(), HttpContentType.APPLICATION_XML));
- Assert.assertNull("ContentType MUST NOT set by entity provider", objODataJPAProcessorDefault.existsEntity(getEntityCountCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
+ Assert.assertNotNull(objODataJPAProcessorDefault.existsEntity(getEntityCountCountUriInfo(),
+ HttpContentType.APPLICATION_XML));
+ Assert.assertNull("ContentType MUST NOT set by entity provider", objODataJPAProcessorDefault.existsEntity(
+ getEntityCountCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
} catch (Exception e) {
@@ -142,7 +145,8 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
@Test
public void testDeleteEntity() {
try {
- Assert.assertNotNull(objODataJPAProcessorDefault.deleteEntity(getDeletetUriInfo(), HttpContentType.APPLICATION_XML));
+ Assert.assertNotNull(objODataJPAProcessorDefault.deleteEntity(getDeletetUriInfo(),
+ HttpContentType.APPLICATION_XML));
} catch (ODataException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -151,18 +155,20 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
@Test
public void testCreateEntity() {
try {
- Assert.assertNotNull(objODataJPAProcessorDefault.createEntity(getPostUriInfo(), getMockedInputStreamContent(), HttpContentType.APPLICATION_XML, HttpContentType.APPLICATION_XML));
+ Assert.assertNotNull(objODataJPAProcessorDefault.createEntity(getPostUriInfo(), getMockedInputStreamContent(),
+ HttpContentType.APPLICATION_XML, HttpContentType.APPLICATION_XML));
} catch (ODataException e) {
- Assert.assertTrue(true); //Expected TODO - need to revisit
+ Assert.assertTrue(true); // Expected TODO - need to revisit
}
}
@Test
public void testUpdateEntity() {
try {
- Assert.assertNotNull(objODataJPAProcessorDefault.updateEntity(getPutUriInfo(), getMockedInputStreamContent(), HttpContentType.APPLICATION_XML, false, HttpContentType.APPLICATION_XML));
+ Assert.assertNotNull(objODataJPAProcessorDefault.updateEntity(getPutUriInfo(), getMockedInputStreamContent(),
+ HttpContentType.APPLICATION_XML, false, HttpContentType.APPLICATION_XML));
} catch (ODataException e) {
- Assert.assertTrue(true); //Expected TODO - need to revisit
+ Assert.assertTrue(true); // Expected TODO - need to revisit
}
}
@@ -179,7 +185,26 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
}
private String getEntityBody() {
- return "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/\">" + "<content type=\"application/xml\">" + "<m:properties>" + "<d:ID>2</d:ID>" + "<d:CreationDate>2013-01-02T00:00:00</d:CreationDate>" + "<d:CurrencyCode>Code_555</d:CurrencyCode>" + "<d:BuyerAddressInfo m:type=\"SalesOrderProcessing.AddressInfo\">" + "<d:Street>Test_Street_Name_055</d:Street>" + "<d:Number>2</d:Number>" + "<d:Country>Test_Country_2</d:Country>" + "<d:City>Test_City_2</d:City>" + "</d:BuyerAddressInfo>" + "<d:GrossAmount>0.0</d:GrossAmount>" + "<d:BuyerId>2</d:BuyerId>" + "<d:DeliveryStatus>true</d:DeliveryStatus>" + "<d:BuyerName>buyerName_2</d:BuyerName>" + "<d:NetAmount>0.0</d:NetAmount>" + "</m:properties>" + "</content>" + "</entry>";
+ return "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/\">"
+ + "<content type=\"application/xml\">"
+ + "<m:properties>"
+ + "<d:ID>2</d:ID>"
+ + "<d:CreationDate>2013-01-02T00:00:00</d:CreationDate>"
+ + "<d:CurrencyCode>Code_555</d:CurrencyCode>"
+ + "<d:BuyerAddressInfo m:type=\"SalesOrderProcessing.AddressInfo\">"
+ + "<d:Street>Test_Street_Name_055</d:Street>"
+ + "<d:Number>2</d:Number>"
+ + "<d:Country>Test_Country_2</d:Country>"
+ + "<d:City>Test_City_2</d:City>"
+ + "</d:BuyerAddressInfo>"
+ + "<d:GrossAmount>0.0</d:GrossAmount>"
+ + "<d:BuyerId>2</d:BuyerId>"
+ + "<d:DeliveryStatus>true</d:DeliveryStatus>"
+ + "<d:BuyerName>buyerName_2</d:BuyerName>"
+ + "<d:NetAmount>0.0</d:NetAmount>" + "</m:properties>" + "</content>" + "</entry>";
}
private GetEntitySetCountUriInfo getEntitySetCountUriInfo() {
@@ -261,7 +286,8 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
EasyMock.expect(edmEntityType.hasStream()).andStubReturn(false);
EasyMock.expect(edmEntityType.getNavigationPropertyNames()).andStubReturn(new ArrayList<String>());
EasyMock.expect(edmEntityType.getKeyPropertyNames()).andStubReturn(new ArrayList<String>());
- EasyMock.expect(edmEntityType.getMapping()).andStubReturn(getEdmMappingMockedObj(SALES_ORDER));// ID vs Salesorder ID
+ EasyMock.expect(edmEntityType.getMapping()).andStubReturn(getEdmMappingMockedObj(SALES_ORDER));// ID vs Salesorder
+ // ID
EasyMock.replay(edmEntityType);
} catch (EdmException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -317,9 +343,10 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
private EntityManager getLocalEntityManager() {
EntityManager em = EasyMock.createMock(EntityManager.class);
EasyMock.expect(em.createQuery("SELECT E1 FROM SalesOrderHeaders E1")).andStubReturn(getQuery());
- EasyMock.expect(em.createQuery("SELECT COUNT ( E1 ) FROM SalesOrderHeaders E1")).andStubReturn(getQueryForSelectCount());
+ EasyMock.expect(em.createQuery("SELECT COUNT ( E1 ) FROM SalesOrderHeaders E1")).andStubReturn(
+ getQueryForSelectCount());
EasyMock.expect(em.getEntityManagerFactory()).andStubReturn(mockEntityManagerFactory2());// For create
- EasyMock.expect(em.getTransaction()).andStubReturn(getLocalTransaction()); //For Delete
+ EasyMock.expect(em.getTransaction()).andStubReturn(getLocalTransaction()); // For Delete
Address obj = new Address();
em.remove(obj);// testing void method
em.flush();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java
index 66ad0c8..426f236 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa;
@@ -183,7 +183,8 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
@Test
public void testBuildListOfTGetEntitySetUriInfoStringODataJPAContext() {
try {
- assertNotNull(ODataJPAResponseBuilder.build(getJPAEntities(), getResultsView(), "application/xml", getODataJPAContext()));
+ assertNotNull(ODataJPAResponseBuilder.build(getJPAEntities(), getResultsView(), "application/xml",
+ getODataJPAContext()));
} catch (ODataJPARuntimeException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -214,7 +215,8 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
@Test
public void testBuildObjectGetEntityUriInfoStringODataJPAContext() throws ODataNotFoundException {
try {
- assertNotNull(ODataJPAResponseBuilder.build(new SalesOrderHeader(2, 10), getLocalGetURIInfo(), "application/xml", getODataJPAContext()));
+ assertNotNull(ODataJPAResponseBuilder.build(new SalesOrderHeader(2, 10), getLocalGetURIInfo(), "application/xml",
+ getODataJPAContext()));
} catch (ODataJPARuntimeException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTest.java
index f41f510..c48bc0a 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -38,7 +38,6 @@ import org.apache.olingo.odata2.api.edm.EdmStructuralType;
import org.apache.olingo.odata2.api.edm.EdmType;
import org.apache.olingo.odata2.api.edm.EdmTypeKind;
import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
-import org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser;
import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -429,7 +428,10 @@ public class JPAEntityParserTest {
getGetterName.setAccessible(true);
} catch (NoSuchMethodException e) {
- assertEquals("org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser.getGetterName1(org.apache.olingo.odata2.api.edm.EdmProperty)", e.getMessage());
+ assertEquals(
+ "org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser.getGetterName1" +
+ "(org.apache.olingo.odata2.api.edm.EdmProperty)",
+ e.getMessage());
} catch (SecurityException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -455,7 +457,8 @@ public class JPAEntityParserTest {
try {
EasyMock.expect(structuralType.getPropertyNames()).andStubThrow(new EdmException(null));
EasyMock.replay(structuralType);
- Method getGetters = resultParser.getClass().getDeclaredMethod("getGetters", Object.class, EdmStructuralType.class);
+ Method getGetters =
+ resultParser.getClass().getDeclaredMethod("getGetters", Object.class, EdmStructuralType.class);
getGetters.setAccessible(true);
try {
getGetters.invoke(resultParser, jpaEntity, structuralType);
@@ -467,7 +470,10 @@ public class JPAEntityParserTest {
assertTrue(true);
}
} catch (NoSuchMethodException e) {
- assertEquals("org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser.getGetters(java.lang.Object, org.apache.olingo.odata2.api.edm.EdmStructuralType)", e.getMessage());
+ assertEquals(
+ "org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser.getGetters(java.lang.Object, " +
+ "org.apache.olingo.odata2.api.edm.EdmStructuralType)",
+ e.getMessage());
} catch (SecurityException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
} catch (EdmException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTestForStaticMethods.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTestForStaticMethods.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTestForStaticMethods.java
index 38e48f6..86514b4 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTestForStaticMethods.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParserTestForStaticMethods.java
@@ -1,32 +1,33 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.lang.reflect.Method;
import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
public class JPAEntityParserTestForStaticMethods {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityTest.java
index 300cdf7..8fbbed9 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -157,7 +157,7 @@ public class JPAEntityTest {
+ ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
JPATypeMock jpaTypeMock = (JPATypeMock) jpaEntity.getJPAEntity();
- assertEquals(jpaTypeMock.getMInt(), 0);//Key should not be changed
+ assertEquals(jpaTypeMock.getMInt(), 0);// Key should not be changed
assertEquals(jpaTypeMock.getMString(), ODataEntryMockUtil.VALUE_MSTRING);
assertTrue(jpaTypeMock.getMDateTime().equals(ODataEntryMockUtil.VALUE_DATE_TIME));
}
@@ -180,7 +180,7 @@ public class JPAEntityTest {
+ ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
JPATypeMock jpaTypeMock = (JPATypeMock) jpaEntity.getJPAEntity();
- assertEquals(jpaTypeMock.getMInt(), 0);//Key should not be changed
+ assertEquals(jpaTypeMock.getMInt(), 0);// Key should not be changed
assertEquals(jpaTypeMock.getMString(), ODataEntryMockUtil.VALUE_MSTRING);
assertTrue(jpaTypeMock.getMDateTime().equals(ODataEntryMockUtil.VALUE_DATE_TIME));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java
index a3cf2de..021c353 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -92,7 +92,8 @@ public class JPAExpandCallBackTest {
public void testGetCallbacks() {
Map<String, ODataCallback> callBacks = null;
try {
- URI baseUri = new URI("http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/");
+ URI baseUri =
+ new URI("http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/");
ExpandSelectTreeNode expandSelectTreeNode = EdmMockUtil.mockExpandSelectTreeNode();
List<ArrayList<NavigationPropertySegment>> expandList = EdmMockUtil.getExpandList();
callBacks = JPAExpandCallBack.getCallbacks(baseUri, expandSelectTreeNode, expandList);
@@ -143,7 +144,8 @@ public class JPAExpandCallBackTest {
private JPAExpandCallBack getJPAExpandCallBackObject() {
Map<String, ODataCallback> callBacks = null;
try {
- URI baseUri = new URI("http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/");
+ URI baseUri =
+ new URI("http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/");
ExpandSelectTreeNode expandSelectTreeNode = EdmMockUtil.mockExpandSelectTreeNode();
List<ArrayList<NavigationPropertySegment>> expandList = EdmMockUtil.getExpandList();
callBacks = JPAExpandCallBack.getCallbacks(baseUri, expandSelectTreeNode, expandList);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java
index 538a001..1b2d7b6 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -50,7 +50,8 @@ public class JPAFunctionContextTest {
JPAFunctionContext functionContext = null;
try {
if (VARIANT == 0) {
- functionContext = (JPAFunctionContext) JPAMethodContext.createBuilder(JPQLContextType.FUNCTION, getView()).build();
+ functionContext =
+ (JPAFunctionContext) JPAMethodContext.createBuilder(JPQLContextType.FUNCTION, getView()).build();
}
} catch (ODataJPAModelException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java
index 0f345fd..45f0528 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -66,13 +66,14 @@ import org.junit.Test;
public class JPAProcessorImplTest {
- // -------------------------------- Common Start ------------------------------------common in ODataJPAProcessorDefaultTest as well
+ // -------------------------------- Common Start ------------------------------------common in
+ // ODataJPAProcessorDefaultTest as well
private static final String STR_LOCAL_URI = "http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/";
private static final String SALESORDERPROCESSING_CONTAINER = "salesorderprocessingContainer";
private static final String SO_ID = "SoId";
private static final String SALES_ORDER = "SalesOrder";
private static final String SALES_ORDER_HEADERS = "SalesOrderHeaders";
- //-------------------------------- Common End ------------------------------------
+ // -------------------------------- Common End ------------------------------------
JPAProcessorImpl objJPAProcessorImpl;
@@ -138,7 +139,8 @@ public class JPAProcessorImplTest {
}
}
- // ---------------------------- Common Code Start ---------------- TODO - common in ODataJPAProcessorDefaultTest as well
+ // ---------------------------- Common Code Start ---------------- TODO - common in ODataJPAProcessorDefaultTest as
+ // well
private DeleteUriInfo getDeletetUriInfo() {
UriInfo objUriInfo = EasyMock.createMock(UriInfo.class);
@@ -179,7 +181,7 @@ public class JPAProcessorImplTest {
EasyMock.expect(objUriInfo.getSkip()).andStubReturn(getSkip());
EasyMock.expect(objUriInfo.getInlineCount()).andStubReturn(getInlineCount());
EasyMock.expect(objUriInfo.getFilter()).andStubReturn(getFilter());
- //EasyMock.expect(objUriInfo.getFunctionImport()).andStubReturn(getFunctionImport());
+ // EasyMock.expect(objUriInfo.getFunctionImport()).andStubReturn(getFunctionImport());
EasyMock.expect(objUriInfo.getFunctionImport()).andStubReturn(null);
EasyMock.replay(objUriInfo);
return objUriInfo;
@@ -235,7 +237,8 @@ public class JPAProcessorImplTest {
EasyMock.expect(edmEntityType.hasStream()).andStubReturn(false);
EasyMock.expect(edmEntityType.getNavigationPropertyNames()).andStubReturn(new ArrayList<String>());
EasyMock.expect(edmEntityType.getKeyPropertyNames()).andStubReturn(new ArrayList<String>());
- EasyMock.expect(edmEntityType.getMapping()).andStubReturn(getEdmMappingMockedObj(SALES_ORDER));// ID vs Salesorder ID
+ EasyMock.expect(edmEntityType.getMapping()).andStubReturn(getEdmMappingMockedObj(SALES_ORDER));// ID vs Salesorder
+ // ID
EasyMock.replay(edmEntityType);
} catch (EdmException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -284,8 +287,9 @@ public class JPAProcessorImplTest {
public EntityManager getLocalEntityManager() {
EntityManager em = EasyMock.createMock(EntityManager.class);
EasyMock.expect(em.createQuery("SELECT E1 FROM SalesOrderHeaders E1")).andStubReturn(getQuery());
- EasyMock.expect(em.createQuery("SELECT COUNT ( E1 ) FROM SalesOrderHeaders E1")).andStubReturn(getQueryForSelectCount());
- EasyMock.expect(em.getTransaction()).andStubReturn(getLocalTransaction()); //For Delete
+ EasyMock.expect(em.createQuery("SELECT COUNT ( E1 ) FROM SalesOrderHeaders E1")).andStubReturn(
+ getQueryForSelectCount());
+ EasyMock.expect(em.getTransaction()).andStubReturn(getLocalTransaction()); // For Delete
em.flush();
em.flush();
Address obj = new Address();
@@ -438,6 +442,6 @@ public class JPAProcessorImplTest {
return uri;
}
- //-------------------------------- Common End ------------------------------------
+ // -------------------------------- Common End ------------------------------------
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java
index c8f1410..76ea726 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.model;
@@ -98,12 +98,14 @@ public class JPAEdmMappingModelServiceTest extends JPAEdmMappingModelService {
@Test
public void testMapJPAPersistenceUnit() {
- assertEquals(PERSISTENCE_UNIT_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAPersistenceUnit(PERSISTENCE_UNIT_NAME_JPA));
+ assertEquals(PERSISTENCE_UNIT_NAME_EDM, objJPAEdmMappingModelServiceTest
+ .mapJPAPersistenceUnit(PERSISTENCE_UNIT_NAME_JPA));
}
@Test
public void testMapJPAPersistenceUnitNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAPersistenceUnit(PERSISTENCE_UNIT_NAME_EDM));// Wrong value to bring null
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAPersistenceUnit(PERSISTENCE_UNIT_NAME_EDM));// Wrong value to
+ // bring null
}
@Test
@@ -113,7 +115,8 @@ public class JPAEdmMappingModelServiceTest extends JPAEdmMappingModelService {
@Test
public void testMapJPAEntityTypeNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAEntityType(ENTITY_TYPE_NAME_JPA_WRONG));// Wrong value to bring null
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAEntityType(ENTITY_TYPE_NAME_JPA_WRONG));// Wrong value to bring
+ // null
}
@Test
@@ -123,27 +126,32 @@ public class JPAEdmMappingModelServiceTest extends JPAEdmMappingModelService {
@Test
public void testMapJPAEntitySetNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAEntitySet(ENTITY_TYPE_NAME_JPA_WRONG));// Wrong value to bring null
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAEntitySet(ENTITY_TYPE_NAME_JPA_WRONG));// Wrong value to bring
+ // null
}
@Test
public void testMapJPAAttribute() {
- assertEquals(ATTRIBUTE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAAttribute(ENTITY_TYPE_NAME_JPA, ATTRIBUTE_NAME_JPA));
+ assertEquals(ATTRIBUTE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAAttribute(ENTITY_TYPE_NAME_JPA,
+ ATTRIBUTE_NAME_JPA));
}
@Test
public void testMapJPAAttributeNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAAttribute(ENTITY_TYPE_NAME_JPA, ATTRIBUTE_NAME_JPA + "AA"));// Wrong value to bring null
+ // Wrong value to bring null
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAAttribute(ENTITY_TYPE_NAME_JPA, ATTRIBUTE_NAME_JPA + "AA"));
}
@Test
public void testMapJPARelationship() {
- assertEquals(RELATIONSHIP_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPARelationship(ENTITY_TYPE_NAME_JPA, RELATIONSHIP_NAME_JPA));
+ assertEquals(RELATIONSHIP_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPARelationship(ENTITY_TYPE_NAME_JPA,
+ RELATIONSHIP_NAME_JPA));
}
@Test
public void testMapJPARelationshipNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPARelationship(ENTITY_TYPE_NAME_JPA, RELATIONSHIP_NAME_JPA_WRONG));// Wrong value to bring null
+ // Wrong value to bring null
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPARelationship(ENTITY_TYPE_NAME_JPA, RELATIONSHIP_NAME_JPA_WRONG));
}
@Test
@@ -153,17 +161,20 @@ public class JPAEdmMappingModelServiceTest extends JPAEdmMappingModelService {
@Test
public void testMapJPAEmbeddableTypeNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAEmbeddableType(EMBEDDABLE_TYPE_NAME_JPA_WRONG));// Wrong value to bring null
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAEmbeddableType(EMBEDDABLE_TYPE_NAME_JPA_WRONG));// Wrong value to
+ // bring null
}
@Test
public void testMapJPAEmbeddableTypeAttribute() {
- assertEquals(EMBEDDABLE_ATTRIBUTE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAEmbeddableTypeAttribute(EMBEDDABLE_TYPE_NAME_JPA, EMBEDDABLE_ATTRIBUTE_NAME_JPA));
+ assertEquals(EMBEDDABLE_ATTRIBUTE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAEmbeddableTypeAttribute(
+ EMBEDDABLE_TYPE_NAME_JPA, EMBEDDABLE_ATTRIBUTE_NAME_JPA));
}
@Test
public void testMapJPAEmbeddableTypeAttributeNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAEmbeddableTypeAttribute(EMBEDDABLE_TYPE_NAME_JPA_WRONG, EMBEDDABLE_ATTRIBUTE_NAME_JPA));
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAEmbeddableTypeAttribute(EMBEDDABLE_TYPE_NAME_JPA_WRONG,
+ EMBEDDABLE_ATTRIBUTE_NAME_JPA));
}
@Test
@@ -173,7 +184,8 @@ public class JPAEdmMappingModelServiceTest extends JPAEdmMappingModelService {
@Test
public void testCheckExclusionOfJPAAttributeType() {
- assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAAttributeType(ENTITY_TYPE_NAME_JPA, ATTRIBUTE_NAME_JPA));
+ assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAAttributeType(ENTITY_TYPE_NAME_JPA,
+ ATTRIBUTE_NAME_JPA));
}
@Test
@@ -183,7 +195,8 @@ public class JPAEdmMappingModelServiceTest extends JPAEdmMappingModelService {
@Test
public void testCheckExclusionOfJPAEmbeddableAttributeType() {
- assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAEmbeddableAttributeType(EMBEDDABLE_TYPE_NAME_JPA, EMBEDDABLE_ATTRIBUTE_NAME_JPA));
+ assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAEmbeddableAttributeType(EMBEDDABLE_TYPE_NAME_JPA,
+ EMBEDDABLE_ATTRIBUTE_NAME_JPA));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java
index b82ad5b..f1e55e3 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java
index 27e4e6e..3a4057f 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.model;
@@ -68,8 +68,10 @@ public class JPATypeConvertorTest {
edmSimpleKindTypeBigDecimal = JPATypeConvertor.convertToEdmSimpleType(bigDecimalObj.getClass(), null);
edmSimpleKindTypeByte = JPATypeConvertor.convertToEdmSimpleType(byteObj.getClass(), null);
edmSimpleKindTypeBoolean = JPATypeConvertor.convertToEdmSimpleType(booleanObj.getClass(), null);
- /*edmSimpleKindTypeDate = JPATypeConvertor
- .convertToEdmSimpleType(dateObj.getClass(),null);*/
+ /*
+ * edmSimpleKindTypeDate = JPATypeConvertor
+ * .convertToEdmSimpleType(dateObj.getClass(),null);
+ */
edmSimpleKindTypeUUID = JPATypeConvertor.convertToEdmSimpleType(uUID.getClass(), null);
} catch (ODataJPAModelException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -85,7 +87,7 @@ public class JPATypeConvertorTest {
assertEquals(EdmSimpleTypeKind.Decimal, edmSimpleKindTypeBigDecimal);
assertEquals(EdmSimpleTypeKind.Byte, edmSimpleKindTypeByte);
assertEquals(EdmSimpleTypeKind.Boolean, edmSimpleKindTypeBoolean);
- //assertEquals(EdmSimpleTypeKind.DateTime, edmSimpleKindTypeDate);
+ // assertEquals(EdmSimpleTypeKind.DateTime, edmSimpleKindTypeDate);
assertEquals(EdmSimpleTypeKind.Guid, edmSimpleKindTypeUUID);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/common/ODataJPATestConstants.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/common/ODataJPATestConstants.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/common/ODataJPATestConstants.java
index 4d4b9e4..cd6caee 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/common/ODataJPATestConstants.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/common/ODataJPATestConstants.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.common;
[14/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java
index 8fa36ff..76c0536 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducerTest.java
index 6cf9a8f..2e8ad58 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -95,18 +95,23 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
List<Schema> schemas = new ArrayList<Schema>();
List<AnnotationElement> childElements = new ArrayList<AnnotationElement>();
- childElements.add(new AnnotationElement().setName("schemaElementTest2").setText("text2").setNamespace("namespace1"));
+ childElements
+ .add(new AnnotationElement().setName("schemaElementTest2").setText("text2").setNamespace("namespace1"));
List<AnnotationAttribute> elementAttributes = new ArrayList<AnnotationAttribute>();
elementAttributes.add(new AnnotationAttribute().setName("rel").setText("self"));
- elementAttributes.add(new AnnotationAttribute().setName("href").setText("http://google.com").setPrefix("pre").setNamespace("namespaceForAnno"));
+ elementAttributes.add(new AnnotationAttribute().setName("href").setText("http://google.com").setPrefix("pre")
+ .setNamespace("namespaceForAnno"));
List<AnnotationElement> element3List = new ArrayList<AnnotationElement>();
- element3List.add(new AnnotationElement().setName("schemaElementTest4").setText("text4").setAttributes(elementAttributes));
- childElements.add(new AnnotationElement().setName("schemaElementTest3").setText("text3").setPrefix("prefix").setNamespace("namespace2").setChildElements(element3List));
+ element3List.add(new AnnotationElement().setName("schemaElementTest4").setText("text4").setAttributes(
+ elementAttributes));
+ childElements.add(new AnnotationElement().setName("schemaElementTest3").setText("text3").setPrefix("prefix")
+ .setNamespace("namespace2").setChildElements(element3List));
List<AnnotationElement> schemaElements = new ArrayList<AnnotationElement>();
- schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setText("text1").setChildElements(childElements));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setText("text1").setChildElements(
+ childElements));
schemaElements.add(new AnnotationElement().setName("test"));
Schema schema = new Schema().setAnnotationElements(schemaElements);
@@ -135,7 +140,10 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1", metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/b:schemaElementTest2", metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/prefix:schemaElementTest3", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/prefix:schemaElementTest3/a:schemaElementTest4[@rel=\"self\" and @pre:href=\"http://google.com\"]", metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/prefix:schemaElementTest3/" +
+ "a:schemaElementTest4[@rel=\"self\" and @pre:href=\"http://google.com\"]",
+ metadata);
}
@@ -177,7 +185,7 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:test", metadata);
}
- //Elements with namespace and attributes without namespace
+ // Elements with namespace and attributes without namespace
@Test
public void writeValidMetadata4() throws Exception {
@@ -188,8 +196,10 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
attributesElement1.add(new AnnotationAttribute().setName("href").setText("link"));
List<AnnotationElement> schemaElements = new ArrayList<AnnotationElement>();
- schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
- schemaElements.add(new AnnotationElement().setName("schemaElementTest2").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest2").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
Schema schema = new Schema().setAnnotationElements(schemaElements);
schema.setNamespace("http://namespace.com");
@@ -215,19 +225,23 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/atom:schemaElementTest2", metadata);
}
- //Element with namespace and attributes with same namespace
+ // Element with namespace and attributes with same namespace
@Test
public void writeValidMetadata5() throws Exception {
List<Schema> schemas = new ArrayList<Schema>();
List<AnnotationAttribute> attributesElement1 = new ArrayList<AnnotationAttribute>();
- attributesElement1.add(new AnnotationAttribute().setName("rel").setText("self").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom"));
- attributesElement1.add(new AnnotationAttribute().setName("href").setText("link").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom"));
+ attributesElement1.add(new AnnotationAttribute().setName("rel").setText("self").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom"));
+ attributesElement1.add(new AnnotationAttribute().setName("href").setText("link").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom"));
List<AnnotationElement> schemaElements = new ArrayList<AnnotationElement>();
- schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
- schemaElements.add(new AnnotationElement().setName("schemaElementTest2").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest2").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
Schema schema = new Schema().setAnnotationElements(schemaElements);
schema.setNamespace("http://namespace.com");
@@ -253,22 +267,27 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/atom:schemaElementTest2", metadata);
}
- //Element with namespace childelements with same namespace
+ // Element with namespace childelements with same namespace
@Test
public void writeValidMetadata6() throws Exception {
List<Schema> schemas = new ArrayList<Schema>();
List<AnnotationAttribute> attributesElement1 = new ArrayList<AnnotationAttribute>();
- attributesElement1.add(new AnnotationAttribute().setName("rel").setText("self").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom"));
- attributesElement1.add(new AnnotationAttribute().setName("href").setText("link").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom"));
+ attributesElement1.add(new AnnotationAttribute().setName("rel").setText("self").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom"));
+ attributesElement1.add(new AnnotationAttribute().setName("href").setText("link").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom"));
List<AnnotationElement> elementElements = new ArrayList<AnnotationElement>();
- elementElements.add(new AnnotationElement().setName("schemaElementTest2").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
- elementElements.add(new AnnotationElement().setName("schemaElementTest3").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
+ elementElements.add(new AnnotationElement().setName("schemaElementTest2").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
+ elementElements.add(new AnnotationElement().setName("schemaElementTest3").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom").setAttributes(attributesElement1));
List<AnnotationElement> schemaElements = new ArrayList<AnnotationElement>();
- schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setPrefix("atom").setNamespace("http://www.w3.org/2005/Atom").setAttributes(attributesElement1).setChildElements(elementElements));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setPrefix("atom").setNamespace(
+ "http://www.w3.org/2005/Atom").setAttributes(attributesElement1).setChildElements(elementElements));
Schema schema = new Schema().setAnnotationElements(schemaElements);
schema.setNamespace("http://namespace.com");
@@ -291,11 +310,13 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
XMLUnit.setXpathNamespaceContext(ctx);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/atom:schemaElementTest1", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/atom:schemaElementTest1/atom:schemaElementTest2", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/atom:schemaElementTest1/atom:schemaElementTest3", metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/atom:schemaElementTest1/atom:schemaElementTest2",
+ metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/atom:schemaElementTest1/atom:schemaElementTest3",
+ metadata);
}
- //If no name for an AnnotationAttribute is set this has to result in an Exception
+ // If no name for an AnnotationAttribute is set this has to result in an Exception
@Test(expected = Exception.class)
public void writeInvalidMetadata() throws Exception {
disableLogging(this.getClass());
@@ -315,28 +336,33 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
XmlMetadataProducer.writeMetadata(data, xmlStreamWriter, null);
}
- //Element with predefined namespace
+ // Element with predefined namespace
@Test
public void writeWithPredefinedNamespaces() throws Exception {
- //prepare
+ // prepare
List<Schema> schemas = new ArrayList<Schema>();
List<AnnotationAttribute> attributesElement1 = new ArrayList<AnnotationAttribute>();
- attributesElement1.add(new AnnotationAttribute().setName("rel").setText("self").setPrefix("foo").setNamespace("http://www.foo.bar/Protocols/Data"));
- attributesElement1.add(new AnnotationAttribute().setName("href").setText("link").setPrefix("foo").setNamespace("http://www.foo.bar/Protocols/Data"));
+ attributesElement1.add(new AnnotationAttribute().setName("rel").setText("self").setPrefix("foo").setNamespace(
+ "http://www.foo.bar/Protocols/Data"));
+ attributesElement1.add(new AnnotationAttribute().setName("href").setText("link").setPrefix("foo").setNamespace(
+ "http://www.foo.bar/Protocols/Data"));
List<AnnotationElement> elementElements = new ArrayList<AnnotationElement>();
- elementElements.add(new AnnotationElement().setName("schemaElementTest2").setPrefix("foo").setNamespace("http://www.foo.bar/Protocols/Data").setAttributes(attributesElement1));
- elementElements.add(new AnnotationElement().setName("schemaElementTest3").setPrefix("foo").setNamespace("http://www.foo.bar/Protocols/Data").setAttributes(attributesElement1));
+ elementElements.add(new AnnotationElement().setName("schemaElementTest2").setPrefix("foo").setNamespace(
+ "http://www.foo.bar/Protocols/Data").setAttributes(attributesElement1));
+ elementElements.add(new AnnotationElement().setName("schemaElementTest3").setPrefix("foo").setNamespace(
+ "http://www.foo.bar/Protocols/Data").setAttributes(attributesElement1));
List<AnnotationElement> schemaElements = new ArrayList<AnnotationElement>();
- schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setPrefix("foo").setNamespace("http://www.foo.bar/Protocols/Data").setAttributes(attributesElement1).setChildElements(elementElements));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setPrefix("foo").setNamespace(
+ "http://www.foo.bar/Protocols/Data").setAttributes(attributesElement1).setChildElements(elementElements));
Schema schema = new Schema().setAnnotationElements(schemaElements);
schema.setNamespace("http://namespace.com");
schemas.add(schema);
- //Execute
+ // Execute
Map<String, String> predefinedNamespaces = new HashMap<String, String>();
predefinedNamespaces.put("foo", "http://www.foo.bar/Protocols/Data");
DataServices data = new DataServices().setSchemas(schemas).setDataServiceVersion(ODataServiceVersion.V20);
@@ -347,7 +373,7 @@ public class XmlMetadataProducerTest extends AbstractXmlProducerTestHelper {
XmlMetadataProducer.writeMetadata(data, xmlStreamWriter, predefinedNamespaces);
String metadata = StringHelper.inputStreamToString(csb.getInputStream());
- //Verify
+ // Verify
Map<String, String> prefixMap = new HashMap<String, String>();
prefixMap.put("edmx", "http://schemas.microsoft.com/ado/2007/06/edmx");
prefixMap.put("a", "http://schemas.microsoft.com/ado/2008/09/edm");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java
index 06690d1..c04b9c4 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -54,7 +54,6 @@ public class XmlPropertyProducerTest extends AbstractProviderTest {
ODataResponse response = s.writeProperty(edmProperty, employeeData.get("EmployeeId"));
assertNotNull(response);
assertNotNull(response.getEntity());
-
String xml = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertNotNull(xml);
@@ -73,7 +72,7 @@ public class XmlPropertyProducerTest extends AbstractProviderTest {
ODataResponse response = s.writeProperty(edmProperty, employeeData.get("Age"));
assertNotNull(response);
assertNotNull(response.getEntity());
-
+
String xml = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertNotNull(xml);
@@ -91,7 +90,7 @@ public class XmlPropertyProducerTest extends AbstractProviderTest {
ODataResponse response = s.writeProperty(edmProperty, employeeData.get("ImageUrl"));
assertNotNull(response);
assertNotNull(response.getEntity());
-
+
String xml = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertNotNull(xml);
@@ -102,12 +101,13 @@ public class XmlPropertyProducerTest extends AbstractProviderTest {
@Test
public void serializeImage() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("Image");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("Image");
ODataResponse response = createAtomEntityProvider().writeProperty(property, photoData.get("Image"));
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntityProvider should not set content header", response.getContentHeader());
-
+
final String xml = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertNotNull(xml);
assertXpathExists("/d:Image", xml);
@@ -117,12 +117,13 @@ public class XmlPropertyProducerTest extends AbstractProviderTest {
@Test
public void serializeBinaryData() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("BinaryData");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("BinaryData");
ODataResponse response = createAtomEntityProvider().writeProperty(property, photoData.get("BinaryData"));
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntityProvider should not set content header", response.getContentHeader());
-
+
final String xml = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertNotNull(xml);
assertXpathExists("/d:BinaryData", xml);
@@ -141,7 +142,7 @@ public class XmlPropertyProducerTest extends AbstractProviderTest {
ODataResponse response = s.writeProperty(edmProperty, employeeData.get("Location"));
assertNotNull(response);
assertNotNull(response.getEntity());
-
+
String xml = StringHelper.inputStreamToString((InputStream) response.getEntity());
assertNotNull(xml);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java
index b762e68..8eb635c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -64,7 +64,9 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
@Test
public void allPropertiesNoSelect() throws Exception {
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
@@ -79,9 +81,12 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
public void allPropertiesSelectStar() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("*", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
@@ -96,9 +101,12 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
public void selectEmployeeId() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("EmployeeId", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
@@ -113,9 +121,12 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
public void selectNavigationProperties() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("ne_Team, ne_Manager", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
@@ -130,9 +141,12 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
public void selectComplexProperties() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Location", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
@@ -147,9 +161,12 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
public void selectComplexAndNavigationProperties() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Location, ne_Room", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
@@ -164,9 +181,12 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
public void selectComplexAndNavigationAndKeyProperties() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Location, ne_Room, EmployeeId, TeamId", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
@@ -181,9 +201,12 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
public void selectEmployeeIdEmployeeNameImageUrl() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("EmployeeId, EmployeeName, ImageUrl", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
@@ -198,9 +221,12 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
public void selectAge() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Age", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
@@ -211,7 +237,8 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
verifyComplexProperties(xmlString, F);
}
- private void verifyComplexProperties(final String xmlString, final boolean location) throws IOException, SAXException, XpathException {
+ private void verifyComplexProperties(final String xmlString, final boolean location) throws IOException,
+ SAXException, XpathException {
if (location) {
assertXpathExists("/a:entry/m:properties/d:Location", xmlString);
} else {
@@ -219,7 +246,8 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
}
}
- private void verifySingleProperties(final String xmlString, final boolean employeeName, final boolean age, final boolean entryDate, final boolean imageUrl) throws IOException, SAXException, XpathException {
+ private void verifySingleProperties(final String xmlString, final boolean employeeName, final boolean age,
+ final boolean entryDate, final boolean imageUrl) throws IOException, SAXException, XpathException {
if (employeeName) {
assertXpathExists("/a:entry/m:properties/d:EmployeeName", xmlString);
} else {
@@ -242,7 +270,8 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
}
}
- private void verifyKeyProperties(final String xmlString, final boolean employeeId, final boolean managerId, final boolean roomId, final boolean teamId) throws IOException, SAXException, XpathException {
+ private void verifyKeyProperties(final String xmlString, final boolean employeeId, final boolean managerId,
+ final boolean roomId, final boolean teamId) throws IOException, SAXException, XpathException {
if (employeeId) {
assertXpathExists("/a:entry/m:properties/d:EmployeeId", xmlString);
} else {
@@ -265,7 +294,8 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
}
}
- private void verifyNavigationProperties(final String xmlString, final boolean neManager, final boolean neRoom, final boolean neTeam) throws IOException, SAXException, XpathException {
+ private void verifyNavigationProperties(final String xmlString, final boolean neManager, final boolean neRoom,
+ final boolean neTeam) throws IOException, SAXException, XpathException {
if (neManager) {
assertXpathExists("/a:entry/a:link[@href=\"Employees('1')/ne_Manager\" and @title='ne_Manager']", xmlString);
} else {
@@ -291,7 +321,8 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
return xmlString;
}
- private ExpandSelectTreeNode getSelectExpandTree(final String selectString, final String expandString) throws Exception {
+ private ExpandSelectTreeNode getSelectExpandTree(final String selectString, final String expandString)
+ throws Exception {
Edm edm = RuntimeDelegate.createEdm(new EdmTestProvider());
UriParserImpl uriParser = new UriParserImpl(edm);
@@ -308,7 +339,8 @@ public class XmlSelectProducerTest extends AbstractProviderTest {
}
UriInfo uriInfo = uriParser.parse(pathSegments, queryParameters);
- ExpandSelectTreeCreator expandSelectTreeCreator = new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
+ ExpandSelectTreeCreator expandSelectTreeCreator =
+ new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
ExpandSelectTreeNode expandSelectTree = expandSelectTreeCreator.create();
assertNotNull(expandSelectTree);
return expandSelectTree;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java
index a62c12e..783e675 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.util;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java
index 7c494ec..e9dd68f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.util;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java
index e54e672..c0a98c3 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.exception;
@@ -59,7 +59,8 @@ public class MessageReferenceTest extends BaseTest {
assertTrue(e.getMessageReference().getContent().contains("content"));
assertTrue(e.getMessageReference().getContent().contains("content_2"));
- ODataMessageException e2 = new UriNotMatchingException(UriNotMatchingException.ENTITYNOTFOUND.addContent("content_3"));
+ ODataMessageException e2 =
+ new UriNotMatchingException(UriNotMatchingException.ENTITYNOTFOUND.addContent("content_3"));
assertEquals(2, e.getMessageReference().getContent().size());
assertTrue(e.getMessageReference().getContent().contains("content"));
assertTrue(e.getMessageReference().getContent().contains("content_2"));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java
index b6516cc..553857f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.exception;
@@ -40,7 +40,10 @@ public class MessageServiceTest extends BaseTest {
MessageReference context = MessageReference.create(ODataMessageException.class, "COMMON");
Message ms = MessageService.getMessage(null, context);
- assertEquals("MessageService could not be created because of exception 'IllegalArgumentException with message 'Parameter locale MUST NOT be NULL.'.", ms.getText());
+ assertEquals(
+ "MessageService could not be created because of exception 'IllegalArgumentException with message " +
+ "'Parameter locale MUST NOT be NULL.'.",
+ ms.getText());
}
@Test
@@ -53,7 +56,8 @@ public class MessageServiceTest extends BaseTest {
@Test
public void testParameter() throws Exception {
- MessageReference context = MessageReference.create(ODataMessageException.class, "ONE_REPLACEMENTS").addContent("first");
+ MessageReference context =
+ MessageReference.create(ODataMessageException.class, "ONE_REPLACEMENTS").addContent("first");
Message ms = MessageService.getMessage(DEFAULT_LANGUAGE, context);
assertEquals("Only replacement is [first]!", ms.getText());
@@ -61,15 +65,20 @@ public class MessageServiceTest extends BaseTest {
@Test
public void testOneParameterForTwo() throws Exception {
- MessageReference context = MessageReference.create(ODataMessageException.class, "TWO_REPLACEMENTS").addContent("first");
+ MessageReference context =
+ MessageReference.create(ODataMessageException.class, "TWO_REPLACEMENTS").addContent("first");
Message ms = MessageService.getMessage(DEFAULT_LANGUAGE, context);
- assertEquals("Missing replacement for place holder in value 'First was [%1$s] and second was [%2$s]!' for following arguments '[first]'!", ms.getText());
+ assertEquals(
+ "Missing replacement for place holder in value 'First was [%1$s] and second was [%2$s]!' " +
+ "for following arguments '[first]'!",
+ ms.getText());
}
@Test
public void testTwoParameters() throws Exception {
- MessageReference context = MessageReference.create(ODataMessageException.class, "TWO_REPLACEMENTS").addContent("first", "second");
+ MessageReference context =
+ MessageReference.create(ODataMessageException.class, "TWO_REPLACEMENTS").addContent("first", "second");
Message ms = MessageService.getMessage(DEFAULT_LANGUAGE, context);
assertEquals("First was [first] and second was [second]!", ms.getText());
@@ -77,7 +86,9 @@ public class MessageServiceTest extends BaseTest {
@Test
public void testTwoParametersWithTwoAddContent() throws Exception {
- MessageReference context = MessageReference.create(ODataMessageException.class, "TWO_REPLACEMENTS").addContent("first").addContent("second");
+ MessageReference context =
+ MessageReference.create(ODataMessageException.class, "TWO_REPLACEMENTS").addContent("first").addContent(
+ "second");
Message ms = MessageService.getMessage(DEFAULT_LANGUAGE, context);
assertEquals("First was [first] and second was [second]!", ms.getText());
@@ -85,7 +96,8 @@ public class MessageServiceTest extends BaseTest {
@Test
public void testThreeParametersForTwo() throws Exception {
- MessageReference context = MessageReference.create(ODataMessageException.class, "TWO_REPLACEMENTS").addContent("first", "second", "third");
+ MessageReference context =
+ MessageReference.create(ODataMessageException.class, "TWO_REPLACEMENTS").addContent("first", "second", "third");
Message ms = MessageService.getMessage(DEFAULT_LANGUAGE, context);
assertEquals("First was [first] and second was [second]!", ms.getText());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java
index f785d01..6127605 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.exception;
@@ -70,7 +70,8 @@ public class ODataExceptionTest extends BaseTest {
@Test
public void oDataContextedCause() {
- ODataException exception = new ODataException("Some message.", new ODataNotFoundException(ODataNotFoundException.ENTITY));
+ ODataException exception =
+ new ODataException("Some message.", new ODataNotFoundException(ODataNotFoundException.ENTITY));
assertTrue(exception.isCausedByHttpException());
}
@@ -82,8 +83,8 @@ public class ODataExceptionTest extends BaseTest {
assertTrue(exception.isCausedByHttpException());
}
- //The following tests verify whether all fields of type {@link MessageReference} of
- //the tested (Exception) class are provided in the <b>i18n.properties</b> file.
+ // The following tests verify whether all fields of type {@link MessageReference} of
+ // the tested (Exception) class are provided in the <b>i18n.properties</b> file.
@Test
public void messagesOfODataMessageExceptions() {
ODataMessageTextVerifier.TestClass(ODataMessageException.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java
index 72b214c..28d5c97 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.exception;
@@ -31,7 +31,7 @@ import org.junit.Test;
/**
* This class tests the {@link ODataMessageTextVerifier}
*
- *
+ *
*/
public class ODataMessageTextVerifierTest extends BaseTest {
@@ -45,10 +45,18 @@ public class ODataMessageTextVerifierTest extends BaseTest {
assertEquals("!!!Error in testtool", 2, ec.size());
assertNotNull("!!!Error in testtool", ec.get(0));
- assertEquals("Error", "Error-->Messagetext for key:\"org.apache.olingo.odata2.testutil.mock.SampleClassForInvalidMessageReferences.DOES_NOT_EXIST\" missing", ec.get(0).getMessage());
+ assertEquals(
+ "Error",
+ "Error-->Messagetext for key:\"org.apache.olingo.odata2.testutil.mock.SampleClassForInvalidMessageReferences." +
+ "DOES_NOT_EXIST\" missing",
+ ec.get(0).getMessage());
assertNotNull("!!!Error in testtool", ec.get(1));
- assertEquals("Error", "Error-->Messagetext for key:\"org.apache.olingo.odata2.testutil.mock.SampleClassForInvalidMessageReferences.EXITS_BUT_EMPTY\" empty", ec.get(1).getMessage());
+ assertEquals(
+ "Error",
+ "Error-->Messagetext for key:\"org.apache.olingo.odata2.testutil.mock.SampleClassForInvalidMessageReferences." +
+ "EXITS_BUT_EMPTY\" empty",
+ ec.get(1).getMessage());
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java
index 5ea4af1..c719c0a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.processor;
@@ -147,7 +147,8 @@ public class ODataSingleProcessorServiceTest extends BaseTest {
@Test
public void defaultSupportedContentTypesAndGifForEntityLink() throws Exception {
String ctGif = ContentType.create("image", "gif").toContentTypeString();
- when(((CustomContentType) processor).getCustomContentTypes(EntityLinkProcessor.class)).thenReturn(Arrays.asList(ctGif));
+ when(((CustomContentType) processor).getCustomContentTypes(EntityLinkProcessor.class)).thenReturn(
+ Arrays.asList(ctGif));
List<String> types = service.getSupportedContentTypes(EntityLinkProcessor.class);
assertTrue(types.contains(ctGif));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataErrorHandlerCallbackImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataErrorHandlerCallbackImpl.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataErrorHandlerCallbackImpl.java
index c2f61dd..c70268c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataErrorHandlerCallbackImpl.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataErrorHandlerCallbackImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
@@ -34,7 +34,8 @@ public class ODataErrorHandlerCallbackImpl implements ODataErrorCallback {
@Override
public ODataResponse handleError(final ODataErrorContext context) {
- ODataResponseBuilder responseBuilder = ODataResponse.entity("bla").status(HttpStatusCodes.BAD_REQUEST).contentHeader("text/html");
+ ODataResponseBuilder responseBuilder =
+ ODataResponse.entity("bla").status(HttpStatusCodes.BAD_REQUEST).contentHeader("text/html");
if (context.getRequestUri() != null) {
responseBuilder.header("RequestUri", context.getRequestUri().toASCIIString());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
index dbf9d44..26b06c1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
@@ -101,7 +101,8 @@ public class ODataExceptionMapperImplTest extends BaseTest {
value.putSingle("Accept", "AcceptValue");
value.put("AcceptMulti", Arrays.asList("AcceptValue_1", "AcceptValue_2"));
when(exceptionMapper.httpHeaders.getRequestHeaders()).thenReturn(value);
- when(exceptionMapper.servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL)).thenReturn(ODataServiceFactoryImpl.class.getName());
+ when(exceptionMapper.servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL)).thenReturn(
+ ODataServiceFactoryImpl.class.getName());
when(exceptionMapper.servletRequest.getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL)).thenReturn(null);
Response response = exceptionMapper.toResponse(new Exception());
@@ -124,8 +125,10 @@ public class ODataExceptionMapperImplTest extends BaseTest {
value.putSingle("Accept", "AcceptValue");
value.put("AcceptMulti", Arrays.asList("AcceptValue_1", "AcceptValue_2"));
when(exceptionMapper.httpHeaders.getRequestHeaders()).thenReturn(value);
- when(exceptionMapper.servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL)).thenReturn(ODataServiceFactoryImpl.class.getName());
- when(exceptionMapper.servletRequest.getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL)).thenReturn(ODataServiceFactoryImpl.class.getClassLoader());
+ when(exceptionMapper.servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL)).thenReturn(
+ ODataServiceFactoryImpl.class.getName());
+ when(exceptionMapper.servletRequest.getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL)).thenReturn(
+ ODataServiceFactoryImpl.class.getClassLoader());
Response response = exceptionMapper.toResponse(new Exception());
// verify
@@ -203,7 +206,8 @@ public class ODataExceptionMapperImplTest extends BaseTest {
Response response = exceptionMapper.toResponse(exception);
// verify
- verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText(), HttpStatusCodes.NOT_FOUND);
+ verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText(),
+ HttpStatusCodes.NOT_FOUND);
}
@Test
@@ -215,7 +219,8 @@ public class ODataExceptionMapperImplTest extends BaseTest {
Response response = exceptionMapper.toResponse(exception);
// verify
- verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, EntityProviderException.INVALID_PROPERTY.addContent("unknown")).getText(), HttpStatusCodes.BAD_REQUEST);
+ verifyResponse(response, MessageService.getMessage(Locale.ENGLISH,
+ EntityProviderException.INVALID_PROPERTY.addContent("unknown")).getText(), HttpStatusCodes.BAD_REQUEST);
}
@Test
@@ -229,7 +234,8 @@ public class ODataExceptionMapperImplTest extends BaseTest {
Response response = exceptionMapper.toResponse(exception);
// verify
- verifyResponse(response, MessageService.getMessage(Locale.GERMAN, ODataNotFoundException.ENTITY).getText(), HttpStatusCodes.NOT_FOUND);
+ verifyResponse(response, MessageService.getMessage(Locale.GERMAN, ODataNotFoundException.ENTITY).getText(),
+ HttpStatusCodes.NOT_FOUND);
}
@Test
@@ -243,7 +249,8 @@ public class ODataExceptionMapperImplTest extends BaseTest {
Response response = exceptionMapper.toResponse(exception);
// verify
- verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText(), HttpStatusCodes.NOT_FOUND);
+ verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText(),
+ HttpStatusCodes.NOT_FOUND);
}
@Test
@@ -309,19 +316,22 @@ public class ODataExceptionMapperImplTest extends BaseTest {
Response response = exceptionMapper.toResponse(exception);
// verify
- verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, UriSyntaxException.EMPTYSEGMENT).getText(), HttpStatusCodes.BAD_REQUEST);
+ verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, UriSyntaxException.EMPTYSEGMENT).getText(),
+ HttpStatusCodes.BAD_REQUEST);
}
@Test
public void testUriParserExceptionWrapped() throws Exception {
// prepare
- Exception exception = new ODataException("outer exception", new UriSyntaxException(UriSyntaxException.EMPTYSEGMENT));
+ Exception exception =
+ new ODataException("outer exception", new UriSyntaxException(UriSyntaxException.EMPTYSEGMENT));
// execute
Response response = exceptionMapper.toResponse(exception);
// verify
- verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, UriSyntaxException.EMPTYSEGMENT).getText(), HttpStatusCodes.BAD_REQUEST);
+ verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, UriSyntaxException.EMPTYSEGMENT).getText(),
+ HttpStatusCodes.BAD_REQUEST);
}
@Test
@@ -354,7 +364,9 @@ public class ODataExceptionMapperImplTest extends BaseTest {
public void testNotAllowedJaxRsException() throws Exception {
// prepare
String message = "The request dispatcher does not allow the HTTP method used for the request.";
- Exception exception = new NotAllowedException(Response.status(Response.Status.METHOD_NOT_ALLOWED).header(HttpHeaders.ALLOW, "GET").build());
+ Exception exception =
+ new NotAllowedException(Response.status(Response.Status.METHOD_NOT_ALLOWED).header(HttpHeaders.ALLOW, "GET")
+ .build());
// execute
Response response = exceptionMapper.toResponse(exception);
@@ -393,7 +405,8 @@ public class ODataExceptionMapperImplTest extends BaseTest {
// prepare
String errorCode = "ErrorCode";
String message = "expected exception message";
- Exception exception = new ODataApplicationException(message, Locale.ENGLISH, HttpStatusCodes.INTERNAL_SERVER_ERROR, errorCode);
+ Exception exception =
+ new ODataApplicationException(message, Locale.ENGLISH, HttpStatusCodes.INTERNAL_SERVER_ERROR, errorCode);
// execute
Response response = exceptionMapper.toResponse(exception);
@@ -413,13 +426,16 @@ public class ODataExceptionMapperImplTest extends BaseTest {
Response response = exceptionMapper.toResponse(exception);
// verify
- String errorMessage = verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText(), HttpStatusCodes.NOT_FOUND);
+ String errorMessage =
+ verifyResponse(response, MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText(),
+ HttpStatusCodes.NOT_FOUND);
assertXpathEvaluatesTo(errorCode, "/a:error/a:code", errorMessage);
}
@Test
public void testCallback() throws Exception {
- when(exceptionMapper.servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL)).thenReturn(ODataServiceFactoryImpl.class.getName());
+ when(exceptionMapper.servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL)).thenReturn(
+ ODataServiceFactoryImpl.class.getName());
Response response = exceptionMapper.toResponse(new Exception());
// verify
@@ -431,7 +447,8 @@ public class ODataExceptionMapperImplTest extends BaseTest {
assertEquals("text/html", contentTypeHeader);
}
- private String verifyResponse(final Response response, final String message, final HttpStatusCodes statusCode) throws Exception {
+ private String verifyResponse(final Response response, final String message, final HttpStatusCodes statusCode)
+ throws Exception {
assertNotNull(response);
assertEquals(statusCode.getStatusCode(), response.getStatus());
String errorXml = StringHelper.inputStreamToString((InputStream) response.getEntity());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataServiceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataServiceFactoryImpl.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataServiceFactoryImpl.java
index d195296..8604b6a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataServiceFactoryImpl.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataServiceFactoryImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateTest.java
index 4e60c41..6eb3559 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rt;
[27/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java
index ac46316..f6ae572 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
@@ -67,11 +67,12 @@ import org.apache.olingo.odata2.core.uri.expression.OrderByParserImpl;
/**
* Parser for the OData part of the URL.
- *
+ *
*/
public class UriParserImpl extends UriParser {
- private static final Pattern INITIAL_SEGMENT_PATTERN = Pattern.compile("(?:([^.()]+)\\.)?([^.()]+)(?:\\((.+)\\)|(\\(\\)))?");
+ private static final Pattern INITIAL_SEGMENT_PATTERN = Pattern
+ .compile("(?:([^.()]+)\\.)?([^.()]+)(?:\\((.+)\\)|(\\(\\)))?");
private static final Pattern NAVIGATION_SEGMENT_PATTERN = Pattern.compile("([^()]+)(?:\\((.+)\\)|(\\(\\)))?");
private static final Pattern NAMED_VALUE_PATTERN = Pattern.compile("(?:([^=]+)=)?([^=]+)");
@@ -91,13 +92,14 @@ public class UriParserImpl extends UriParser {
/**
* Parse the URI part after an OData service root,
* already splitted into path segments and query parameters.
- * @param pathSegments the {@link PathSegment}s of the resource path,
- * potentially percent-encoded
+ * @param pathSegments the {@link PathSegment}s of the resource path,
+ * potentially percent-encoded
* @param queryParameters the query parameters, already percent-decoded
* @return a {@link UriInfoImpl} instance containing the parsed information
*/
@Override
- public UriInfo parse(final List<PathSegment> pathSegments, final Map<String, String> queryParameters) throws UriSyntaxException, UriNotMatchingException, EdmException {
+ public UriInfo parse(final List<PathSegment> pathSegments, final Map<String, String> queryParameters)
+ throws UriSyntaxException, UriNotMatchingException, EdmException {
this.pathSegments = copyPathSegmentList(pathSegments);
systemQueryOptions = new HashMap<SystemQueryOption, String>();
otherQueryParameters = new HashMap<String, String>();
@@ -188,7 +190,8 @@ public class UriParserImpl extends UriParser {
}
}
- private void handleEntitySet(final EdmEntitySet entitySet, final String keyPredicate) throws UriSyntaxException, UriNotMatchingException, EdmException {
+ private void handleEntitySet(final EdmEntitySet entitySet, final String keyPredicate) throws UriSyntaxException,
+ UriNotMatchingException, EdmException {
final EdmEntityType entityType = entitySet.getEntityType();
uriResult.setTargetType(entityType);
@@ -326,7 +329,8 @@ public class UriParserImpl extends UriParser {
}
}
- private void addNavigationSegment(final String keyPredicateName, final EdmNavigationProperty navigationProperty) throws UriSyntaxException, EdmException {
+ private void addNavigationSegment(final String keyPredicateName, final EdmNavigationProperty navigationProperty)
+ throws UriSyntaxException, EdmException {
final EdmEntitySet targetEntitySet = uriResult.getTargetEntitySet().getRelatedEntitySet(navigationProperty);
final EdmEntityType targetEntityType = targetEntitySet.getEntityType();
uriResult.setTargetEntitySet(targetEntitySet);
@@ -341,7 +345,8 @@ public class UriParserImpl extends UriParser {
uriResult.addNavigationSegment(navigationSegment);
}
- private void handlePropertyPath(final EdmProperty property) throws UriSyntaxException, UriNotMatchingException, EdmException {
+ private void handlePropertyPath(final EdmProperty property) throws UriSyntaxException, UriNotMatchingException,
+ EdmException {
uriResult.addProperty(property);
final EdmType type = property.getType();
@@ -408,7 +413,8 @@ public class UriParserImpl extends UriParser {
}
}
- private ArrayList<KeyPredicate> parseKey(final String keyPredicate, final EdmEntityType entityType) throws UriSyntaxException, EdmException {
+ private ArrayList<KeyPredicate> parseKey(final String keyPredicate, final EdmEntityType entityType)
+ throws UriSyntaxException, EdmException {
final List<EdmProperty> keyProperties = entityType.getKeyProperties();
ArrayList<EdmProperty> parsedKeyProperties = new ArrayList<EdmProperty>();
ArrayList<KeyPredicate> keyPredicates = new ArrayList<KeyPredicate>();
@@ -457,7 +463,8 @@ public class UriParserImpl extends UriParser {
return keyPredicates;
}
- private void handleFunctionImport(final EdmFunctionImport functionImport, final String emptyParentheses, final String keyPredicate) throws UriSyntaxException, UriNotMatchingException, EdmException {
+ private void handleFunctionImport(final EdmFunctionImport functionImport, final String emptyParentheses,
+ final String keyPredicate) throws UriSyntaxException, UriNotMatchingException, EdmException {
final EdmTyped returnType = functionImport.getReturnType();
final EdmType type = returnType.getType();
final boolean isCollection = returnType.getMultiplicity() == EdmMultiplicity.MANY;
@@ -525,7 +532,8 @@ public class UriParserImpl extends UriParser {
for (SystemQueryOption queryOption : systemQueryOptions.keySet()) {
- if (queryOption == SystemQueryOption.$format && (uriType == UriType.URI4 || uriType == UriType.URI5) && uriResult.isValue()) {
+ if (queryOption == SystemQueryOption.$format && (uriType == UriType.URI4 || uriType == UriType.URI5)
+ && uriResult.isValue()) {
throw new UriSyntaxException(UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION.addContent(queryOption));
}
@@ -644,7 +652,8 @@ public class UriParserImpl extends UriParser {
}
}
- private void handleSystemQueryOptionExpand(final String expandStatement) throws UriSyntaxException, UriNotMatchingException, EdmException {
+ private void handleSystemQueryOptionExpand(final String expandStatement) throws UriSyntaxException,
+ UriNotMatchingException, EdmException {
ArrayList<ArrayList<NavigationPropertySegment>> expand = new ArrayList<ArrayList<NavigationPropertySegment>>();
if (expandStatement.startsWith(",") || expandStatement.endsWith(",")) {
@@ -688,7 +697,8 @@ public class UriParserImpl extends UriParser {
uriResult.setExpand(expand);
}
- private void handleSystemQueryOptionSelect(final String selectStatement) throws UriSyntaxException, UriNotMatchingException, EdmException {
+ private void handleSystemQueryOptionSelect(final String selectStatement) throws UriSyntaxException,
+ UriNotMatchingException, EdmException {
ArrayList<SelectItem> select = new ArrayList<SelectItem>();
if (selectStatement.startsWith(",") || selectStatement.endsWith(",")) {
@@ -827,17 +837,20 @@ public class UriParserImpl extends UriParser {
}
@Override
- public FilterExpression parseFilterString(final EdmEntityType entityType, final String expression) throws ExpressionParserException, ODataMessageException {
+ public FilterExpression parseFilterString(final EdmEntityType entityType, final String expression)
+ throws ExpressionParserException, ODataMessageException {
return new FilterParserImpl(entityType).parseFilterString(expression);
}
@Override
- public OrderByExpression parseOrderByString(final EdmEntityType entityType, final String expression) throws ExpressionParserException, ODataMessageException {
+ public OrderByExpression parseOrderByString(final EdmEntityType entityType, final String expression)
+ throws ExpressionParserException, ODataMessageException {
return new OrderByParserImpl(entityType).parseOrderByString(expression);
}
@Override
- public ExpandSelectTreeNode buildExpandSelectTree(final List<SelectItem> select, final List<ArrayList<NavigationPropertySegment>> expand) throws EdmException {
+ public ExpandSelectTreeNode buildExpandSelectTree(final List<SelectItem> select,
+ final List<ArrayList<NavigationPropertySegment>> expand) throws EdmException {
return new ExpandSelectTreeCreator(select, expand).create();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
index ed98a0e..0983d08 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri;
@@ -31,7 +31,9 @@ public enum UriType {
/**
* Entity set
*/
- URI1(SystemQueryOption.$format, SystemQueryOption.$filter, SystemQueryOption.$inlinecount, SystemQueryOption.$orderby, SystemQueryOption.$skiptoken, SystemQueryOption.$skip, SystemQueryOption.$top, SystemQueryOption.$expand, SystemQueryOption.$select),
+ URI1(SystemQueryOption.$format, SystemQueryOption.$filter, SystemQueryOption.$inlinecount,
+ SystemQueryOption.$orderby, SystemQueryOption.$skiptoken, SystemQueryOption.$skip, SystemQueryOption.$top,
+ SystemQueryOption.$expand, SystemQueryOption.$select),
/**
* Entity set with key predicate
*/
@@ -55,7 +57,9 @@ public enum UriType {
/**
* Navigation property of an entity with target multiplicity '*'
*/
- URI6B(SystemQueryOption.$format, SystemQueryOption.$filter, SystemQueryOption.$inlinecount, SystemQueryOption.$orderby, SystemQueryOption.$skiptoken, SystemQueryOption.$skip, SystemQueryOption.$top, SystemQueryOption.$expand, SystemQueryOption.$select),
+ URI6B(SystemQueryOption.$format, SystemQueryOption.$filter, SystemQueryOption.$inlinecount,
+ SystemQueryOption.$orderby, SystemQueryOption.$skiptoken, SystemQueryOption.$skip, SystemQueryOption.$top,
+ SystemQueryOption.$expand, SystemQueryOption.$select),
/**
* Link to a single entity
*/
@@ -63,7 +67,8 @@ public enum UriType {
/**
* Link to multiple entities
*/
- URI7B(SystemQueryOption.$format, SystemQueryOption.$filter, SystemQueryOption.$inlinecount, SystemQueryOption.$orderby, SystemQueryOption.$skiptoken, SystemQueryOption.$skip, SystemQueryOption.$top),
+ URI7B(SystemQueryOption.$format, SystemQueryOption.$filter, SystemQueryOption.$inlinecount,
+ SystemQueryOption.$orderby, SystemQueryOption.$skiptoken, SystemQueryOption.$skip, SystemQueryOption.$top),
/**
* Metadata document
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ActualBinaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ActualBinaryOperator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ActualBinaryOperator.java
index aa73a06..f1b2f2b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ActualBinaryOperator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ActualBinaryOperator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java
index f475cdc..5243536 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -37,7 +37,8 @@ public class BinaryExpressionImpl implements BinaryExpression {
final protected Token token;
protected EdmType edmType;
- public BinaryExpressionImpl(final InfoBinaryOperator operatorInfo, final CommonExpression leftSide, final CommonExpression rightSide, final Token token) {
+ public BinaryExpressionImpl(final InfoBinaryOperator operatorInfo, final CommonExpression leftSide,
+ final CommonExpression rightSide, final Token token) {
this.operatorInfo = operatorInfo;
this.leftSide = leftSide;
this.rightSide = rightSide;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java
index a43c747..62dcea1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -25,17 +25,23 @@ import org.apache.olingo.odata2.api.uri.expression.CommonExpression;
/**
* Internal error in the expression parser.
- *
+ *
*/
public class ExpressionParserInternalError extends ODataMessageException {
static final long serialVersionUID = 77L;
- public static final MessageReference ERROR_PARSING_METHOD = createMessageReference(ExpressionParserInternalError.class, "ERROR_PARSING_METHOD");
- public static final MessageReference ERROR_PARSING_PARENTHESIS = createMessageReference(ExpressionParserInternalError.class, "ERROR_PARSING_PARENTHESIS");
- public static final MessageReference ERROR_ACCESSING_EDM = createMessageReference(ExpressionParserInternalError.class, "ERROR_ACCESSING_EDM");
- public static final MessageReference INVALID_TYPE_COUNT = createMessageReference(ExpressionParserInternalError.class, "INVALID_TYPE_COUNT");;
- public static final MessageReference INVALID_TOKEN_AT = createMessageReference(ExpressionParserInternalError.class, "INVALID_TOKEN_AT");
- public static final MessageReference INVALID_TOKENKIND_AT = createMessageReference(ExpressionParserInternalError.class, "INVALID_TOKENKIND_AT");
+ public static final MessageReference ERROR_PARSING_METHOD = createMessageReference(
+ ExpressionParserInternalError.class, "ERROR_PARSING_METHOD");
+ public static final MessageReference ERROR_PARSING_PARENTHESIS = createMessageReference(
+ ExpressionParserInternalError.class, "ERROR_PARSING_PARENTHESIS");
+ public static final MessageReference ERROR_ACCESSING_EDM = createMessageReference(
+ ExpressionParserInternalError.class, "ERROR_ACCESSING_EDM");
+ public static final MessageReference INVALID_TYPE_COUNT = createMessageReference(ExpressionParserInternalError.class,
+ "INVALID_TYPE_COUNT");;
+ public static final MessageReference INVALID_TOKEN_AT = createMessageReference(ExpressionParserInternalError.class,
+ "INVALID_TOKEN_AT");
+ public static final MessageReference INVALID_TOKENKIND_AT = createMessageReference(
+ ExpressionParserInternalError.class, "INVALID_TOKENKIND_AT");
CommonExpression parenthesisExpression = null;
@@ -68,7 +74,8 @@ public class ExpressionParserInternalError extends ODataMessageException {
return new ExpressionParserInternalError(ERROR_PARSING_PARENTHESIS, cause);
}
- public static ExpressionParserInternalError createERROR_PARSING_PARENTHESIS(final CommonExpression parenthesisExpression, final TokenizerExpectError cause) {
+ public static ExpressionParserInternalError createERROR_PARSING_PARENTHESIS(
+ final CommonExpression parenthesisExpression, final TokenizerExpectError cause) {
return new ExpressionParserInternalError(ERROR_PARSING_PARENTHESIS, cause).setExpression(parenthesisExpression);
}
@@ -92,7 +99,8 @@ public class ExpressionParserInternalError extends ODataMessageException {
return new ExpressionParserInternalError(ERROR_ACCESSING_EDM);
}
- public static ExpressionParserInternalError createINVALID_TOKEN_AT(final String expectedToken, final Token actualToken) {
+ public static ExpressionParserInternalError
+ createINVALID_TOKEN_AT(final String expectedToken, final Token actualToken) {
MessageReference msgRef = ExpressionParserInternalError.INVALID_TOKEN_AT.create();
msgRef.addContent(expectedToken);
@@ -102,7 +110,8 @@ public class ExpressionParserInternalError extends ODataMessageException {
return new ExpressionParserInternalError(msgRef);
}
- public static ExpressionParserInternalError createINVALID_TOKENKIND_AT(final TokenKind expectedTokenKind, final Token actualToken) {
+ public static ExpressionParserInternalError createINVALID_TOKENKIND_AT(final TokenKind expectedTokenKind,
+ final Token actualToken) {
MessageReference msgRef = ExpressionParserInternalError.INVALID_TOKEN_AT.create();
msgRef.addContent(expectedTokenKind.toString());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java
index b0a7ef0..8d6ac2a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java
index 255b951..972e3b3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -25,33 +25,39 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
/**
* Interface which defines a method for parsing a $filter expression to allow different parser implementations
* <p>
- * The current expression parser supports expressions as defined in the OData specification 2.0 with the following restrictions
- * - the methods "cast", "isof" and "replace" are not supported
- *
+ * The current expression parser supports expressions as defined in the OData specification 2.0 with the following
+ * restrictions
+ * - the methods "cast", "isof" and "replace" are not supported
+ *
* The expression parser can be used with providing an Entity Data Model (EDM) an without providing it.
- * <p>When a EDM is provided the expression parser will be as strict as possible. That means:
- * <li>All properties used in the expression must be defined inside the EDM</li>
- * <li>The types of EDM properties will be checked against the lists of allowed type per method, binary- and unary operator</li>
- * </p>
- * <p>If no EDM is provided the expression parser performs a lax validation
- * <li>The properties used in the expression are not looked up inside the EDM and the type of the expression node representing the
- * property will be "null"</li>
- * <li>Expression node with EDM-types which are "null" are not considered during the parameter type validation, to the return type of the parent expression node will
- * also become "null"</li>
- *
- *
+ * <p>When a EDM is provided the expression parser will be as strict as possible. That means:
+ * <li>All properties used in the expression must be defined inside the EDM</li>
+ * <li>The types of EDM properties will be checked against the lists of allowed type per method, binary- and unary
+ * operator</li>
+ * </p>
+ * <p>If no EDM is provided the expression parser performs a lax validation
+ * <li>The properties used in the expression are not looked up inside the EDM and the type of the expression node
+ * representing the
+ * property will be "null"</li>
+ * <li>Expression node with EDM-types which are "null" are not considered during the parameter type validation, to the
+ * return type of the parent expression node will
+ * also become "null"</li>
+ *
+ *
*/
public interface FilterParser {
/**
* Parses a $filter expression string and creates an $orderby expression tree.
* @param expression
- * The $filter expression string ( for example "city eq 'Sydney'" ) to be parsed
+ * The $filter expression string ( for example "city eq 'Sydney'" ) to be parsed
* @return
- * Expression tree which can be traversed with help of the interfaces {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor} and {@link org.apache.olingo.odata2.api.uri.expression.Visitable}
+ * Expression tree which can be traversed with help of the interfaces
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor} and
+ * {@link org.apache.olingo.odata2.api.uri.expression.Visitable}
* @throws ExpressionParserException
- * Exception thrown due to errors while parsing the $filter expression string
+ * Exception thrown due to errors while parsing the $filter expression string
* @throws ODataMessageException
- * Used for extensibility
+ * Used for extensibility
**/
FilterExpression parseFilterString(String expression) throws ExpressionParserException, ODataMessageException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
index 4a95bf1..403fe2f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -30,11 +30,11 @@ import org.apache.olingo.odata2.api.uri.expression.PropertyExpression;
/**
* This class is used to create exceptions of type FilterParserException.
- * Because this class lies inside org.apache.olingo.odata2.core it is possible to define better/more detailed
+ * Because this class lies inside org.apache.olingo.odata2.core it is possible to define better/more detailed
* input parameters for inserting into the exception text.<br>
* The exception {@link ExpressionParserException} does not know the org.apache.olingo.odata2.core content
*
- *
+ *
*/
public class FilterParserExceptionImpl extends ExpressionParserException {
private static final long serialVersionUID = 77L;
@@ -43,7 +43,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(ODataBadRequestException.COMMON);
}
- static public ExpressionParserException createERROR_IN_TOKENIZER(final TokenizerException exceptionTokenizer, final String expression) {
+ static public ExpressionParserException createERROR_IN_TOKENIZER(final TokenizerException exceptionTokenizer,
+ final String expression) {
Token token = exceptionTokenizer.getToken();
MessageReference msgRef = ExpressionParserException.ERROR_IN_TOKENIZER.create();
@@ -54,7 +55,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef, exceptionTokenizer);
}
- static public ExpressionParserException createINVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING(final Token token, final String expression) {
+ static public ExpressionParserException createINVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING(final Token token,
+ final String expression) {
MessageReference msgRef = ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING.create();
msgRef.addContent(token.getUriLiteral());
@@ -64,7 +66,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- static public ExpressionParserException createEXPRESSION_EXPECTED_AFTER_POS(final Token token, final String expression) {
+ static public ExpressionParserException
+ createEXPRESSION_EXPECTED_AFTER_POS(final Token token, final String expression) {
MessageReference msgRef = ExpressionParserException.EXPRESSION_EXPECTED_AFTER_POS.create();
msgRef.addContent(Integer.toString(token.getPosition() + 1));
@@ -73,7 +76,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- static public ExpressionParserException createEXPRESSION_EXPECTED_AFTER_POS(final int position, final String expression) {
+ static public ExpressionParserException createEXPRESSION_EXPECTED_AFTER_POS(final int position,
+ final String expression) {
MessageReference msgRef = ExpressionParserException.EXPRESSION_EXPECTED_AFTER_POS.create();
msgRef.addContent(position);
@@ -82,7 +86,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- static public ExpressionParserException createCOMMA_OR_END_EXPECTED_AT_POS(final Token token, final String expression) {
+ static public ExpressionParserException
+ createCOMMA_OR_END_EXPECTED_AT_POS(final Token token, final String expression) {
MessageReference msgRef = ExpressionParserException.COMMA_OR_END_EXPECTED_AT_POS.create();
msgRef.addContent(Integer.toString(token.getPosition() + 1));
@@ -100,7 +105,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- static public ExpressionParserException createCOMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS(final Token token, final String expression) {
+ static public ExpressionParserException createCOMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS(final Token token,
+ final String expression) {
MessageReference msgRef = ExpressionParserException.COMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS.create();
msgRef.addContent(Integer.toString(token.getPosition() + token.getUriLiteral().length()));
@@ -109,22 +115,23 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createMETHOD_WRONG_ARG_COUNT(final MethodExpressionImpl methodExpression, final Token token, final String expression) {
+ public static ExpressionParserException createMETHOD_WRONG_ARG_COUNT(final MethodExpressionImpl methodExpression,
+ final Token token, final String expression) {
MessageReference msgRef = null;
int minParam = methodExpression.getMethodInfo().getMinParameter();
int maxParam = methodExpression.getMethodInfo().getMaxParameter();
if ((minParam == -1) && (maxParam == -1)) {
- //no exception thrown in this case
+ // no exception thrown in this case
} else if ((minParam != -1) && (maxParam == -1)) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 7-1
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 7-1
msgRef = ExpressionParserException.METHOD_WRONG_ARG_X_OR_MORE.create();
msgRef.addContent(methodExpression.getMethod().toUriLiteral());
msgRef.addContent(token.getPosition() + 1);
msgRef.addContent(expression);
msgRef.addContent(minParam);
} else if ((minParam == -1) && (maxParam != -1)) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 8-2
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 8-2
msgRef = ExpressionParserException.METHOD_WRONG_ARG_X_OR_LESS.create();
msgRef.addContent(methodExpression.getMethod().toUriLiteral());
msgRef.addContent(token.getPosition() + 1);
@@ -132,14 +139,14 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
msgRef.addContent(maxParam);
} else if ((minParam != -1) && (maxParam != -1)) {
if (minParam == maxParam) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 11-1
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 11-1
msgRef = ExpressionParserException.METHOD_WRONG_ARG_EXACT.create();
msgRef.addContent(methodExpression.getMethod().toUriLiteral());
msgRef.addContent(token.getPosition() + 1);
msgRef.addContent(expression);
msgRef.addContent(minParam);
} else {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 10-1
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 10-1
msgRef = ExpressionParserException.METHOD_WRONG_ARG_BETWEEN.create();
msgRef.addContent(methodExpression.getMethod().toUriLiteral());
msgRef.addContent(token.getPosition() + 1);
@@ -152,10 +159,11 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createMETHOD_WRONG_INPUT_TYPE(final MethodExpressionImpl methodExpression, final Token token, final String expression) {
+ public static ExpressionParserException createMETHOD_WRONG_INPUT_TYPE(final MethodExpressionImpl methodExpression,
+ final Token token, final String expression) {
MessageReference msgRef = null;
- //Tested with TestParserExceptions.TestPMreadParameters CASE 7-1
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 7-1
msgRef = ExpressionParserException.METHOD_WRONG_INPUT_TYPE.create();
msgRef.addContent(methodExpression.getMethod().toUriLiteral());
msgRef.addContent(token.getPosition() + 1);
@@ -164,7 +172,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createLEFT_SIDE_NOT_A_PROPERTY(final Token token, final String expression) throws ExpressionParserInternalError {
+ public static ExpressionParserException createLEFT_SIDE_NOT_A_PROPERTY(final Token token, final String expression)
+ throws ExpressionParserInternalError {
MessageReference msgRef = ExpressionParserException.LEFT_SIDE_NOT_A_PROPERTY.create();
msgRef.addContent(token.getPosition() + 1);
@@ -173,7 +182,9 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createLEFT_SIDE_NOT_STRUCTURAL_TYPE(final EdmType parentType, final PropertyExpressionImpl property, final Token token, final String expression) throws ExpressionParserInternalError {
+ public static ExpressionParserException createLEFT_SIDE_NOT_STRUCTURAL_TYPE(final EdmType parentType,
+ final PropertyExpressionImpl property, final Token token, final String expression)
+ throws ExpressionParserInternalError {
MessageReference msgRef = ExpressionParserException.LEFT_SIDE_NOT_STRUCTURAL_TYPE.create();
try {
@@ -188,7 +199,9 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createPROPERTY_NAME_NOT_FOUND_IN_TYPE(final EdmStructuralType parentType, final PropertyExpression property, final Token token, final String expression) throws ExpressionParserInternalError {
+ public static ExpressionParserException createPROPERTY_NAME_NOT_FOUND_IN_TYPE(final EdmStructuralType parentType,
+ final PropertyExpression property, final Token token, final String expression)
+ throws ExpressionParserInternalError {
MessageReference msgRef = ExpressionParserException.PROPERTY_NAME_NOT_FOUND_IN_TYPE.create();
try {
@@ -203,7 +216,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createTOKEN_UNDETERMINATED_STRING(final int position, final String expression) {
+ public static ExpressionParserException
+ createTOKEN_UNDETERMINATED_STRING(final int position, final String expression) {
MessageReference msgRef = ExpressionParserException.TOKEN_UNDETERMINATED_STRING.create();
msgRef.addContent(position + 1);
@@ -212,7 +226,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createINVALID_TYPES_FOR_BINARY_OPERATOR(final BinaryOperator op, final EdmType left, final EdmType right, final Token token, final String expression) {
+ public static ExpressionParserException createINVALID_TYPES_FOR_BINARY_OPERATOR(final BinaryOperator op,
+ final EdmType left, final EdmType right, final Token token, final String expression) {
MessageReference msgRef = ExpressionParserException.INVALID_TYPES_FOR_BINARY_OPERATOR.create();
msgRef.addContent(op.toUriLiteral());
@@ -233,7 +248,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createMISSING_CLOSING_PHARENTHESIS(final int position, final String expression, final TokenizerExpectError e) {
+ public static ExpressionParserException createMISSING_CLOSING_PHARENTHESIS(final int position,
+ final String expression, final TokenizerExpectError e) {
MessageReference msgRef = ExpressionParserException.MISSING_CLOSING_PHARENTHESIS.create();
msgRef.addContent(position + 1);
@@ -250,7 +266,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
return new ExpressionParserException(msgRef);
}
- public static ExpressionParserException createINVALID_METHOD_CALL(final CommonExpression leftNode, final Token prevToken, final String expression) {
+ public static ExpressionParserException createINVALID_METHOD_CALL(final CommonExpression leftNode,
+ final Token prevToken, final String expression) {
final MessageReference msgRef = ExpressionParserException.INVALID_METHOD_CALL.create();
msgRef.addContent(leftNode.getUriLiteral());
@@ -261,7 +278,8 @@ public class FilterParserExceptionImpl extends ExpressionParserException {
}
- public static ExpressionParserException createTYPE_EXPECTED_AT(final EdmType expectedType, final EdmType actualType, final int position, final String expression) {
+ public static ExpressionParserException createTYPE_EXPECTED_AT(final EdmType expectedType, final EdmType actualType,
+ final int position, final String expression) {
final MessageReference msgRef = ExpressionParserException.TYPE_EXPECTED_AT.create();
try {
[56/59] [abbrv] cleanup jpa core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java
index 6d88b85..f4ad4e7 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -73,8 +73,10 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
navigationLinks = context.getCurrentExpandSelectTreeNode().getLinks();
if (navigationLinks.size() > 0) {
currentNavPropertyList = new ArrayList<EdmNavigationProperty>();
- currentNavPropertyList.add(getNextNavigationProperty(context.getSourceEntitySet().getEntityType(), context.getNavigationProperty()));
- HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(inlinedEntry, currentNavPropertyList);
+ currentNavPropertyList.add(getNextNavigationProperty(context.getSourceEntitySet().getEntityType(), context
+ .getNavigationProperty()));
+ HashMap<String, Object> navigationMap =
+ jpaResultParser.parse2EdmNavigationValueMap(inlinedEntry, currentNavPropertyList);
edmPropertyValueMap.putAll(navigationMap);
result.setEntryData(edmPropertyValueMap);
}
@@ -110,10 +112,12 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
result.setFeedData(edmEntityList);
if (context.getCurrentExpandSelectTreeNode().getLinks().size() > 0) {
currentNavPropertyList = new ArrayList<EdmNavigationProperty>();
- currentNavPropertyList.add(getNextNavigationProperty(context.getSourceEntitySet().getEntityType(), context.getNavigationProperty()));
+ currentNavPropertyList.add(getNextNavigationProperty(context.getSourceEntitySet().getEntityType(), context
+ .getNavigationProperty()));
int count = 0;
for (Object object : listOfItems) {
- HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(object, currentNavPropertyList);
+ HashMap<String, Object> navigationMap =
+ jpaResultParser.parse2EdmNavigationValueMap(object, currentNavPropertyList);
edmEntityList.get(count).putAll(navigationMap);
count++;
}
@@ -128,13 +132,15 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
return result;
}
- private EdmNavigationProperty getNextNavigationProperty(final EdmEntityType sourceEntityType, final EdmNavigationProperty navigationProperty) throws EdmException {
+ private EdmNavigationProperty getNextNavigationProperty(final EdmEntityType sourceEntityType,
+ final EdmNavigationProperty navigationProperty) throws EdmException {
int count;
for (ArrayList<NavigationPropertySegment> navPropSegments : expandList) {
count = 0;
for (NavigationPropertySegment navPropSegment : navPropSegments) {
EdmNavigationProperty navProperty = navPropSegment.getNavigationProperty();
- if (navProperty.getFromRole().equalsIgnoreCase(sourceEntityType.getName()) && navProperty.getName().equals(navigationProperty.getName())) {
+ if (navProperty.getFromRole().equalsIgnoreCase(sourceEntityType.getName())
+ && navProperty.getName().equals(navigationProperty.getName())) {
return navPropSegments.get(count + 1).getNavigationProperty();
} else {
count++;
@@ -145,7 +151,9 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
return null;
}
- public static <T> Map<String, ODataCallback> getCallbacks(final URI baseUri, final ExpandSelectTreeNode expandSelectTreeNode, final List<ArrayList<NavigationPropertySegment>> expandList) throws EdmException {
+ public static <T> Map<String, ODataCallback> getCallbacks(final URI baseUri,
+ final ExpandSelectTreeNode expandSelectTreeNode, final List<ArrayList<NavigationPropertySegment>> expandList)
+ throws EdmException {
Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
for (String navigationPropertyName : expandSelectTreeNode.getLinks().keySet()) {
@@ -156,7 +164,8 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
}
- private EntityProviderWriteProperties getInlineEntityProviderProperties(final WriteCallbackContext context) throws EdmException {
+ private EntityProviderWriteProperties getInlineEntityProviderProperties(final WriteCallbackContext context)
+ throws EdmException {
ODataEntityProviderPropertiesBuilder propertiesBuilder = EntityProviderWriteProperties.serviceRoot(baseUri);
propertiesBuilder.callbacks(getCallbacks(baseUri, context.getCurrentExpandSelectTreeNode(), expandList));
propertiesBuilder.expandSelectTree(context.getCurrentExpandSelectTreeNode());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java
index 000d018..8f79c92 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -81,7 +81,8 @@ public class JPAFunctionContext extends JPAMethodContext {
return JPAFunctionContext.this;
}
- private JPAFunction generateJPAFunction() throws EdmException, NoSuchMethodException, SecurityException, ODataJPAModelException, ODataJPARuntimeException {
+ private JPAFunction generateJPAFunction() throws EdmException, NoSuchMethodException, SecurityException,
+ ODataJPAModelException, ODataJPARuntimeException {
Class<?>[] parameterTypes = getParameterTypes();
Method method = getMethod(parameterTypes);
@@ -113,7 +114,8 @@ public class JPAFunctionContext extends JPAMethodContext {
}
- private Object convertArguement(final EdmLiteral edmLiteral, final EdmFacets facets, final Class<?> targetType) throws EdmSimpleTypeException {
+ private Object convertArguement(final EdmLiteral edmLiteral, final EdmFacets facets, final Class<?> targetType)
+ throws EdmSimpleTypeException {
EdmSimpleType edmType = edmLiteral.getType();
Object value = edmType.valueOfString(edmLiteral.getLiteral(), EdmLiteralKind.DEFAULT, facets, targetType);
@@ -146,7 +148,8 @@ public class JPAFunctionContext extends JPAMethodContext {
return null;
}
- private Object generateEnclosingObject() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+ private Object generateEnclosingObject() throws InstantiationException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
Class<?> type = ((JPAEdmMapping) mapping).getJPAType();
Object[] params = null;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPALink.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPALink.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPALink.java
index caefe8c..872a99b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPALink.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPALink.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -59,7 +59,8 @@ public class JPALink {
sourceJPAEntity = jpaEntity;
}
- public void create(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
+ public void create(final PostUriInfo uriInfo, final InputStream content, final String requestContentType,
+ final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
EdmEntitySet targetEntitySet = uriInfo.getTargetEntitySet();
String targerEntitySetName;
@@ -99,14 +100,17 @@ public class JPALink {
getUriInfo = parser.parseLinkURI();
sourceJPAEntity = jpaProcessor.process((GetEntityUriInfo) getUriInfo);
if (sourceJPAEntity == null) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND.addContent(getUriInfo.getTargetEntitySet().getName()), null);
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND
+ .addContent(getUriInfo.getTargetEntitySet().getName()), null);
}
}
JPAEntityParser entityParser = new JPAEntityParser();
- Method setMethod = entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
+ Method setMethod =
+ entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
- Method getMethod = entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
+ Method getMethod =
+ entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
if (getMethod.getReturnType().getTypeParameters() != null) {
@SuppressWarnings("unchecked")
@@ -142,7 +146,8 @@ public class JPALink {
}
- public void update(final PutMergePatchUriInfo putUriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
+ public void update(final PutMergePatchUriInfo putUriInfo, final InputStream content, final String requestContentType,
+ final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
UriInfo uriInfo = (UriInfo) putUriInfo;
EdmEntitySet targetEntitySet = uriInfo.getTargetEntitySet();
@@ -183,16 +188,20 @@ public class JPALink {
getUriInfo = parser.parseLinkURI();
sourceJPAEntity = jpaProcessor.process((GetEntityUriInfo) getUriInfo);
if (sourceJPAEntity == null) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND.addContent(getUriInfo.getTargetEntitySet().getName()), null);
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND
+ .addContent(getUriInfo.getTargetEntitySet().getName()), null);
}
}
JPAEntityParser entityParser = new JPAEntityParser();
- Method setMethod = entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
+ Method setMethod =
+ entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
- Method getMethod = entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
+ Method getMethod =
+ entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
- if (getMethod.getReturnType().getTypeParameters() != null && getMethod.getReturnType().getTypeParameters().length != 0) {
+ if (getMethod.getReturnType().getTypeParameters() != null
+ && getMethod.getReturnType().getTypeParameters().length != 0) {
@SuppressWarnings("unchecked")
List<Object> relatedEntities = (List<Object>) getMethod.invoke(sourceJPAEntity);
relatedEntities.add(targetJPAEntity);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java
index 6f266b9..8501b77 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.data;
@@ -268,6 +268,7 @@ public class JPAProcessorImpl implements JPAProcessor {
}
/* Process Create Entity Request */
+ @Override
public <T> List<T> process(final PostUriInfo createView, final InputStream content,
final String requestedContentType) throws ODataJPAModelException,
ODataJPARuntimeException {
@@ -275,25 +276,28 @@ public class JPAProcessorImpl implements JPAProcessor {
}
@Override
- public <T> List<T> process(PostUriInfo createView, Map<String, Object> content) throws ODataJPAModelException, ODataJPARuntimeException {
+ public <T> List<T> process(final PostUriInfo createView, final Map<String, Object> content)
+ throws ODataJPAModelException, ODataJPARuntimeException {
return processCreate(createView, null, content, null);
}
/* Process Update Entity Request */
@Override
- public <T> Object process(PutMergePatchUriInfo updateView,
+ public <T> Object process(final PutMergePatchUriInfo updateView,
final InputStream content, final String requestContentType)
throws ODataJPAModelException, ODataJPARuntimeException {
return processUpdate(updateView, content, null, requestContentType);
}
@Override
- public <T> Object process(PutMergePatchUriInfo updateView, Map<String, Object> content) throws ODataJPAModelException, ODataJPARuntimeException {
+ public <T> Object process(final PutMergePatchUriInfo updateView, final Map<String, Object> content)
+ throws ODataJPAModelException, ODataJPARuntimeException {
return processUpdate(updateView, null, content, null);
}
@SuppressWarnings("unchecked")
- private <T> List<T> processCreate(final PostUriInfo createView, final InputStream content, final Map<String, Object> properties,
+ private <T> List<T> processCreate(final PostUriInfo createView, final InputStream content,
+ final Map<String, Object> properties,
final String requestedContentType) throws ODataJPAModelException,
ODataJPARuntimeException {
try {
@@ -306,13 +310,13 @@ public class JPAProcessorImpl implements JPAProcessor {
if (content != null) {
final ODataEntityParser oDataEntityParser = new ODataEntityParser(oDataJPAContext);
- final ODataEntry oDataEntry = oDataEntityParser.parseEntry(oDataEntitySet, content, requestedContentType, false);
+ final ODataEntry oDataEntry =
+ oDataEntityParser.parseEntry(oDataEntitySet, content, requestedContentType, false);
virtualJPAEntity.create(oDataEntry);
JPALink link = new JPALink(oDataJPAContext);
link.setSourceJPAEntity(jpaEntity);
link.create(createView, content, requestedContentType, requestedContentType);
- }
- else if (properties != null) {
+ } else if (properties != null) {
virtualJPAEntity.create(properties);
} else {
return null;
@@ -338,7 +342,7 @@ public class JPAProcessorImpl implements JPAProcessor {
}
public <T> Object processUpdate(PutMergePatchUriInfo updateView,
- final InputStream content, Map<String, Object> properties, final String requestContentType)
+ final InputStream content, final Map<String, Object> properties, final String requestContentType)
throws ODataJPAModelException, ODataJPARuntimeException {
JPQLContextType contextType = null;
Object jpaEntity = null;
@@ -356,9 +360,10 @@ public class JPAProcessorImpl implements JPAProcessor {
jpaEntity = readEntity(updateView, contextType);
- if (jpaEntity == null)
+ if (jpaEntity == null) {
throw ODataJPARuntimeException
.throwException(ODataJPARuntimeException.RESOURCE_NOT_FOUND, null);
+ }
final EdmEntitySet oDataEntitySet = updateView.getTargetEntitySet();
final EdmEntityType oDataEntityType = oDataEntitySet.getEntityType();
@@ -369,11 +374,11 @@ public class JPAProcessorImpl implements JPAProcessor {
final ODataEntityParser oDataEntityParser = new ODataEntityParser(oDataJPAContext);
final ODataEntry oDataEntry = oDataEntityParser.parseEntry(oDataEntitySet, content, requestContentType, false);
virtualJPAEntity.update(oDataEntry);
- }
- else if (properties != null)
+ } else if (properties != null) {
virtualJPAEntity.update(properties);
- else
+ } else {
return null;
+ }
em.flush();
em.getTransaction().commit();
} catch (Exception e) {
@@ -451,7 +456,8 @@ public class JPAProcessorImpl implements JPAProcessor {
Object selectedObject = null;
- if (uriParserResultView instanceof DeleteUriInfo || uriParserResultView instanceof GetEntityUriInfo || uriParserResultView instanceof PutMergePatchUriInfo) {
+ if (uriParserResultView instanceof DeleteUriInfo || uriParserResultView instanceof GetEntityUriInfo
+ || uriParserResultView instanceof PutMergePatchUriInfo) {
JPQLContext selectJPQLContext = JPQLContext.createBuilder(
contextType, uriParserResultView).build();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java
index ae9dcf0..f3c3e88 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.model;
@@ -31,7 +31,8 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
public class EdmTypeConvertor {
- public static Class<?> convertToJavaType(final EdmType edmType) throws ODataJPAModelException, ODataJPARuntimeException {
+ public static Class<?> convertToJavaType(final EdmType edmType) throws ODataJPAModelException,
+ ODataJPARuntimeException {
if (edmType instanceof EdmSimpleType) {
EdmSimpleType edmSimpleType = (EdmSimpleType) edmType;
if (edmSimpleType == EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()) {
@@ -62,6 +63,7 @@ public class EdmTypeConvertor {
return UUID.class;
}
}
- throw ODataJPAModelException.throwException(ODataJPAModelException.TYPE_NOT_SUPPORTED.addContent(edmType.toString()), null);
+ throw ODataJPAModelException.throwException(ODataJPAModelException.TYPE_NOT_SUPPORTED
+ .addContent(edmType.toString()), null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java
index 8d4d69e..8150631 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.model;
@@ -172,7 +172,8 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
}
private JPAEntityTypeMapType searchJPAEntityTypeMapType(final String jpaEntityTypeName) {
- for (JPAEntityTypeMapType jpaEntityType : mappingModel.getPersistenceUnit().getJPAEntityTypes().getJPAEntityType()) {
+ for (JPAEntityTypeMapType jpaEntityType : mappingModel.getPersistenceUnit().getJPAEntityTypes()
+ .getJPAEntityType()) {
if (jpaEntityType.getName().equals(jpaEntityTypeName)) {
return jpaEntityType;
}
@@ -182,7 +183,8 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
}
private JPAEmbeddableTypeMapType searchJPAEmbeddableTypeMapType(final String jpaEmbeddableTypeName) {
- for (JPAEmbeddableTypeMapType jpaEmbeddableType : mappingModel.getPersistenceUnit().getJPAEmbeddableTypes().getJPAEmbeddableType()) {
+ for (JPAEmbeddableTypeMapType jpaEmbeddableType : mappingModel.getPersistenceUnit().getJPAEmbeddableTypes()
+ .getJPAEmbeddableType()) {
if (jpaEmbeddableType.getName().equals(jpaEmbeddableTypeName)) {
return jpaEmbeddableType;
}
@@ -230,7 +232,8 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
}
@Override
- public boolean checkExclusionOfJPAEmbeddableAttributeType(final String jpaEmbeddableTypeName, final String jpaAttributeName) {
+ public boolean checkExclusionOfJPAEmbeddableAttributeType(final String jpaEmbeddableTypeName,
+ final String jpaAttributeName) {
JPAEmbeddableTypeMapType type = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
if (type != null && type.getJPAAttributes() != null) {
for (JPAAttribute jpaAttribute : type.getJPAAttributes().getJPAAttribute()) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java
index da9bff6..22bdc82 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.model;
@@ -89,7 +89,7 @@ public class JPAEdmNameBuilder {
if (edmEntityTypeName == null) {
edmEntityTypeName = jpaEntityName;
}
- //Setting the mapping object
+ // Setting the mapping object
edmEntityType.setMapping(((Mapping) mapping).setInternalName(jpaEntityName));
edmEntityType.setName(edmEntityTypeName);
@@ -130,9 +130,13 @@ public class JPAEdmNameBuilder {
JPAEdmMappingModelAccess mappingModelAccess = view.getJPAEdmMappingModelAccess();
if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
if (isComplexMode) {
- propertyName = mappingModelAccess.mapJPAEmbeddableTypeAttribute(view.getJPAEdmComplexTypeView().getJPAEmbeddableType().getJavaType().getSimpleName(), jpaAttributeName);
+ propertyName =
+ mappingModelAccess.mapJPAEmbeddableTypeAttribute(view.getJPAEdmComplexTypeView().getJPAEmbeddableType()
+ .getJavaType().getSimpleName(), jpaAttributeName);
} else {
- propertyName = mappingModelAccess.mapJPAAttribute(view.getJPAEdmEntityTypeView().getJPAEntityType().getName(), jpaAttributeName);
+ propertyName =
+ mappingModelAccess.mapJPAAttribute(view.getJPAEdmEntityTypeView().getJPAEntityType().getName(),
+ jpaAttributeName);
}
}
if (propertyName == null) {
@@ -312,7 +316,8 @@ public class JPAEdmNameBuilder {
* EDM Association End Name - RULES
* ************************************************************************
*/
- public static void build(final JPAEdmAssociationEndView assocaitionEndView, final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
+ public static void build(final JPAEdmAssociationEndView assocaitionEndView,
+ final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
String namespace = buildNamespace(assocaitionEndView);
@@ -323,12 +328,13 @@ public class JPAEdmNameBuilder {
name = null;
String jpaEntityTypeName = null;
Attribute<?, ?> jpaAttribute = propertyView.getJPAAttribute();
- if (jpaAttribute.isCollection())
+ if (jpaAttribute.isCollection()) {
jpaEntityTypeName = ((PluralAttribute<?, ?, ?>) jpaAttribute).getElementType().getJavaType()
.getSimpleName();
- else
+ } else {
jpaEntityTypeName = propertyView.getJPAAttribute().getJavaType()
.getSimpleName();
+ }
JPAEdmMappingModelAccess mappingModelAccess = assocaitionEndView.getJPAEdmMappingModelAccess();
@@ -431,10 +437,11 @@ public class JPAEdmNameBuilder {
.getJPAEdmMappingModelAccess();
String targetEntityTypeName = null;
- if (jpaAttribute.isCollection())
+ if (jpaAttribute.isCollection()) {
targetEntityTypeName = ((PluralAttribute<?, ?, ?>) jpaAttribute).getElementType().getJavaType().getSimpleName();
- else
+ } else {
targetEntityTypeName = jpaAttribute.getJavaType().getSimpleName();
+ }
if (mappingModelAccess != null
&& mappingModelAccess.isMappingModelExists()) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
index 6bb69b5..c24d587 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.access.model;
@@ -33,8 +33,8 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelExcepti
/**
* This class holds utility methods for Type conversions between JPA and OData Types.
*
- *
- *
+ *
+ *
*/
public class JPATypeConvertor {
@@ -44,15 +44,18 @@ public class JPATypeConvertor {
* Types.
*
* @param jpaType
- * The JPA Type input.
+ * The JPA Type input.
* @return The corresponding EdmSimpleTypeKind.
* @throws ODataJPAModelException
- * @throws ODataJPARuntimeException
+ * @throws org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException
*
* @see EdmSimpleTypeKind
*/
- public static EdmSimpleTypeKind convertToEdmSimpleType(final Class<?> jpaType, final Attribute<?, ?> currentAttribute) throws ODataJPAModelException {
- if (jpaType.equals(String.class) || jpaType.equals(Character.class) || jpaType.equals(char.class) || jpaType.equals(char[].class) ||
+ public static EdmSimpleTypeKind
+ convertToEdmSimpleType(final Class<?> jpaType, final Attribute<?, ?> currentAttribute)
+ throws ODataJPAModelException {
+ if (jpaType.equals(String.class) || jpaType.equals(Character.class) || jpaType.equals(char.class)
+ || jpaType.equals(char[].class) ||
jpaType.equals(Character[].class)) {
return EdmSimpleTypeKind.String;
} else if (jpaType.equals(Long.class) || jpaType.equals(long.class)) {
@@ -77,7 +80,9 @@ public class JPATypeConvertor {
return EdmSimpleTypeKind.Boolean;
} else if ((jpaType.equals(Date.class)) || (jpaType.equals(Calendar.class))) {
try {
- if ((currentAttribute != null) && (currentAttribute.getDeclaringType().getJavaType().getDeclaredField(currentAttribute.getName()).getAnnotation(Temporal.class).value() == TemporalType.TIME)) {
+ if ((currentAttribute != null)
+ && (currentAttribute.getDeclaringType().getJavaType().getDeclaredField(currentAttribute.getName())
+ .getAnnotation(Temporal.class).value() == TemporalType.TIME)) {
return EdmSimpleTypeKind.Time;
} else {
return EdmSimpleTypeKind.DateTime;
@@ -90,6 +95,7 @@ public class JPATypeConvertor {
} else if (jpaType.equals(UUID.class)) {
return EdmSimpleTypeKind.Guid;
}
- throw ODataJPAModelException.throwException(ODataJPAModelException.TYPE_NOT_SUPPORTED.addContent(jpaType.toString()), null);
+ throw ODataJPAModelException.throwException(ODataJPAModelException.TYPE_NOT_SUPPORTED
+ .addContent(jpaType.toString()), null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java
index ecce1ad..e0014e5 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.edm;
@@ -220,7 +220,8 @@ public class ODataJPAEdmProvider extends EdmProvider {
}
@Override
- public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
+ public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
+ final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
EntityContainer container = null;
if (!entityContainerInfos.containsKey(entityContainer)) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java
index 72118da..d7f3964 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.exception;
@@ -36,7 +36,8 @@ import org.apache.olingo.odata2.processor.core.jpa.ODataJPAContextImpl;
public class ODataJPAMessageServiceDefault implements ODataJPAMessageService {
private static final String BUNDLE_NAME = "jpaprocessor_msg"; //$NON-NLS-1$
- private static final Map<Locale, ODataJPAMessageService> LOCALE_2_MESSAGE_SERVICE = new HashMap<Locale, ODataJPAMessageService>();
+ private static final Map<Locale, ODataJPAMessageService> LOCALE_2_MESSAGE_SERVICE =
+ new HashMap<Locale, ODataJPAMessageService>();
private static final ResourceBundle defaultResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
private final ResourceBundle resourceBundle;
private final Locale lanLocale;
@@ -70,7 +71,8 @@ public class ODataJPAMessageServiceDefault implements ODataJPAMessageService {
} catch (MissingResourceException e) {
return "Missing message for key '" + key + "'!";
} catch (MissingFormatArgumentException e) {
- return "Missing replacement for place holder in value '" + value + "' for following arguments '" + Arrays.toString(contentAsArray) + "'!";
+ return "Missing replacement for place holder in value '" + value + "' for following arguments '"
+ + Arrays.toString(contentAsArray) + "'!";
}
}
@@ -82,7 +84,8 @@ public class ODataJPAMessageServiceDefault implements ODataJPAMessageService {
public static ODataJPAMessageService getInstance(final Locale locale) {
Locale acceptedLocale = Locale.ENGLISH;
- if ((ODataJPAContextImpl.getContextInThreadLocal() != null) && (ODataJPAContextImpl.getContextInThreadLocal().getAcceptableLanguages() != null)) {
+ if ((ODataJPAContextImpl.getContextInThreadLocal() != null)
+ && (ODataJPAContextImpl.getContextInThreadLocal().getAcceptableLanguages() != null)) {
List<Locale> acceptedLanguages = ODataJPAContextImpl.getContextInThreadLocal().getAcceptableLanguages();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java
index 2f6da6e..2b14f9d 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.factory;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java
index c84687f..6026464 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -100,7 +100,8 @@ public class JPQLJoinSelectContext extends JPQLSelectContext implements JPQLJoin
entityTypeName = entityType.getName();
}
- jpaOuterJoinClause = new JPAJoinClause(entityTypeName, entityAlias, null, null, joinCondition, JPAJoinClause.JOIN.INNER);
+ jpaOuterJoinClause =
+ new JPAJoinClause(entityTypeName, entityAlias, null, null, joinCondition, JPAJoinClause.JOIN.INNER);
jpaOuterJoinClauses.add(jpaOuterJoinClause);
@@ -110,9 +111,12 @@ public class JPQLJoinSelectContext extends JPQLSelectContext implements JPQLJoin
String relationShipAlias = generateRelationShipAlias();
- joinCondition = ODataExpressionParser.parseKeyPredicates(navigationSegment.getKeyPredicates(), relationShipAlias);
+ joinCondition =
+ ODataExpressionParser.parseKeyPredicates(navigationSegment.getKeyPredicates(), relationShipAlias);
- jpaOuterJoinClause = new JPAJoinClause(getFromEntityName(navigationProperty), entityAlias, getRelationShipName(navigationProperty), relationShipAlias, joinCondition, JPAJoinClause.JOIN.INNER);
+ jpaOuterJoinClause =
+ new JPAJoinClause(getFromEntityName(navigationProperty), entityAlias,
+ getRelationShipName(navigationProperty), relationShipAlias, joinCondition, JPAJoinClause.JOIN.INNER);
jpaOuterJoinClauses.add(jpaOuterJoinClause);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java
index bb385ca..c25eae9 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -87,7 +87,8 @@ public class JPQLJoinSelectSingleContext extends JPQLSelectSingleContext impleme
entityTypeName = entityType.getName();
}
- jpaOuterJoinClause = new JPAJoinClause(entityTypeName, entityAlias, null, null, joinCondition, JPAJoinClause.JOIN.INNER);
+ jpaOuterJoinClause =
+ new JPAJoinClause(entityTypeName, entityAlias, null, null, joinCondition, JPAJoinClause.JOIN.INNER);
jpaOuterJoinClauses.add(jpaOuterJoinClause);
@@ -97,9 +98,12 @@ public class JPQLJoinSelectSingleContext extends JPQLSelectSingleContext impleme
String relationShipAlias = generateRelationShipAlias();
- joinCondition = ODataExpressionParser.parseKeyPredicates(navigationSegment.getKeyPredicates(), relationShipAlias);
+ joinCondition =
+ ODataExpressionParser.parseKeyPredicates(navigationSegment.getKeyPredicates(), relationShipAlias);
- jpaOuterJoinClause = new JPAJoinClause(getFromEntityName(navigationProperty), entityAlias, getRelationShipName(navigationProperty), relationShipAlias, joinCondition, JPAJoinClause.JOIN.INNER);
+ jpaOuterJoinClause =
+ new JPAJoinClause(getFromEntityName(navigationProperty), entityAlias,
+ getRelationShipName(navigationProperty), relationShipAlias, joinCondition, JPAJoinClause.JOIN.INNER);
jpaOuterJoinClauses.add(jpaOuterJoinClause);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java
index 41282de..fd06892 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -82,7 +82,8 @@ public class JPQLJoinSelectSingleStatementBuilder extends JPQLStatementBuilder {
joinCondition = joinClause.getJoinCondition();
if (joinCondition != null) {
- joinWhereCondition.append(JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND + JPQLStatement.DELIMITER.SPACE);
+ joinWhereCondition.append(JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND
+ + JPQLStatement.DELIMITER.SPACE);
joinWhereCondition.append(joinCondition);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java
index afd09bf..57d0e28 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -52,12 +52,12 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
StringBuilder joinWhereCondition = null;
jpqlQuery.append(JPQLStatement.KEYWORD.SELECT).append(JPQLStatement.DELIMITER.SPACE);
- if (context.getType().equals(JPQLContextType.JOIN_COUNT)) {//$COUNT
+ if (context.getType().equals(JPQLContextType.JOIN_COUNT)) {// $COUNT
jpqlQuery.append(JPQLStatement.KEYWORD.COUNT).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(JPQLStatement.DELIMITER.PARENTHESIS_LEFT).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(context.getSelectExpression()).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(JPQLStatement.DELIMITER.PARENTHESIS_RIGHT).append(JPQLStatement.DELIMITER.SPACE);
- } else { //Normal
+ } else { // Normal
jpqlQuery.append(context.getSelectExpression()).append(JPQLStatement.DELIMITER.SPACE);
}
@@ -93,7 +93,8 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
joinCondition = joinClause.getJoinCondition();
if (joinCondition != null) {
- joinWhereCondition.append(JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND + JPQLStatement.DELIMITER.SPACE);
+ joinWhereCondition.append(JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND
+ + JPQLStatement.DELIMITER.SPACE);
joinWhereCondition.append(joinCondition);
}
@@ -103,7 +104,8 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
}
String whereExpression = context.getWhereExpression();
if (whereExpression != null || joinWhereCondition.length() > 0) {
- jpqlQuery.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.KEYWORD.WHERE).append(JPQLStatement.DELIMITER.SPACE);
+ jpqlQuery.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.KEYWORD.WHERE).append(
+ JPQLStatement.DELIMITER.SPACE);
if (whereExpression != null) {
jpqlQuery.append(whereExpression);
if (joinWhereCondition != null) {
@@ -125,14 +127,16 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
while (orderItr.hasNext()) {
if (i != 0) {
- orderByBuilder.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.DELIMITER.COMMA).append(JPQLStatement.DELIMITER.SPACE);
+ orderByBuilder.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.DELIMITER.COMMA).append(
+ JPQLStatement.DELIMITER.SPACE);
}
Entry<String, String> entry = orderItr.next();
orderByBuilder.append(entry.getKey()).append(JPQLStatement.DELIMITER.SPACE);
orderByBuilder.append(entry.getValue());
i++;
}
- jpqlQuery.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.KEYWORD.ORDERBY).append(JPQLStatement.DELIMITER.SPACE);
+ jpqlQuery.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.KEYWORD.ORDERBY).append(
+ JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(orderByBuilder);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java
index a04804f..ef588aa 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -38,7 +38,7 @@ public class JPQLSelectContext extends JPQLContext implements JPQLSelectContextV
protected HashMap<String, String> orderByCollection;
protected String whereCondition;
- protected boolean isCountOnly = false;//Support for $count
+ protected boolean isCountOnly = false;// Support for $count
public JPQLSelectContext(final boolean isCountOnly) {
this.isCountOnly = isCountOnly;
@@ -71,7 +71,8 @@ public class JPQLSelectContext extends JPQLContext implements JPQLSelectContextV
return whereCondition;
}
- public class JPQLSelectContextBuilder extends org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder {
+ public class JPQLSelectContextBuilder extends
+ org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder {
protected GetEntitySetUriInfo entitySetView;
@@ -119,7 +120,7 @@ public class JPQLSelectContext extends JPQLContext implements JPQLSelectContextV
}
/*
- * Generate Select Clause
+ * Generate Select Clause
*/
protected String generateSelectExpression() throws EdmException {
return getJPAEntityAlias();
@@ -136,7 +137,8 @@ public class JPQLSelectContext extends JPQLContext implements JPQLSelectContextV
} else if (entitySetView.getTop() != null || entitySetView.getSkip() != null) {
- return ODataExpressionParser.parseKeyPropertiesToJPAOrderByExpression(entitySetView.getTargetEntitySet().getEntityType().getKeyProperties(), getJPAEntityAlias());
+ return ODataExpressionParser.parseKeyPropertiesToJPAOrderByExpression(entitySetView.getTargetEntitySet()
+ .getEntityType().getKeyProperties(), getJPAEntityAlias());
} else {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java
index b8e8323..9d2884d 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -54,7 +54,8 @@ public class JPQLSelectSingleContext extends JPQLContext implements JPQLSelectSi
return selectExpression;
}
- public class JPQLSelectSingleContextBuilder extends org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder {
+ public class JPQLSelectSingleContextBuilder extends
+ org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder {
protected GetEntityUriInfo entityView;
@@ -99,7 +100,7 @@ public class JPQLSelectSingleContext extends JPQLContext implements JPQLSelectSi
}
/*
- * Generate Select Clause
+ * Generate Select Clause
*/
protected String generateSelectExpression() throws EdmException {
return getJPAEntityAlias();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java
index 651024b..06e2444 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -55,7 +55,8 @@ public class JPQLSelectSingleStatementBuilder extends JPQLStatementBuilder {
if (context.getKeyPredicates() != null && context.getKeyPredicates().size() > 0) {
jpqlQuery.append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(JPQLStatement.KEYWORD.WHERE).append(JPQLStatement.DELIMITER.SPACE);
- jpqlQuery.append(ODataExpressionParser.parseKeyPredicates(context.getKeyPredicates(), context.getJPAEntityAlias()));
+ jpqlQuery.append(ODataExpressionParser
+ .parseKeyPredicates(context.getKeyPredicates(), context.getJPAEntityAlias()));
}
return jpqlQuery.toString();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java
index 34d4a58..22059f1 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.jpql;
@@ -51,12 +51,12 @@ public class JPQLSelectStatementBuilder extends JPQLStatementBuilder {
String fromClause = context.getJPAEntityName() + JPQLStatement.DELIMITER.SPACE + tableAlias;
jpqlQuery.append(JPQLStatement.KEYWORD.SELECT).append(JPQLStatement.DELIMITER.SPACE);
- if (context.getType().equals(JPQLContextType.SELECT_COUNT)) { //$COUNT
+ if (context.getType().equals(JPQLContextType.SELECT_COUNT)) { // $COUNT
jpqlQuery.append(JPQLStatement.KEYWORD.COUNT).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(JPQLStatement.DELIMITER.PARENTHESIS_LEFT).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(context.getSelectExpression()).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(JPQLStatement.DELIMITER.PARENTHESIS_RIGHT).append(JPQLStatement.DELIMITER.SPACE);
- } else {//Normal
+ } else {// Normal
jpqlQuery.append(context.getSelectExpression()).append(JPQLStatement.DELIMITER.SPACE);
}
@@ -78,7 +78,8 @@ public class JPQLSelectStatementBuilder extends JPQLStatementBuilder {
while (orderItr.hasNext()) {
if (i != 0) {
- orderByBuilder.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.DELIMITER.COMMA).append(JPQLStatement.DELIMITER.SPACE);
+ orderByBuilder.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.DELIMITER.COMMA).append(
+ JPQLStatement.DELIMITER.SPACE);
}
Entry<String, String> entry = orderItr.next();
orderByBuilder.append(entry.getKey()).append(JPQLStatement.DELIMITER.SPACE);
[48/59] [abbrv] cleanup of jpa api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
index 1f8370f..5687475 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -31,8 +31,8 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAcces
* The implementation of the view acts as a base container for containers of
* Java Persistence Model and Entity Data Model elements.
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
*
*/
@@ -46,8 +46,7 @@ public interface JPAEdmBaseView {
/**
* The method returns the Java Persistence MetaModel
*
- * @return a meta model of type
- * {@link javax.persistence.metamodel.Metamodel}
+ * @return a meta model of type {@link javax.persistence.metamodel.Metamodel}
*/
public Metamodel getJPAMetaModel();
@@ -55,8 +54,7 @@ public interface JPAEdmBaseView {
* The method returns a builder for building Entity Data Model elements from
* Java Persistence Model Elements
*
- * @return a builder of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}
+ * @return a builder of type {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}
*/
public JPAEdmBuilder getBuilder();
@@ -64,8 +62,8 @@ public interface JPAEdmBaseView {
* The method returns the if the container is consistent without any errors
*
* @return <ul>
- * <li>true - if the container is consistent without errors</li>
- * <li>false - if the container is inconsistent with errors</li>
+ * <li>true - if the container is consistent without errors</li>
+ * <li>false - if the container is inconsistent with errors</li>
*
*/
public boolean isConsistent();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
index cd7f250..172e5f4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -32,15 +32,14 @@ import org.apache.olingo.odata2.api.edm.provider.ComplexProperty;
* container for the properties of EDM complex type.
* </p>
*
- * @org.apache.olingo.odata2.DoNotImplement
+ * @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView
*/
public interface JPAEdmComplexPropertyView extends JPAEdmBaseView {
/**
* The method returns a complex property for a complex type.
*
- * @return an instance of
- * {@link org.apache.olingo.odata2.api.edm.provider.ComplexProperty}
+ * @return an instance of {@link org.apache.olingo.odata2.api.edm.provider.ComplexProperty}
*/
ComplexProperty getEdmComplexProperty();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
index 2b40ba0..bbee5e4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -39,8 +39,8 @@ import org.apache.olingo.odata2.api.edm.provider.Property;
* complex types. An EDM complex type is said to be consistent only if it used
* in at least one of the EDM entity type.
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView
*
@@ -50,8 +50,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
/**
* The method returns an EDM complex type that is currently being processed.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.ComplexType}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.ComplexType}
*/
public ComplexType getEdmComplexType();
@@ -59,8 +58,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
* The method returns an JPA embeddable type that is currently being
* processed.
*
- * @return an instance of type
- * {@link javax.persistence.metamodel.EmbeddableType}
+ * @return an instance of type {@link javax.persistence.metamodel.EmbeddableType}
*/
public javax.persistence.metamodel.EmbeddableType<?> getJPAEmbeddableType();
@@ -76,7 +74,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
* the given JPA embeddable type name.
*
* @param embeddableTypeName
- * is the name of JPA embeddable type
+ * is the name of JPA embeddable type
* @return a reference to EDM complex type if found else null
*/
public ComplexType searchEdmComplexType(String embeddableTypeName);
@@ -85,8 +83,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
* The method add a JPA EDM complex type view to the container.
*
* @param view
- * is an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
+ * is an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
*/
public void addJPAEdmCompleTypeView(JPAEdmComplexTypeView view);
@@ -95,7 +92,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
* the given EDM complex type's fully qualified name.
*
* @param type
- * is the fully qualified name of EDM complex type
+ * is the fully qualified name of EDM complex type
* @return a reference to EDM complex type if found else null
*/
public ComplexType searchEdmComplexType(FullQualifiedName type);
@@ -105,14 +102,15 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
* properties.
*
* @param complexType
- * is the EDM complex type to expand
+ * is the EDM complex type to expand
* @param expandedPropertyList
- * is the list to be populated with expanded EDM simple
- * properties
+ * is the list to be populated with expanded EDM simple
+ * properties
* @param embeddablePropertyName
- * is the name of the complex property. The name is used as the
- * qualifier for the expanded simple property names.
+ * is the name of the complex property. The name is used as the
+ * qualifier for the expanded simple property names.
*/
- public void expandEdmComplexType(ComplexType complexType, List<Property> expandedPropertyList, String embeddablePropertyName);
+ public void expandEdmComplexType(ComplexType complexType, List<Property> expandedPropertyList,
+ String embeddablePropertyName);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
index 20af73a..82ccaf9 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.edm.provider.EntityContainer;
* container is said to be consistent only if the JPA EDM association set and
* JPA EDM Entity Set view are consistent.
*
- *
+ *
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView
@@ -43,8 +43,7 @@ public interface JPAEdmEntityContainerView extends JPAEdmBaseView {
* The method returns the EDM entity container that is currently being
* processed.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.EntityContainer}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntityContainer}
*/
public EntityContainer getEdmEntityContainer();
@@ -59,8 +58,7 @@ public interface JPAEdmEntityContainerView extends JPAEdmBaseView {
* The method returns the JPA EDM entity set view that is currently being
* processed.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}
*/
public JPAEdmEntitySetView getJPAEdmEntitySetView();
@@ -68,8 +66,7 @@ public interface JPAEdmEntityContainerView extends JPAEdmBaseView {
* The method returns the JPA EDM association set view that is currently
* being processed.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView}
*/
public JPAEdmAssociationSetView getEdmAssociationSetView();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
index 8068be9..87019f6 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -31,8 +31,8 @@ import org.apache.olingo.odata2.api.edm.provider.EntitySet;
* of EDM entity sets. An EDM entity set is said to be consistent only if it has
* consistent EDM entity types.
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView
*
@@ -41,8 +41,7 @@ public interface JPAEdmEntitySetView extends JPAEdmBaseView {
/**
* The method returns an EDM entity set that is currently being processed.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.EntitySet}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntitySet}
*/
public EntitySet getEdmEntitySet();
@@ -58,8 +57,7 @@ public interface JPAEdmEntitySetView extends JPAEdmBaseView {
* processed. JPA EDM entity set view is built from JPA EDM entity type
* view.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
*/
public JPAEdmEntityTypeView getJPAEdmEntityTypeView();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
index d8293d3..54965d8 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -31,8 +31,8 @@ import org.apache.olingo.odata2.api.edm.provider.EntityType;
* entity types. An EDM entity type is said to be consistent only if it has at
* least one consistent EDM property and at least one consistent EDM key.
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView
@@ -43,8 +43,7 @@ public interface JPAEdmEntityTypeView extends JPAEdmBaseView {
/**
* The method returns an EDM entity currently being processed.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
*/
public EntityType getEdmEntityType();
@@ -52,8 +51,7 @@ public interface JPAEdmEntityTypeView extends JPAEdmBaseView {
* The method returns java persistence Entity type currently being
* processed.
*
- * @return an instance of type
- * {@link javax.persistence.metamodel.EntityType}
+ * @return an instance of type {@link javax.persistence.metamodel.EntityType}
*/
public javax.persistence.metamodel.EntityType<?> getJPAEntityType();
@@ -70,7 +68,7 @@ public interface JPAEdmEntityTypeView extends JPAEdmBaseView {
* given EDM entity type's name.
*
* @param jpaEntityTypeName
- * is the name of EDM entity type
+ * is the name of EDM entity type
* @return a reference to EDM entity type if found else null
*/
public EntityType searchEdmEntityType(String jpaEntityTypeName);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
index 77d90a1..1345106 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
@@ -1,27 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
/**
* The interface provides methods to extend JPA EDM containers.
*
- *
+ *
*
*/
public interface JPAEdmExtension {
@@ -31,18 +31,18 @@ public interface JPAEdmExtension {
* register custom operations.
*
* @param view
- * is the schema view
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView#registerOperations(Class,
- * String[])
+ * is the schema view
+ * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView#registerOperations(Class, String[])
*
*/
public void extendWithOperation(JPAEdmSchemaView view);
/**
- * The method is used to extend the JPA EDM schema view with Entities, Entity Sets, Navigation Property and Association.
+ * The method is used to extend the JPA EDM schema view with Entities, Entity Sets, Navigation Property and
+ * Association.
*
* @param view
- * is the schema view
+ * is the schema view
*
*/
public void extendJPAEdmSchema(JPAEdmSchemaView view);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
index 0eb1c14..be19742 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -33,8 +33,8 @@ import org.apache.olingo.odata2.api.edm.provider.FunctionImport;
* function imports that are consistent.
* </p>
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
*
*/
@@ -45,8 +45,7 @@ public interface JPAEdmFunctionImportView extends JPAEdmBaseView {
* import is said to be consistent only if it adheres to the rules defined
* in CSDL.
*
- * @return a list of type
- * {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport}
+ * @return a list of type {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport}
*/
List<FunctionImport> getConsistentFunctionImportList();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
index 205eecd..a684126 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -34,8 +34,8 @@ import org.apache.olingo.odata2.api.edm.provider.Key;
* given JPA EDM entity type. The view acts as a container for consistent EDM
* key property of an EDM entity type.
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView
*
@@ -45,8 +45,7 @@ public interface JPAEdmKeyView extends JPAEdmBaseView {
* The method returns an instance of EDM key for the given JPA EDM Entity
* type.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.Key}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.Key}
*/
public Key getEdmKey();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
index 04bb102..4c44083 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.processor.api.jpa.model;
* JPA EDM mapping instance can be associated with any EDM simple, EDM complex
* property to denote the properties Java persistence column name.
*
- *
+ *
*
*/
public interface JPAEdmMapping {
@@ -32,7 +32,7 @@ public interface JPAEdmMapping {
* container.
*
* @param name
- * is the Java persistence column name
+ * is the Java persistence column name
*/
public void setJPAColumnName(String name);
@@ -41,7 +41,7 @@ public interface JPAEdmMapping {
* container.
*
* @return a String representing the Java persistence column name set into
- * the container
+ * the container
*/
public String getJPAColumnName();
@@ -49,7 +49,7 @@ public interface JPAEdmMapping {
* The method sets the Java persistence entity/property type.
*
* @param type
- * is an instance of type Class<?>
+ * is an instance of type Class<?>
*/
public void setJPAType(Class<?> type);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
index 61040ed..4c9a777 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -26,10 +26,9 @@ package org.apache.olingo.odata2.processor.api.jpa.model;
* EDM meta model. The instance of JPA EDM meta model can be created using
* {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory}. The
* instance thus obtained can be used for constructing other elements of the
- * meta model using
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}.
+ * meta model using {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}.
+ *
*
- *
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory
*/
@@ -38,8 +37,7 @@ public interface JPAEdmModelView extends JPAEdmBaseView {
* The method returns a consistent JPA EDM schema view created from the JPA
* meta model.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView}
*/
public JPAEdmSchemaView getEdmSchemaView();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
index fd7731f..e1b0d3d 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.api.edm.provider.NavigationProperty;
* list of EDM navigation properties of an EDM entity type. EDM navigation
* property is consistent only if there exists a consistent EDM association.
*
- *
+ *
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
*
@@ -48,8 +48,7 @@ public interface JPAEdmNavigationPropertyView extends JPAEdmBaseView {
* The method adds a navigation property view to its container.
*
* @param view
- * is an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
+ * is an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
*/
void addJPAEdmNavigationPropertyView(JPAEdmNavigationPropertyView view);
@@ -66,8 +65,7 @@ public interface JPAEdmNavigationPropertyView extends JPAEdmBaseView {
* The method returns the navigation property that is currently being
* processed.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.NavigationProperty}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.NavigationProperty}
*/
NavigationProperty getEdmNavigationProperty();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
index 17c8bdc..742d5c8 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -42,8 +42,8 @@ import org.apache.olingo.odata2.api.edm.provider.SimpleProperty;
* exists at least one property in the entity type and there is at least one key
* property.
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView
@@ -53,16 +53,14 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
/**
* The method returns a simple EDM property.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.SimpleProperty}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.SimpleProperty}
*/
SimpleProperty getEdmSimpleProperty();
/**
* The method returns a JPA EDM key view.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView}
*/
JPAEdmKeyView getJPAEdmKeyView();
@@ -77,15 +75,14 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
* The method returns a JPA Attribute for the given JPA entity type.
*
* @return an instance of type {@link javax.persistence.metamodel.Attribute
- * <?, ?>}
+ * <?, ?>}
*/
Attribute<?, ?> getJPAAttribute();
/**
* The method returns a JPA EDM navigation property view.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
*/
JPAEdmNavigationPropertyView getJPAEdmNavigationPropertyView();
@@ -93,8 +90,7 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
* The method returns a JPA EDM Entity Type view that holds the property
* view.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
*/
JPAEdmEntityTypeView getJPAEdmEntityTypeView();
@@ -102,8 +98,7 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
* The method returns a JPA EDM Complex Type view that holds the property
* view.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
*/
JPAEdmComplexTypeView getJPAEdmComplexTypeView();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
index ee8a3be..ebf945c 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -36,8 +36,8 @@ import org.apache.olingo.odata2.api.edm.provider.ReferentialConstraintRole;
* can be created from JPA Entity relationships.
* </p>
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView
*
@@ -53,8 +53,7 @@ public interface JPAEdmReferentialConstraintRoleView extends JPAEdmBaseView {
/**
* The method returns the role type (PRINCIPAL or DEPENDENT)
*
- * @return a
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView.RoleType}
+ * @return a {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView.RoleType}
*/
RoleType getRoleType();
@@ -62,8 +61,7 @@ public interface JPAEdmReferentialConstraintRoleView extends JPAEdmBaseView {
* The method returns the Referential constraint role that is currently
* being processed.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.ReferentialConstraintRole}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.ReferentialConstraintRole}
*/
ReferentialConstraintRole getEdmReferentialConstraintRole();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
index f6215e8..4b90edb 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.edm.provider.ReferentialConstraint;
* to be consistent only if referential constraint role is consistent.
* </p>
*
- * <br>
+ * <br>
* @org.apache.olingo.odata2.DoNotImplement
* <br>
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView
@@ -45,8 +45,7 @@ public interface JPAEdmReferentialConstraintView extends JPAEdmBaseView {
* The method returns EDM referential constraint created from Java
* persistence Entity Join Columns.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.ReferentialConstraint}
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.ReferentialConstraint}
*/
public ReferentialConstraint getEdmReferentialConstraint();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
index cfe19e8..d52d9a3 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model;
@@ -34,14 +34,13 @@ import org.apache.olingo.odata2.api.edm.provider.Schema;
* schema is consistent only if following elements are consistent
* <ol>
* <li>{@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}</li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}</li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}</li>
* <li>{@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}</li>
* </ol>
* </p>
*
- *
- * <p>
+ *
+ * <p>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
* @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView
@@ -52,8 +51,7 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
/**
* The method returns the EDM schema present in the container.
*
- * @return an instance EDM schema of type
- * {@link org.apache.olingo.odata2.api.edm.provider.Schema}
+ * @return an instance EDM schema of type {@link org.apache.olingo.odata2.api.edm.provider.Schema}
*/
public Schema getEdmSchema();
@@ -61,8 +59,7 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
* The method returns JPA EDM container view. The JPA EDM container view can
* be used to access EDM Entity Container elements.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}
*/
public JPAEdmEntityContainerView getJPAEdmEntityContainerView();
@@ -70,8 +67,7 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
* The method returns JPA EDM complex view. The JPA EDM complex view can be
* used to access EDM complex types and JPA Embeddable Types.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
*/
public JPAEdmComplexTypeView getJPAEdmComplexTypeView();
@@ -79,8 +75,7 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
* The method returns JPA EDM association view. The JPA EDM association view
* can be used to access EDM associations and JPA Relationships.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
*/
public JPAEdmAssociationView getJPAEdmAssociationView();
@@ -96,12 +91,12 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
* The method is a callback.
*
* @param customClass
- * is the class that contains custom operations
+ * is the class that contains custom operations
* @param methodNames
- * is the name of the method that needs to be transformed into
- * Function Imports. It is an optional parameter. If null is
- * passed then all annotated methods are transformed into
- * Function Imports.
+ * is the name of the method that needs to be transformed into
+ * Function Imports. It is an optional parameter. If null is
+ * passed then all annotated methods are transformed into
+ * Function Imports.
*
*/
public void registerOperations(Class<?> customClass, String methodNames[]);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
index 20cb3c7..7c9278f 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
@@ -30,11 +30,11 @@ import javax.xml.bind.annotation.XmlValue;
/**
*
- * The default name for EDM
- * property is derived from JPA attribute name. This can be overriden
- * using
- * JPAAttributeMapType.
- *
+ * The default name for EDM
+ * property is derived from JPA attribute name. This can be overriden
+ * using
+ * JPAAttributeMapType.
+ *
*
* <p>Java class for JPAAttributeMapType complex type.
*
@@ -42,22 +42,22 @@ import javax.xml.bind.annotation.XmlValue;
*
* <pre>
* <complexType name="JPAAttributeMapType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="JPAAttribute" maxOccurs="unbounded" minOccurs="0">
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </element>
- * </sequence>
- * </restriction>
- * </complexContent>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="JPAAttribute" maxOccurs="unbounded" minOccurs="0">
+ * <complexType>
+ * <simpleContent>
+ * <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * </extension>
+ * </simpleContent>
+ * </complexType>
+ * </element>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
* </complexType>
* </pre>
*
@@ -82,13 +82,12 @@ public class JPAAttributeMapType {
* <p>
* For example, to add a new item, do as follows:
* <pre>
- * getJPAAttribute().add(newItem);
+ * getJPAAttribute().add(newItem);
* </pre>
*
*
* <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JPAAttributeMapType.JPAAttribute }
+ * Objects of the following type(s) are allowed in the list {@link JPAAttributeMapType.JPAAttribute }
*
*
*/
@@ -106,12 +105,12 @@ public class JPAAttributeMapType {
*
* <pre>
* <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
+ * <simpleContent>
+ * <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * </extension>
+ * </simpleContent>
* </complexType>
* </pre>
*
@@ -132,9 +131,8 @@ public class JPAAttributeMapType {
* Gets the value of the value property.
*
* @return
- * possible object is
- * {@link String }
- *
+ * possible object is {@link String }
+ *
*/
public String getValue() {
return value;
@@ -144,9 +142,8 @@ public class JPAAttributeMapType {
* Sets the value of the value property.
*
* @param value
- * allowed object is
- * {@link String }
- *
+ * allowed object is {@link String }
+ *
*/
public void setValue(final String value) {
this.value = value;
@@ -156,9 +153,8 @@ public class JPAAttributeMapType {
* Gets the value of the name property.
*
* @return
- * possible object is
- * {@link String }
- *
+ * possible object is {@link String }
+ *
*/
public String getName() {
return name;
@@ -168,9 +164,8 @@ public class JPAAttributeMapType {
* Sets the value of the name property.
*
* @param value
- * allowed object is
- * {@link String }
- *
+ * allowed object is {@link String }
+ *
*/
public void setName(final String value) {
name = value;
@@ -180,9 +175,8 @@ public class JPAAttributeMapType {
* Gets the value of the exclude property.
*
* @return
- * possible object is
- * {@link Boolean }
- *
+ * possible object is {@link Boolean }
+ *
*/
public boolean isExclude() {
if (exclude == null) {
@@ -196,9 +190,8 @@ public class JPAAttributeMapType {
* Sets the value of the exclude property.
*
* @param value
- * allowed object is
- * {@link Boolean }
- *
+ * allowed object is {@link Boolean }
+ *
*/
public void setExclude(final Boolean value) {
exclude = value;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.java
index dbb2d54..a91f12a 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
@@ -34,13 +34,14 @@ import javax.xml.bind.annotation.XmlType;
*
* <pre>
* <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="PersistenceUnit" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAPersistenceUnitMapType"/>
- * </sequence>
- * </restriction>
- * </complexContent>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="PersistenceUnit"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAPersistenceUnitMapType"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
* </complexType>
* </pre>
*
@@ -68,7 +69,7 @@ public class JPAEdmMappingModel {
* Sets the value of the persistenceUnit property.
*
* @param value
- * allowed object is {@link JPAPersistenceUnitMapType }
+ * allowed object is {@link JPAPersistenceUnitMapType }
*
*/
public void setPersistenceUnit(final JPAPersistenceUnitMapType value) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.java
index 3cc8681..f0e9787 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
index 2e8a01a..f462a96 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlType;
/**
*
- * The default name for EDM
- * complex type is derived from JPA Embeddable type name. This can be
- * overriden using JPAEmbeddableTypeMapType.
- *
+ * The default name for EDM
+ * complex type is derived from JPA Embeddable type name. This can be
+ * overriden using JPAEmbeddableTypeMapType.
+ *
*
* <p>Java class for JPAEmbeddableTypeMapType complex type.
*
@@ -37,16 +37,17 @@ import javax.xml.bind.annotation.XmlType;
*
* <pre>
* <complexType name="JPAEmbeddableTypeMapType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="EDMComplexType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="JPAAttributes" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAAttributeMapType"/>
- * </sequence>
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </restriction>
- * </complexContent>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="EDMComplexType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="JPAAttributes"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAAttributeMapType"/>
+ * </sequence>
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * </restriction>
+ * </complexContent>
* </complexType>
* </pre>
*
@@ -69,9 +70,8 @@ public class JPAEmbeddableTypeMapType {
* Gets the value of the edmComplexType property.
*
* @return
- * possible object is
- * {@link String }
- *
+ * possible object is {@link String }
+ *
*/
public String getEDMComplexType() {
return edmComplexType;
@@ -81,9 +81,8 @@ public class JPAEmbeddableTypeMapType {
* Sets the value of the edmComplexType property.
*
* @param value
- * allowed object is
- * {@link String }
- *
+ * allowed object is {@link String }
+ *
*/
public void setEDMComplexType(final String value) {
edmComplexType = value;
@@ -93,9 +92,8 @@ public class JPAEmbeddableTypeMapType {
* Gets the value of the jpaAttributes property.
*
* @return
- * possible object is
- * {@link JPAAttributeMapType }
- *
+ * possible object is {@link JPAAttributeMapType }
+ *
*/
public JPAAttributeMapType getJPAAttributes() {
return jpaAttributes;
@@ -105,9 +103,8 @@ public class JPAEmbeddableTypeMapType {
* Sets the value of the jpaAttributes property.
*
* @param value
- * allowed object is
- * {@link JPAAttributeMapType }
- *
+ * allowed object is {@link JPAAttributeMapType }
+ *
*/
public void setJPAAttributes(final JPAAttributeMapType value) {
jpaAttributes = value;
@@ -117,9 +114,8 @@ public class JPAEmbeddableTypeMapType {
* Gets the value of the name property.
*
* @return
- * possible object is
- * {@link String }
- *
+ * possible object is {@link String }
+ *
*/
public String getName() {
return name;
@@ -129,9 +125,8 @@ public class JPAEmbeddableTypeMapType {
* Sets the value of the name property.
*
* @param value
- * allowed object is
- * {@link String }
- *
+ * allowed object is {@link String }
+ *
*/
public void setName(final String value) {
name = value;
@@ -141,9 +136,8 @@ public class JPAEmbeddableTypeMapType {
* Gets the value of the exclude property.
*
* @return
- * possible object is
- * {@link Boolean }
- *
+ * possible object is {@link Boolean }
+ *
*/
public boolean isExclude() {
if (exclude == null) {
@@ -157,9 +151,8 @@ public class JPAEmbeddableTypeMapType {
* Sets the value of the exclude property.
*
* @param value
- * allowed object is
- * {@link Boolean }
- *
+ * allowed object is {@link Boolean }
+ *
*/
public void setExclude(final Boolean value) {
exclude = value;
[44/59] [abbrv] git commit: cleanup of odata ref
Posted by ch...@apache.org.
cleanup of odata ref
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/de637288
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/de637288
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/de637288
Branch: refs/heads/master
Commit: de637288a05cd3f0450c932f02c87877e0963906
Parents: b18130a
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 14:59:06 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 14:59:06 2013 +0200
----------------------------------------------------------------------
.../odata2/ref/edm/ScenarioEdmProvider.java | 75 +++---
.../olingo/odata2/ref/model/Building.java | 26 +-
.../apache/olingo/odata2/ref/model/City.java | 26 +-
.../olingo/odata2/ref/model/DataContainer.java | 28 +-
.../olingo/odata2/ref/model/Employee.java | 29 ++-
.../olingo/odata2/ref/model/Location.java | 26 +-
.../apache/olingo/odata2/ref/model/Manager.java | 26 +-
.../olingo/odata2/ref/model/ModelException.java | 26 +-
.../apache/olingo/odata2/ref/model/Photo.java | 26 +-
.../apache/olingo/odata2/ref/model/Room.java | 26 +-
.../apache/olingo/odata2/ref/model/Team.java | 26 +-
.../odata2/ref/processor/ListsDataSource.java | 144 ++++++-----
.../odata2/ref/processor/ListsProcessor.java | 257 ++++++++++++-------
.../ref/processor/ScenarioDataSource.java | 62 +++--
.../ref/processor/ScenarioErrorCallback.java | 33 ++-
.../ref/processor/ScenarioServiceFactory.java | 26 +-
.../olingo/odata2/ref/model/BuildingTest.java | 29 +--
.../odata2/ref/model/DataContainerTest.java | 29 +--
.../olingo/odata2/ref/model/EmployeeTest.java | 29 +--
.../olingo/odata2/ref/model/ManagerTest.java | 29 +--
.../olingo/odata2/ref/model/RoomTest.java | 29 +--
.../olingo/odata2/ref/model/TeamTest.java | 29 +--
.../olingo/odata2/ref/read/EntitySetTest.java | 51 ++--
.../olingo/odata2/ref/read/EntityTest.java | 51 ++--
24 files changed, 635 insertions(+), 503 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
index 650125e..b3cf662 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.edm;
@@ -54,7 +54,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
/**
* Provider for the entity data model used in the reference scenario
- *
+ *
*/
public class ScenarioEdmProvider extends EdmProvider {
@@ -271,8 +271,9 @@ public class ScenarioEdmProvider extends EdmProvider {
List<Property> properties = new ArrayList<Property>();
properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false)));
- properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String).setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORNAME)));
+ properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
+ .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ .setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORNAME)));
properties.add(new SimpleProperty().setName("Image").setType(EdmSimpleTypeKind.Binary));
List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
navigationProperties.add(new NavigationProperty().setName("nb_Rooms")
@@ -326,7 +327,8 @@ public class ScenarioEdmProvider extends EdmProvider {
if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
if (COMPLEX_TYPE_1.getName().equals(edmFQName.getName())) {
List<Property> properties = new ArrayList<Property>();
- properties.add(new ComplexProperty().setName("City").setType(COMPLEX_TYPE_2).setFacets(new Facets().setNullable(false)));
+ properties.add(new ComplexProperty().setName("City").setType(COMPLEX_TYPE_2).setFacets(
+ new Facets().setNullable(false)));
properties.add(new SimpleProperty().setName("Country").setType(EdmSimpleTypeKind.String));
return new ComplexType().setName(COMPLEX_TYPE_1.getName()).setProperties(properties);
@@ -346,20 +348,28 @@ public class ScenarioEdmProvider extends EdmProvider {
if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
if (ASSOCIATION_1_1.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_1.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_4).setRole(ROLE_1_4).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_4).setRole(ROLE_1_4).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_2.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_2.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_2).setRole(ROLE_1_2).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_2).setRole(ROLE_1_2).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_3.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_3.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_4.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_4.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_5).setRole(ROLE_1_5).setMultiplicity(EdmMultiplicity.ONE))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.MANY));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_5).setRole(ROLE_1_5).setMultiplicity(EdmMultiplicity.ONE))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.MANY));
}
}
@@ -420,12 +430,16 @@ public class ScenarioEdmProvider extends EdmProvider {
} else if (FUNCTION_IMPORT_3.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.String.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.MANY))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.String.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.MANY))
.setHttpMethod("GET");
} else if (FUNCTION_IMPORT_4.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.Int16.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.ONE))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.Int16.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.ONE))
.setHttpMethod("GET");
} else if (FUNCTION_IMPORT_5.equals(name)) {
@@ -435,7 +449,9 @@ public class ScenarioEdmProvider extends EdmProvider {
} else if (FUNCTION_IMPORT_6.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.Binary.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.ONE))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.Binary.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.ONE))
.setHttpMethod("GET")
.setParameters(Arrays.asList(
new FunctionImportParameter().setName("Id").setType(EdmSimpleTypeKind.String)
@@ -453,7 +469,8 @@ public class ScenarioEdmProvider extends EdmProvider {
}
@Override
- public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
+ public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
+ final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
if (ENTITY_CONTAINER_1.equals(entityContainer)) {
if (ASSOCIATION_1_1.equals(association)) {
return new AssociationSet().setName(ASSOCIATION_1_1.getName())
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java
index 0dd567b..4575ae4 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java
index 714fc79..963cab5 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java
index 3baef62..6e89d7c 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
@@ -25,7 +25,7 @@ import java.util.TimeZone;
/**
* Container and initialization code for the data objects of the reference scenario.
- *
+ *
*/
public class DataContainer {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
index f794c41..45c14d0 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
@@ -176,7 +176,8 @@ public class Employee {
+ "\"CityName\":\"" + location.getCity().getCityName() + "\"}") + ","
+ "\"Country\":\"" + location.getCountry() + "\"}") + ","
+ "\"Age\":" + age + ","
- + "\"EntryDate\":" + (entryDate == null ? "null" : "\"" + DateFormat.getInstance().format(entryDate.getTime()) + "\"") + ","
+ + "\"EntryDate\":"
+ + (entryDate == null ? "null" : "\"" + DateFormat.getInstance().format(entryDate.getTime()) + "\"") + ","
+ "\"ImageUrl\":\"" + imageUrl + "\"}";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java
index aa577b5..8b621b1 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java
index 434b489..22e40cd 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java
index f3f3a20..d2889c3 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
index ef8b7b7..b81c0f0 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java
index e96f57f..75b33d9 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java
index d99b05e..5b7c4f3 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/de637288/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java
index f235f16..3e24bee 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.ref.processor;
@@ -31,73 +31,79 @@ import org.apache.olingo.odata2.api.exception.ODataNotImplementedException;
/**
* <p>This interface is intended to make it easier to implement an OData
- * service in cases where all data for each entity set can be provided as a
- * {@link List} of objects from which all properties described in the
+ * service in cases where all data for each entity set can be provided as a {@link List} of objects from which all
+ * properties described in the
* Entity Data Model can be retrieved and set.</p>
* <p>By obeying these restrictions, data-source implementations get the
- * following advantages:
+ * following advantages:
* <ul>
* <li>All system query options can be handled centrally.</li>
* <li>Following navigation paths must only be done step by step.</li>
* </ul>
* </p>
- *
+ *
*/
public interface ListsDataSource {
/**
* Retrieves the whole data list for the specified entity set.
- * @param entitySet the requested {@link EdmEntitySet}
+ * @param entitySet the requested {@link EdmEntitySet}
* @return the requested data list
*/
- List<?> readData(EdmEntitySet entitySet) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ List<?> readData(EdmEntitySet entitySet) throws ODataNotImplementedException, ODataNotFoundException, EdmException,
+ ODataApplicationException;
/**
* Retrieves a single data object for the specified entity set and key.
- * @param entitySet the requested {@link EdmEntitySet}
- * @param keys the entity key as map of key names to key values
+ * @param entitySet the requested {@link EdmEntitySet}
+ * @param keys the entity key as map of key names to key values
* @return the requested data object
*/
- Object readData(EdmEntitySet entitySet, Map<String, Object> keys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ Object readData(EdmEntitySet entitySet, Map<String, Object> keys) throws ODataNotImplementedException,
+ ODataNotFoundException, EdmException, ODataApplicationException;
/**
* <p>Retrieves data for the specified function import and key.</p>
* <p>This method is called also for function imports that have defined in
- * their metadata an other HTTP method than <code>GET</code>.</p>
- * @param function the requested {@link EdmFunctionImport}
- * @param parameters the parameters of the function import
- * as map of parameter names to parameter values
- * @param keys the key of the returned entity set, as map of key names to key values,
- * if the return type of the function import is a collection of entities
- * (optional)
+ * their metadata an other HTTP method than <code>GET</code>.</p>
+ * @param function the requested {@link EdmFunctionImport}
+ * @param parameters the parameters of the function import
+ * as map of parameter names to parameter values
+ * @param keys the key of the returned entity set, as map of key names to key values,
+ * if the return type of the function import is a collection of entities
+ * (optional)
* @return the requested data object, either a list or a single object;
- * if the function import's return type is of type <code>Binary</code>,
- * the returned object(s) must be of type {@link BinaryData}
+ * if the function import's return type is of type <code>Binary</code>,
+ * the returned object(s) must be of type {@link BinaryData}
*/
- Object readData(EdmFunctionImport function, Map<String, Object> parameters, Map<String, Object> keys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ Object readData(EdmFunctionImport function, Map<String, Object> parameters, Map<String, Object> keys)
+ throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
/**
* <p>Retrieves related data for the specified source data, entity set, and key.</p>
* <p>If the underlying association of the EDM is specified to have target
* multiplicity '*' and no target key is given, this method returns a list of
* related data, otherwise it returns a single data object.</p>
- * @param sourceEntitySet the {@link EdmEntitySet} of the source entity
- * @param sourceData the data object of the source entity
- * @param targetEntitySet the requested target {@link EdmEntitySet}
- * @param targetKeys the key of the target entity as map of key names to key values
- * (optional)
+ * @param sourceEntitySet the {@link EdmEntitySet} of the source entity
+ * @param sourceData the data object of the source entity
+ * @param targetEntitySet the requested target {@link EdmEntitySet}
+ * @param targetKeys the key of the target entity as map of key names to key values
+ * (optional)
* @return the requested releated data object, either a list or a single object
*/
- Object readRelatedData(EdmEntitySet sourceEntitySet, Object sourceData, EdmEntitySet targetEntitySet, Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ Object readRelatedData(EdmEntitySet sourceEntitySet, Object sourceData, EdmEntitySet targetEntitySet,
+ Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException,
+ ODataApplicationException;
/**
* Retrieves the binary data and the MIME type for the media resource
* associated to the specified media-link entry.
- * @param entitySet the {@link EdmEntitySet} of the media-link entry
- * @param mediaLinkEntryData the data object of the media-link entry
+ * @param entitySet the {@link EdmEntitySet} of the media-link entry
+ * @param mediaLinkEntryData the data object of the media-link entry
* @return the binary data and the MIME type of the media resource
*/
- BinaryData readBinaryData(EdmEntitySet entitySet, Object mediaLinkEntryData) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ BinaryData readBinaryData(EdmEntitySet entitySet, Object mediaLinkEntryData) throws ODataNotImplementedException,
+ ODataNotFoundException, EdmException, ODataApplicationException;
/**
* <p>Creates and returns a new instance of the requested data-object type.</p>
@@ -105,58 +111,66 @@ public interface ListsDataSource {
* have empty content, apart from the key and other mandatory properties.
* However, intermediate objects to access complex properties must not be
* <code>null</code>.</p>
- * @param entitySet the {@link EdmEntitySet} the object must correspond to
+ * @param entitySet the {@link EdmEntitySet} the object must correspond to
* @return the new data object
*/
- Object newDataObject(EdmEntitySet entitySet) throws ODataNotImplementedException, EdmException, ODataApplicationException;
+ Object newDataObject(EdmEntitySet entitySet) throws ODataNotImplementedException, EdmException,
+ ODataApplicationException;
/**
* Writes the binary data for the media resource associated to the
* specified media-link entry.
- * @param entitySet the {@link EdmEntitySet} of the media-link entry
- * @param mediaLinkEntryData the data object of the media-link entry
- * @param binaryData the binary data of the media resource along with
- * the MIME type of the binary data
+ * @param entitySet the {@link EdmEntitySet} of the media-link entry
+ * @param mediaLinkEntryData the data object of the media-link entry
+ * @param binaryData the binary data of the media resource along with
+ * the MIME type of the binary data
*/
- void writeBinaryData(EdmEntitySet entitySet, Object mediaLinkEntryData, BinaryData binaryData) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ void writeBinaryData(EdmEntitySet entitySet, Object mediaLinkEntryData, BinaryData binaryData)
+ throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
/**
* Deletes a single data object identified by the specified entity set and key.
- * @param entitySet the {@link EdmEntitySet} of the entity to be deleted
- * @param keys the entity key as map of key names to key values
+ * @param entitySet the {@link EdmEntitySet} of the entity to be deleted
+ * @param keys the entity key as map of key names to key values
*/
- void deleteData(EdmEntitySet entitySet, Map<String, Object> keys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ void deleteData(EdmEntitySet entitySet, Map<String, Object> keys) throws ODataNotImplementedException,
+ ODataNotFoundException, EdmException, ODataApplicationException;
/**
* <p>Inserts an instance into the entity list of the specified entity set.</p>
* <p>If {@link #newDataObject} has not set the key and other mandatory
* properties already, this method must set them before inserting the
* instance into the list.</p>
- * @param entitySet the {@link EdmEntitySet} the object must correspond to
- * @param data the data object of the new entity
+ * @param entitySet the {@link EdmEntitySet} the object must correspond to
+ * @param data the data object of the new entity
*/
- void createData(EdmEntitySet entitySet, Object data) throws ODataNotImplementedException, EdmException, ODataApplicationException;
+ void createData(EdmEntitySet entitySet, Object data) throws ODataNotImplementedException, EdmException,
+ ODataApplicationException;
/**
* Deletes the relation from the specified source data to a target entity
* specified by entity set and key.
- * @param sourceEntitySet the {@link EdmEntitySet} of the source entity
- * @param sourceData the data object of the source entity
- * @param targetEntitySet the {@link EdmEntitySet} of the target entity
- * @param targetKeys the key of the target entity as map of key names to key values
- * (optional)
+ * @param sourceEntitySet the {@link EdmEntitySet} of the source entity
+ * @param sourceData the data object of the source entity
+ * @param targetEntitySet the {@link EdmEntitySet} of the target entity
+ * @param targetKeys the key of the target entity as map of key names to key values
+ * (optional)
*/
- void deleteRelation(EdmEntitySet sourceEntitySet, Object sourceData, EdmEntitySet targetEntitySet, Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ void deleteRelation(EdmEntitySet sourceEntitySet, Object sourceData, EdmEntitySet targetEntitySet,
+ Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException,
+ ODataApplicationException;
/**
* Writes a relation from the specified source data to a target entity
* specified by entity set and key.
- * @param sourceEntitySet the {@link EdmEntitySet} of the source entity
- * @param sourceData the data object of the source entity
- * @param targetEntitySet the {@link EdmEntitySet} of the relation target
- * @param targetKeys the key of the target entity as map of key names to key values
+ * @param sourceEntitySet the {@link EdmEntitySet} of the source entity
+ * @param sourceData the data object of the source entity
+ * @param targetEntitySet the {@link EdmEntitySet} of the relation target
+ * @param targetKeys the key of the target entity as map of key names to key values
*/
- void writeRelation(EdmEntitySet sourceEntitySet, Object sourceData, EdmEntitySet targetEntitySet, Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException;
+ void writeRelation(EdmEntitySet sourceEntitySet, Object sourceData, EdmEntitySet targetEntitySet,
+ Map<String, Object> targetKeys) throws ODataNotImplementedException, ODataNotFoundException, EdmException,
+ ODataApplicationException;
/**
* Container to store binary data (as byte array) and the associated MIME type.
[10/59] [abbrv] git commit: Clean up of odata api
Posted by ch...@apache.org.
Clean up of odata api
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/cf4caabf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/cf4caabf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/cf4caabf
Branch: refs/heads/master
Commit: cf4caabf88c17f4b88a05361ef23e0def9eedc26
Parents: 66db1e9
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 13:48:54 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 13:48:54 2013 +0200
----------------------------------------------------------------------
.../apache/olingo/odata2/api/ODataCallback.java | 14 +-
.../olingo/odata2/api/ODataDebugCallback.java | 12 +-
.../apache/olingo/odata2/api/ODataService.java | 46 +-
.../olingo/odata2/api/ODataServiceFactory.java | 17 +-
.../olingo/odata2/api/ODataServiceVersion.java | 14 +-
.../olingo/odata2/api/batch/BatchException.java | 72 ++-
.../olingo/odata2/api/batch/BatchHandler.java | 13 +-
.../odata2/api/batch/BatchRequestPart.java | 10 +-
.../odata2/api/batch/BatchResponsePart.java | 23 +-
.../odata2/api/client/batch/BatchChangeSet.java | 16 +-
.../api/client/batch/BatchChangeSetPart.java | 10 +-
.../odata2/api/client/batch/BatchPart.java | 10 +-
.../odata2/api/client/batch/BatchQueryPart.java | 10 +-
.../api/client/batch/BatchSingleResponse.java | 17 +-
.../odata2/api/commons/HttpContentType.java | 14 +-
.../olingo/odata2/api/commons/HttpHeaders.java | 14 +-
.../odata2/api/commons/HttpStatusCodes.java | 40 +-
.../olingo/odata2/api/commons/InlineCount.java | 12 +-
.../odata2/api/commons/ODataHttpHeaders.java | 12 +-
.../odata2/api/commons/ODataHttpMethod.java | 12 +-
.../olingo/odata2/api/commons/package-info.java | 10 +-
.../org/apache/olingo/odata2/api/edm/Edm.java | 15 +-
.../apache/olingo/odata2/api/edm/EdmAction.java | 15 +-
.../olingo/odata2/api/edm/EdmAnnotatable.java | 12 +-
.../odata2/api/edm/EdmAnnotationAttribute.java | 14 +-
.../odata2/api/edm/EdmAnnotationElement.java | 14 +-
.../olingo/odata2/api/edm/EdmAnnotations.java | 12 +-
.../olingo/odata2/api/edm/EdmAssociation.java | 14 +-
.../odata2/api/edm/EdmAssociationEnd.java | 12 +-
.../odata2/api/edm/EdmAssociationSet.java | 12 +-
.../odata2/api/edm/EdmAssociationSetEnd.java | 12 +-
.../olingo/odata2/api/edm/EdmComplexType.java | 16 +-
.../odata2/api/edm/EdmConcurrencyMode.java | 15 +-
.../olingo/odata2/api/edm/EdmContentKind.java | 14 +-
.../api/edm/EdmCustomizableFeedMappings.java | 12 +-
.../olingo/odata2/api/edm/EdmElement.java | 12 +-
.../odata2/api/edm/EdmEntityContainer.java | 15 +-
.../olingo/odata2/api/edm/EdmEntitySet.java | 14 +-
.../olingo/odata2/api/edm/EdmEntitySetInfo.java | 17 +-
.../olingo/odata2/api/edm/EdmEntityType.java | 21 +-
.../olingo/odata2/api/edm/EdmException.java | 12 +-
.../apache/olingo/odata2/api/edm/EdmFacets.java | 14 +-
.../odata2/api/edm/EdmFunctionImport.java | 12 +-
.../olingo/odata2/api/edm/EdmLiteral.java | 15 +-
.../odata2/api/edm/EdmLiteralException.java | 18 +-
.../olingo/odata2/api/edm/EdmLiteralKind.java | 12 +-
.../olingo/odata2/api/edm/EdmMappable.java | 12 +-
.../olingo/odata2/api/edm/EdmMapping.java | 12 +-
.../olingo/odata2/api/edm/EdmMultiplicity.java | 18 +-
.../apache/olingo/odata2/api/edm/EdmNamed.java | 14 +-
.../odata2/api/edm/EdmNavigationProperty.java | 12 +-
.../olingo/odata2/api/edm/EdmParameter.java | 15 +-
.../olingo/odata2/api/edm/EdmProperty.java | 12 +-
.../api/edm/EdmReferentialConstraint.java | 10 +-
.../api/edm/EdmReferentialConstraintRole.java | 12 +-
.../odata2/api/edm/EdmServiceMetadata.java | 17 +-
.../olingo/odata2/api/edm/EdmSimpleType.java | 87 +--
.../odata2/api/edm/EdmSimpleTypeException.java | 45 +-
.../odata2/api/edm/EdmSimpleTypeFacade.java | 12 +-
.../odata2/api/edm/EdmSimpleTypeKind.java | 19 +-
.../odata2/api/edm/EdmStructuralType.java | 12 +-
.../olingo/odata2/api/edm/EdmTargetPath.java | 12 +-
.../apache/olingo/odata2/api/edm/EdmType.java | 12 +-
.../olingo/odata2/api/edm/EdmTypeKind.java | 12 +-
.../apache/olingo/odata2/api/edm/EdmTyped.java | 12 +-
.../odata2/api/edm/FullQualifiedName.java | 12 +-
.../olingo/odata2/api/edm/package-info.java | 10 +-
.../api/edm/provider/AnnotationAttribute.java | 12 +-
.../api/edm/provider/AnnotationElement.java | 12 +-
.../odata2/api/edm/provider/Association.java | 12 +-
.../odata2/api/edm/provider/AssociationEnd.java | 14 +-
.../odata2/api/edm/provider/AssociationSet.java | 12 +-
.../api/edm/provider/AssociationSetEnd.java | 12 +-
.../api/edm/provider/ComplexProperty.java | 12 +-
.../odata2/api/edm/provider/ComplexType.java | 14 +-
.../edm/provider/CustomizableFeedMappings.java | 16 +-
.../odata2/api/edm/provider/DataServices.java | 15 +-
.../odata2/api/edm/provider/Documentation.java | 12 +-
.../odata2/api/edm/provider/EdmProvider.java | 20 +-
.../api/edm/provider/EdmProviderAccessor.java | 16 +-
.../api/edm/provider/EdmProviderFactory.java | 19 +-
.../api/edm/provider/EntityContainer.java | 12 +-
.../api/edm/provider/EntityContainerInfo.java | 12 +-
.../odata2/api/edm/provider/EntitySet.java | 12 +-
.../odata2/api/edm/provider/EntityType.java | 12 +-
.../olingo/odata2/api/edm/provider/Facets.java | 18 +-
.../odata2/api/edm/provider/FunctionImport.java | 14 +-
.../edm/provider/FunctionImportParameter.java | 12 +-
.../olingo/odata2/api/edm/provider/Key.java | 12 +-
.../olingo/odata2/api/edm/provider/Mapping.java | 12 +-
.../api/edm/provider/NavigationProperty.java | 12 +-
.../odata2/api/edm/provider/OnDelete.java | 12 +-
.../odata2/api/edm/provider/Property.java | 12 +-
.../odata2/api/edm/provider/PropertyRef.java | 14 +-
.../api/edm/provider/ReferentialConstraint.java | 12 +-
.../edm/provider/ReferentialConstraintRole.java | 12 +-
.../odata2/api/edm/provider/ReturnType.java | 14 +-
.../olingo/odata2/api/edm/provider/Schema.java | 12 +-
.../odata2/api/edm/provider/SimpleProperty.java | 12 +-
.../olingo/odata2/api/edm/provider/Using.java | 10 +-
.../odata2/api/edm/provider/package-info.java | 539 ++++++++++---------
.../olingo/odata2/api/ep/EntityProvider.java | 396 ++++++++------
.../api/ep/EntityProviderBatchProperties.java | 12 +-
.../odata2/api/ep/EntityProviderException.java | 84 +--
.../api/ep/EntityProviderReadProperties.java | 14 +-
.../api/ep/EntityProviderWriteProperties.java | 35 +-
.../api/ep/callback/OnReadInlineContent.java | 39 +-
.../api/ep/callback/OnWriteEntryContent.java | 19 +-
.../api/ep/callback/OnWriteFeedContent.java | 19 +-
.../odata2/api/ep/callback/ReadEntryResult.java | 21 +-
.../odata2/api/ep/callback/ReadFeedResult.java | 19 +-
.../odata2/api/ep/callback/ReadResult.java | 33 +-
.../api/ep/callback/TombstoneCallback.java | 16 +-
.../ep/callback/TombstoneCallbackResult.java | 22 +-
.../api/ep/callback/WriteCallbackContext.java | 17 +-
.../ep/callback/WriteEntryCallbackContext.java | 17 +-
.../ep/callback/WriteEntryCallbackResult.java | 15 +-
.../ep/callback/WriteFeedCallbackContext.java | 17 +-
.../ep/callback/WriteFeedCallbackResult.java | 17 +-
.../odata2/api/ep/callback/package-info.java | 22 +-
.../odata2/api/ep/entry/EntryMetadata.java | 10 +-
.../odata2/api/ep/entry/MediaMetadata.java | 12 +-
.../olingo/odata2/api/ep/entry/ODataEntry.java | 14 +-
.../odata2/api/ep/entry/package-info.java | 13 +-
.../olingo/odata2/api/ep/feed/FeedMetadata.java | 14 +-
.../olingo/odata2/api/ep/feed/ODataFeed.java | 14 +-
.../olingo/odata2/api/ep/feed/package-info.java | 13 +-
.../olingo/odata2/api/ep/package-info.java | 25 +-
.../odata2/api/exception/MessageReference.java | 28 +-
.../exception/ODataApplicationException.java | 51 +-
.../api/exception/ODataBadRequestException.java | 36 +-
.../api/exception/ODataConflictException.java | 12 +-
.../odata2/api/exception/ODataException.java | 37 +-
.../api/exception/ODataForbiddenException.java | 12 +-
.../api/exception/ODataHttpException.java | 21 +-
.../api/exception/ODataMessageException.java | 37 +-
.../ODataMethodNotAllowedException.java | 18 +-
.../exception/ODataNotAcceptableException.java | 18 +-
.../api/exception/ODataNotFoundException.java | 15 +-
.../exception/ODataNotImplementedException.java | 15 +-
.../ODataPreconditionFailedException.java | 18 +-
.../ODataPreconditionRequiredException.java | 18 +-
.../ODataServiceUnavailableException.java | 18 +-
.../ODataUnsupportedMediaTypeException.java | 24 +-
.../odata2/api/exception/package-info.java | 88 +--
.../apache/olingo/odata2/api/package-info.java | 38 +-
.../odata2/api/processor/ODataContext.java | 18 +-
.../api/processor/ODataErrorCallback.java | 22 +-
.../odata2/api/processor/ODataErrorContext.java | 23 +-
.../odata2/api/processor/ODataProcessor.java | 12 +-
.../odata2/api/processor/ODataRequest.java | 10 +-
.../odata2/api/processor/ODataResponse.java | 32 +-
.../api/processor/ODataSingleProcessor.java | 109 ++--
.../processor/feature/CustomContentType.java | 14 +-
.../feature/ODataProcessorFeature.java | 16 +-
.../api/processor/feature/package-info.java | 12 +-
.../odata2/api/processor/package-info.java | 36 +-
.../api/processor/part/BatchProcessor.java | 28 +-
.../part/EntityComplexPropertyProcessor.java | 19 +-
.../api/processor/part/EntityLinkProcessor.java | 17 +-
.../processor/part/EntityLinksProcessor.java | 17 +-
.../processor/part/EntityMediaProcessor.java | 15 +-
.../api/processor/part/EntityProcessor.java | 21 +-
.../api/processor/part/EntitySetProcessor.java | 19 +-
.../part/EntitySimplePropertyProcessor.java | 17 +-
.../EntitySimplePropertyValueProcessor.java | 22 +-
.../processor/part/FunctionImportProcessor.java | 14 +-
.../part/FunctionImportValueProcessor.java | 12 +-
.../api/processor/part/MetadataProcessor.java | 16 +-
.../part/ServiceDocumentProcessor.java | 16 +-
.../odata2/api/processor/part/package-info.java | 10 +-
.../olingo/odata2/api/rt/RuntimeDelegate.java | 38 +-
.../olingo/odata2/api/rt/package-info.java | 14 +-
.../odata2/api/servicedocument/Accept.java | 12 +-
.../odata2/api/servicedocument/AtomInfo.java | 14 +-
.../odata2/api/servicedocument/Categories.java | 15 +-
.../odata2/api/servicedocument/Category.java | 14 +-
.../odata2/api/servicedocument/Collection.java | 16 +-
.../api/servicedocument/CommonAttributes.java | 14 +-
.../api/servicedocument/ExtensionAttribute.java | 14 +-
.../api/servicedocument/ExtensionElement.java | 16 +-
.../odata2/api/servicedocument/Fixed.java | 20 +-
.../api/servicedocument/ServiceDocument.java | 14 +-
.../servicedocument/ServiceDocumentParser.java | 10 +-
.../ServiceDocumentParserException.java | 10 +-
.../odata2/api/servicedocument/Title.java | 12 +-
.../odata2/api/servicedocument/Workspace.java | 14 +-
.../odata2/api/uri/ExpandSelectTreeNode.java | 16 +-
.../olingo/odata2/api/uri/KeyPredicate.java | 14 +-
.../api/uri/NavigationPropertySegment.java | 12 +-
.../odata2/api/uri/NavigationSegment.java | 12 +-
.../apache/olingo/odata2/api/uri/PathInfo.java | 12 +-
.../olingo/odata2/api/uri/PathSegment.java | 16 +-
.../olingo/odata2/api/uri/SelectItem.java | 12 +-
.../apache/olingo/odata2/api/uri/UriInfo.java | 12 +-
.../odata2/api/uri/UriNotMatchingException.java | 27 +-
.../apache/olingo/odata2/api/uri/UriParser.java | 128 ++---
.../odata2/api/uri/UriSyntaxException.java | 75 ++-
.../api/uri/expression/BinaryExpression.java | 24 +-
.../api/uri/expression/BinaryOperator.java | 23 +-
.../api/uri/expression/CommonExpression.java | 32 +-
.../expression/ExceptionVisitExpression.java | 23 +-
.../api/uri/expression/ExpressionKind.java | 28 +-
.../expression/ExpressionParserException.java | 99 ++--
.../api/uri/expression/ExpressionVisitor.java | 106 ++--
.../api/uri/expression/FilterExpression.java | 19 +-
.../api/uri/expression/LiteralExpression.java | 16 +-
.../api/uri/expression/MemberExpression.java | 32 +-
.../api/uri/expression/MethodExpression.java | 18 +-
.../api/uri/expression/MethodOperator.java | 25 +-
.../api/uri/expression/OrderByExpression.java | 25 +-
.../api/uri/expression/OrderExpression.java | 17 +-
.../api/uri/expression/PropertyExpression.java | 22 +-
.../odata2/api/uri/expression/SortOrder.java | 22 +-
.../api/uri/expression/UnaryExpression.java | 16 +-
.../api/uri/expression/UnaryOperator.java | 16 +-
.../odata2/api/uri/expression/Visitable.java | 35 +-
.../odata2/api/uri/expression/package-info.java | 16 +-
.../odata2/api/uri/info/DeleteUriInfo.java | 14 +-
.../api/uri/info/GetComplexPropertyUriInfo.java | 12 +-
.../api/uri/info/GetEntityCountUriInfo.java | 12 +-
.../api/uri/info/GetEntityLinkCountUriInfo.java | 12 +-
.../api/uri/info/GetEntityLinkUriInfo.java | 12 +-
.../api/uri/info/GetEntitySetCountUriInfo.java | 12 +-
.../uri/info/GetEntitySetLinksCountUriInfo.java | 12 +-
.../api/uri/info/GetEntitySetLinksUriInfo.java | 12 +-
.../api/uri/info/GetEntitySetUriInfo.java | 12 +-
.../odata2/api/uri/info/GetEntityUriInfo.java | 12 +-
.../api/uri/info/GetFunctionImportUriInfo.java | 12 +-
.../api/uri/info/GetMediaResourceUriInfo.java | 12 +-
.../odata2/api/uri/info/GetMetadataUriInfo.java | 12 +-
.../api/uri/info/GetServiceDocumentUriInfo.java | 12 +-
.../api/uri/info/GetSimplePropertyUriInfo.java | 12 +-
.../olingo/odata2/api/uri/info/PostUriInfo.java | 12 +-
.../api/uri/info/PutMergePatchUriInfo.java | 12 +-
.../odata2/api/uri/info/package-info.java | 10 +-
.../olingo/odata2/api/uri/package-info.java | 15 +-
src/eclipse/eclipse-codestyle-formatter.xml | 12 +-
238 files changed, 2955 insertions(+), 2588 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
index 91861a8..94bd570 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api;
/**
* Common OData callback interface. Every callback implementation has to implement this interface as a marker.
*
- *
- *
+ *
+ *
*/
public interface ODataCallback {}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
index e3e3bf4..f3dbffa 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -28,7 +28,7 @@ public interface ODataDebugCallback extends ODataCallback {
* Determines whether additional debug information can be retrieved
* from this OData service for the current request.
* @return <code>true</code> if the system is in debug mode
- * and the current user has the rights to debug the OData service
+ * and the current user has the rights to debug the OData service
*/
boolean isDebugEnabled();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
index b7cc844..1b9f66b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -40,8 +40,8 @@ import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
/**
* Root interface for a custom OData service.
*
- *
- *
+ *
+ *
*/
public interface ODataService {
@@ -53,112 +53,112 @@ public interface ODataService {
String getVersion() throws ODataException;
/**
- * @return entity data model of this service
+ * @return entity data model of this service
* @see Edm
* @throws ODataException
*/
Edm getEntityDataModel() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see MetadataProcessor
*/
MetadataProcessor getMetadataProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see ServiceDocumentProcessor
*/
ServiceDocumentProcessor getServiceDocumentProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see EntityProcessor
*/
EntityProcessor getEntityProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see EntitySetProcessor
*/
EntitySetProcessor getEntitySetProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see EntityComplexPropertyProcessor
*/
EntityComplexPropertyProcessor getEntityComplexPropertyProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see EntityLinkProcessor
*/
EntityLinkProcessor getEntityLinkProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see EntityLinksProcessor
*/
EntityLinksProcessor getEntityLinksProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see EntityMediaProcessor
*/
EntityMediaProcessor getEntityMediaProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see EntitySimplePropertyProcessor
*/
EntitySimplePropertyProcessor getEntitySimplePropertyProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see EntitySimplePropertyValueProcessor
*/
EntitySimplePropertyValueProcessor getEntitySimplePropertyValueProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see FunctionImportProcessor
*/
FunctionImportProcessor getFunctionImportProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see FunctionImportValueProcessor
*/
FunctionImportValueProcessor getFunctionImportValueProcessor() throws ODataException;
/**
- * @return a processor which handles this request
+ * @return a processor which handles this request
* @throws ODataException
* @see BatchProcessor
*/
BatchProcessor getBatchProcessor() throws ODataException;
/**
- * @return root processor interface
+ * @return root processor interface
* @throws ODataException
* @see ODataProcessor
*/
ODataProcessor getProcessor() throws ODataException;
/**
- * @param processorFeature
+ * @param processorFeature
* @return ordered list of all <code>content types</code> this service supports
* @throws ODataException
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
index 3e26faf..7b6f7a3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
/**
* Creates instance of custom OData service.
*
- *
+ *
*/
public abstract class ODataServiceFactory {
@@ -37,7 +37,7 @@ public abstract class ODataServiceFactory {
public static final String FACTORY_LABEL = "org.apache.olingo.odata2.service.factory";
/**
- * Label used in core to access application class loader
+ * Label used in core to access application class loader
*/
public static final String FACTORY_CLASSLOADER_LABEL = "org.apache.olingo.odata2.service.factory.classloader";
@@ -60,7 +60,8 @@ public abstract class ODataServiceFactory {
* @param processor A custom processor implementation derived from <code>ODataSingleProcessor</code> .
* @return A new default <code>ODataSingleProcessorService</code> instance.
*/
- public ODataService createODataSingleProcessorService(final EdmProvider provider, final ODataSingleProcessor processor) {
+ public ODataService createODataSingleProcessorService(final EdmProvider provider,
+ final ODataSingleProcessor processor) {
return RuntimeDelegate.createODataSingleProcessorService(provider, processor);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
index 30c7fad..699cd52 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,8 +23,8 @@ import java.util.regex.Pattern;
/**
* This class is a container for the supported ODataServiceVersions.
- *
- *
+ *
+ *
*/
public class ODataServiceVersion {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
index f5582d6..647b071 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -29,76 +29,96 @@ public class BatchException extends ODataMessageException {
private static final long serialVersionUID = 1L;
/** INVALID_CHANGESET_BOUNDARY requires 1 content value ('line number') */
- public static final MessageReference INVALID_CHANGESET_BOUNDARY = createMessageReference(BatchException.class, "INVALID_CHANGESET_BOUNDARY");
+ public static final MessageReference INVALID_CHANGESET_BOUNDARY = createMessageReference(BatchException.class,
+ "INVALID_CHANGESET_BOUNDARY");
- /** INVALID_BOUNDARY_DELIMITER requires 1 content value ('line number')*/
- public static final MessageReference INVALID_BOUNDARY_DELIMITER = createMessageReference(BatchException.class, "INVALID_BOUNDARY_DELIMITER");
+ /** INVALID_BOUNDARY_DELIMITER requires 1 content value ('line number') */
+ public static final MessageReference INVALID_BOUNDARY_DELIMITER = createMessageReference(BatchException.class,
+ "INVALID_BOUNDARY_DELIMITER");
/** MISSING_BOUNDARY_DELIMITER requires 1 content value('line number') */
- public static final MessageReference MISSING_BOUNDARY_DELIMITER = createMessageReference(BatchException.class, "MISSING_BOUNDARY_DELIMITER");
+ public static final MessageReference MISSING_BOUNDARY_DELIMITER = createMessageReference(BatchException.class,
+ "MISSING_BOUNDARY_DELIMITER");
/** MISSING_CLOSE_DELIMITER requires 1 content value ('line number') */
- public static final MessageReference MISSING_CLOSE_DELIMITER = createMessageReference(BatchException.class, "MISSING_CLOSE_DELIMITER");
+ public static final MessageReference MISSING_CLOSE_DELIMITER = createMessageReference(BatchException.class,
+ "MISSING_CLOSE_DELIMITER");
/** INVALID_QUERY_OPERATION_METHOD requires 1 content value ('line number') */
- public static final MessageReference INVALID_QUERY_OPERATION_METHOD = createMessageReference(BatchException.class, "INVALID_QUERY_OPERATION_METHOD");
+ public static final MessageReference INVALID_QUERY_OPERATION_METHOD = createMessageReference(BatchException.class,
+ "INVALID_QUERY_OPERATION_METHOD");
/** INVALID_CHANGESET_METHOD requires 1 content value ('line number') */
- public static final MessageReference INVALID_CHANGESET_METHOD = createMessageReference(BatchException.class, "INVALID_CHANGESET_METHOD");
+ public static final MessageReference INVALID_CHANGESET_METHOD = createMessageReference(BatchException.class,
+ "INVALID_CHANGESET_METHOD");
/** INVALID_QUERY_PARAMETER requires no content value */
- public static final MessageReference INVALID_QUERY_PARAMETER = createMessageReference(BatchException.class, "INVALID_QUERY_PARAMETER");
+ public static final MessageReference INVALID_QUERY_PARAMETER = createMessageReference(BatchException.class,
+ "INVALID_QUERY_PARAMETER");
/** INVALID_URI requires 1 content value('line number') */
public static final MessageReference INVALID_URI = createMessageReference(BatchException.class, "INVALID_URI");
/** INVALID_BOUNDARY requires 1 content value('line number') */
- public static final MessageReference INVALID_BOUNDARY = createMessageReference(BatchException.class, "INVALID_BOUNDARY");
+ public static final MessageReference INVALID_BOUNDARY = createMessageReference(BatchException.class,
+ "INVALID_BOUNDARY");
/** NO_MATCH_WITH_BOUNDARY_STRING requires 2 content value ('required boundary', 'line number') */
- public static final MessageReference NO_MATCH_WITH_BOUNDARY_STRING = createMessageReference(BatchException.class, "NO_MATCH_WITH_BOUNDARY_STRING");
+ public static final MessageReference NO_MATCH_WITH_BOUNDARY_STRING = createMessageReference(BatchException.class,
+ "NO_MATCH_WITH_BOUNDARY_STRING");
/** MISSING_CONTENT_TYPE requires no content value */
- public static final MessageReference MISSING_CONTENT_TYPE = createMessageReference(BatchException.class, "MISSING_CONTENT_TYPE");
+ public static final MessageReference MISSING_CONTENT_TYPE = createMessageReference(BatchException.class,
+ "MISSING_CONTENT_TYPE");
/** INVALID_CONTENT_TYPE requires 1 content value ('required content-type') */
- public static final MessageReference INVALID_CONTENT_TYPE = createMessageReference(BatchException.class, "INVALID_CONTENT_TYPE");
+ public static final MessageReference INVALID_CONTENT_TYPE = createMessageReference(BatchException.class,
+ "INVALID_CONTENT_TYPE");
/** MISSING_PARAMETER_IN_CONTENT_TYPE requires no content value */
- public static final MessageReference MISSING_PARAMETER_IN_CONTENT_TYPE = createMessageReference(BatchException.class, "MISSING_PARAMETER_IN_CONTENT_TYPE");
+ public static final MessageReference MISSING_PARAMETER_IN_CONTENT_TYPE = createMessageReference(BatchException.class,
+ "MISSING_PARAMETER_IN_CONTENT_TYPE");
/** INVALID_HEADER requires 1 content value ('header', 'line number') */
public static final MessageReference INVALID_HEADER = createMessageReference(BatchException.class, "INVALID_HEADER");
/** INVALID_ACCEPT_HEADER requires 1 content value ('header') */
- public static final MessageReference INVALID_ACCEPT_HEADER = createMessageReference(BatchException.class, "INVALID_ACCEPT_HEADER");
+ public static final MessageReference INVALID_ACCEPT_HEADER = createMessageReference(BatchException.class,
+ "INVALID_ACCEPT_HEADER");
/** INVALID_ACCEPT_LANGUAGE_HEADER requires 1 content value ('header') */
- public static final MessageReference INVALID_ACCEPT_LANGUAGE_HEADER = createMessageReference(BatchException.class, "INVALID_ACCEPT_LANGUAGE_HEADER");
+ public static final MessageReference INVALID_ACCEPT_LANGUAGE_HEADER = createMessageReference(BatchException.class,
+ "INVALID_ACCEPT_LANGUAGE_HEADER");
/** INVALID_CONTENT_TRANSFER_ENCODING requires no content value */
- public static final MessageReference INVALID_CONTENT_TRANSFER_ENCODING = createMessageReference(BatchException.class, "INVALID_CONTENT_TRANSFER_ENCODING");
+ public static final MessageReference INVALID_CONTENT_TRANSFER_ENCODING = createMessageReference(BatchException.class,
+ "INVALID_CONTENT_TRANSFER_ENCODING");
/** MISSING_BLANK_LINE requires 2 content value ('supplied line','line number') */
- public static final MessageReference MISSING_BLANK_LINE = createMessageReference(BatchException.class, "MISSING_BLANK_LINE");
+ public static final MessageReference MISSING_BLANK_LINE = createMessageReference(BatchException.class,
+ "MISSING_BLANK_LINE");
/** INVALID_PATHINFO requires no content value */
- public static final MessageReference INVALID_PATHINFO = createMessageReference(BatchException.class, "INVALID_PATHINFO");
+ public static final MessageReference INVALID_PATHINFO = createMessageReference(BatchException.class,
+ "INVALID_PATHINFO");
/** MISSING_METHOD requires 1 content value ('request line') */
public static final MessageReference MISSING_METHOD = createMessageReference(BatchException.class, "MISSING_METHOD");
/** INVALID_REQUEST_LINE requires 2 content value ('request line', 'line number') */
- public static final MessageReference INVALID_REQUEST_LINE = createMessageReference(BatchException.class, "INVALID_REQUEST_LINE");
+ public static final MessageReference INVALID_REQUEST_LINE = createMessageReference(BatchException.class,
+ "INVALID_REQUEST_LINE");
/** INVALID_STATUS_LINE requires 2 content value ('status line', 'line number') */
- public static final MessageReference INVALID_STATUS_LINE = createMessageReference(BatchException.class, "INVALID_STATUS_LINE");
+ public static final MessageReference INVALID_STATUS_LINE = createMessageReference(BatchException.class,
+ "INVALID_STATUS_LINE");
/** TRUNCETED_BODY requires 1 content value ('line number') */
public static final MessageReference TRUNCATED_BODY = createMessageReference(BatchException.class, "TRUNCATED_BODY");
/** UNSUPPORTED_ABSOLUTE_PATH requires 1 content value ('line number') */
- public static final MessageReference UNSUPPORTED_ABSOLUTE_PATH = createMessageReference(BatchException.class, "UNSUPPORTED_ABSOLUTE_PATH");
+ public static final MessageReference UNSUPPORTED_ABSOLUTE_PATH = createMessageReference(BatchException.class,
+ "UNSUPPORTED_ABSOLUTE_PATH");
public BatchException(final MessageReference messageReference) {
super(messageReference);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
index 1748e3e..673f0ae 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -35,7 +35,8 @@ public interface BatchHandler {
public BatchResponsePart handleBatchPart(BatchRequestPart batchRequestPart) throws ODataException;
/**
- * <p>Delegates a handling of the request {@link ODataRequest} to the request handler and provides ODataResponse {@link ODataResponse}.</p>
+ * <p>Delegates a handling of the request {@link ODataRequest} to the request handler and provides ODataResponse
+ * {@link ODataResponse}.</p>
* @param request the incoming request
* @return the corresponding result
* @throws ODataException
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java
index a12f774..5e3e2f2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
index b75a797..dfafbdb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,10 +24,11 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
/**
-* A BatchResponsePart
-* <p> BatchResponsePart represents a distinct part of a Batch Response body. It can be a ChangeSet response or a response to a retrieve request
-*
-*/
+ * A BatchResponsePart
+ * <p> BatchResponsePart represents a distinct part of a Batch Response body. It can be a ChangeSet response or a
+ * response to a retrieve request
+ *
+ */
public abstract class BatchResponsePart {
/**
@@ -67,8 +68,8 @@ public abstract class BatchResponsePart {
}
/**
- * Implementation of the builder pattern to create instances of this type of object.
- *
+ * Implementation of the builder pattern to create instances of this type of object.
+ *
*/
public static abstract class BatchResponsePartBuilder {
public abstract BatchResponsePart build();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java
index 13f7df0..83aa367 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -30,18 +30,18 @@ public abstract class BatchChangeSet implements BatchPart {
/**
* Add a new change request to the ChangeSet
- * @param BatchChangeSetPart {@link BatchChangeSetPart}
+ * @param request {@link BatchChangeSetPart}
*/
public abstract void add(BatchChangeSetPart request);
/**
- * Get change requests
+ * Get change requests
* @return a list of {@link BatchChangeSetPart}
*/
public abstract List<BatchChangeSetPart> getChangeSetParts();
/**
- * Get new builder instance
+ * Get new builder instance
* @return {@link BatchChangeSetBuilder}
*/
public static BatchChangeSetBuilder newBuilder() {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
index ba59edc..d9a81d8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java
index 6c6c7f0..2f2b5d5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java
index 42bd28d..78827eb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java
index 4d99c7d..dc8c9b7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,9 +22,10 @@ import java.util.Map;
import java.util.Set;
/**
-* A BatchSingleResponse
-* <p> BatchSingleResponse represents a single response of a Batch Response body. It can be a response to a change request of ChangeSet or a response to a retrieve request
-*/
+ * A BatchSingleResponse
+ * <p> BatchSingleResponse represents a single response of a Batch Response body. It can be a response to a change
+ * request of ChangeSet or a response to a retrieve request
+ */
public interface BatchSingleResponse {
/**
* @return a result code of the attempt to understand and satisfy the request
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
index d274afb..7f51ae3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
@@ -1,27 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.commons;
/**
- * Constants for <code>Http Content Type</code> definitions as specified in
+ * Constants for <code>Http Content Type</code> definitions as specified in
* <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html">RFC 2616 Section 14</a>.
- *
+ *
*/
public interface HttpContentType {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
index 6c098e8..f0851d1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.api.commons;
/**
* HTTP header constants
- *
- *
+ *
+ *
*/
public interface HttpHeaders {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
index 267e69b..e2a416f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,17 +21,29 @@ package org.apache.olingo.odata2.api.commons;
/**
* HTTP status codes as defined in RFC2616-sec10
* and additional status codes as defined in RFC6585
- *
+ *
*/
public enum HttpStatusCodes {
- OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"), RESET_CONTENT(205, "Reset Content"), PARTIAL_CONTENT(206, "Partial Content"),
+ OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"), RESET_CONTENT(205,
+ "Reset Content"), PARTIAL_CONTENT(206, "Partial Content"),
- MOVED_PERMANENTLY(301, "Moved Permanently"), FOUND(302, "Found"), SEE_OTHER(303, "See Other"), NOT_MODIFIED(304, "Not Modified"), USE_PROXY(305, "Use Proxy"), TEMPORARY_REDIRECT(307, "Temporary Redirect"),
+ MOVED_PERMANENTLY(301, "Moved Permanently"), FOUND(302, "Found"), SEE_OTHER(303, "See Other"), NOT_MODIFIED(304,
+ "Not Modified"), USE_PROXY(305, "Use Proxy"), TEMPORARY_REDIRECT(307, "Temporary Redirect"),
- BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, "Unauthorized"), PAYMENT_REQUIRED(402, "Payment Required"), FORBIDDEN(403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), NOT_ACCEPTABLE(406, "Not Acceptable"), PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"), REQUEST_TIMEOUT(408, "Request Timeout"), CONFLICT(409, "Conflict"), GONE(410, "Gone"), LENGTH_REQUIRED(411, "Length Required"), PRECONDITION_FAILED(412, "Precondition Failed"), REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"), REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"), UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"), REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"), EXPECTATION_FAILED(417, "Expectation Failed"), PRECONDITION_REQUIRED(428, "Precondition Required"),
+ BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, "Unauthorized"), PAYMENT_REQUIRED(402, "Payment Required"),
+ FORBIDDEN(
+ 403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), NOT_ACCEPTABLE(
+ 406, "Not Acceptable"), PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"), REQUEST_TIMEOUT(408,
+ "Request Timeout"), CONFLICT(409, "Conflict"), GONE(410, "Gone"), LENGTH_REQUIRED(411, "Length Required"),
+ PRECONDITION_FAILED(412, "Precondition Failed"), REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"),
+ REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"), UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
+ REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"),
+ EXPECTATION_FAILED(417, "Expectation Failed"), PRECONDITION_REQUIRED(428, "Precondition Required"),
- INTERNAL_SERVER_ERROR(500, "Internal Server Error"), NOT_IMPLEMENTED(501, "Not Implemented"), BAD_GATEWAY(502, "Bad Gateway"), SERVICE_UNAVAILABLE(503, "Service Unavailable"), GATEWAY_TIMEOUT(504, "Gateway Timeout"), HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version Not Supported");
+ INTERNAL_SERVER_ERROR(500, "Internal Server Error"), NOT_IMPLEMENTED(501, "Not Implemented"), BAD_GATEWAY(502,
+ "Bad Gateway"), SERVICE_UNAVAILABLE(503, "Service Unavailable"), GATEWAY_TIMEOUT(504, "Gateway Timeout"),
+ HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version Not Supported");
private final int code;
private final String info;
@@ -43,7 +55,7 @@ public enum HttpStatusCodes {
/**
* Convert a numerical status code into the corresponding status enum object.
- *
+ *
* @param statusCode the numerical status code
* @return the matching status enum object or null if no matching enum is defined
*/
@@ -58,7 +70,7 @@ public enum HttpStatusCodes {
/**
* Get the associated status code.
- *
+ *
* @return the status code.
*/
public int getStatusCode() {
@@ -67,7 +79,7 @@ public enum HttpStatusCodes {
/**
* Get the status code info.
- *
+ *
* @return the status code info
*/
public String getInfo() {
@@ -76,7 +88,7 @@ public enum HttpStatusCodes {
/**
* Get the status code info.
- *
+ *
* @return the status code info
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
index f2b0ecf..03a998e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
/**
* Inlinecount constants as described in the OData protocol
- *
+ *
*/
public enum InlineCount {
ALLPAGES, NONE;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
index 10e8d5b..be139de 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
/**
* HTTP header constants as used in the OData protocol
- *
+ *
*/
public class ODataHttpHeaders {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
index d583fd5..2cd2a6e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
/**
* The supported HTTP methods.
- *
+ *
*/
public enum ODataHttpMethod {
GET, PUT, POST, DELETE, PATCH, MERGE;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java
index 1efa8e2..ecb129b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
index 5561292..2126254 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import java.util.List;
* @org.apache.olingo.odata2.DoNotImplement
* Entity Data Model (EDM)
* <p>Interface representing a Entity Data Model as described in the Conceptual Schema Definition.
- *
+ *
*/
public interface Edm {
@@ -38,7 +38,8 @@ public interface Edm {
public static final String NAMESPACE_M_2007_08 = "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";
public static final String NAMESPACE_EDMX_2007_06 = "http://schemas.microsoft.com/ado/2007/06/edmx";
public static final String NAMESPACE_REL_2007_08 = "http://schemas.microsoft.com/ado/2007/08/dataservices/related/";
- public static final String NAMESPACE_REL_ASSOC_2007_08 = "http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/";
+ public static final String NAMESPACE_REL_ASSOC_2007_08 =
+ "http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/";
public static final String NAMESPACE_SCHEME_2007_08 = "http://schemas.microsoft.com/ado/2007/08/dataservices/scheme";
public static final String NAMESPACE_XML_1998 = "http://www.w3.org/XML/1998/namespace";
public static final String PREFIX_EDM = "edm";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
index 180bd6f..cc45a9c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,8 +21,9 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* A CSDL Action Element
- * <p>EdmAction can either be Cascade or None. Cascade implies that a delete operation on an entity also should delete the relationship instances.
- *
+ * <p>EdmAction can either be Cascade or None. Cascade implies that a delete operation on an entity also should delete
+ * the relationship instances.
+ *
*/
public enum EdmAction {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
index 186494a..55120c5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
* EdmAnnotatable can be applied to CSDL elements as described in the Conceptual Schema Definition Language.
- *
+ *
*/
public interface EdmAnnotatable {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
index 7c2778d..2cc526d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,9 +20,9 @@ package org.apache.olingo.odata2.api.edm;
/**
* @org.apache.olingo.odata2.DoNotImplement
- * A CSDL AnnotationAttribute element.
+ * A CSDL AnnotationAttribute element.
* <p>EdmAnnotationAttribute is a custom XML attribute which can be applied to a CSDL element.
- *
+ *
*/
public interface EdmAnnotationAttribute {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
index a4e33ef..5dabffd 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -26,8 +26,8 @@ import org.apache.olingo.odata2.api.edm.provider.AnnotationElement;
/**
* @org.apache.olingo.odata2.DoNotImplement
* A CSDL AnnotationElement element
- * <p>EdmAnnotationElement is a custom XML element which can be applied to a CSDL element.
- *
+ * <p>EdmAnnotationElement is a custom XML element which can be applied to a CSDL element.
+ *
*/
public interface EdmAnnotationElement {
[18/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java
index bf9ebeb..6e84b1d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -73,17 +73,39 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
}
public static final String EMPLOYEE_1_XML =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/\" m:etag=\"W/"1"\">" +
- " <id>http://localhost:19000/Employees('1')</id>" +
- " <title type=\"text\">Walter Winter</title>" +
- " <updated>1999-01-01T00:00:00Z</updated>" +
- " <category term=\"RefScenario.Employee\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- " <link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>" +
- " <link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\" m:etag=\"mmEtag\"/>" +
- " <link href=\"Employees('1')/ne_Room\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room\" type=\"application/atom+xml; type=entry\" title=\"ne_Room\"/>" +
- " <link href=\"Employees('1')/ne_Manager\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager\" type=\"application/atom+xml; type=entry\" title=\"ne_Manager\"/>" +
- " <link href=\"Employees('1')/ne_Team\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team\" type=\"application/atom+xml; type=entry\" title=\"ne_Team\"/>" +
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/\" " +
+ "m:etag=\"W/"1"\">"
+ +
+ " <id>http://localhost:19000/Employees('1')</id>"
+ +
+ " <title type=\"text\">Walter Winter</title>"
+ +
+ " <updated>1999-01-01T00:00:00Z</updated>"
+ +
+ " <category term=\"RefScenario.Employee\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ " <link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>"
+ +
+ " <link href=\"Employees('1')/$value\" rel=\"edit-media\" " +
+ "type=\"application/octet-stream\" m:etag=\"mmEtag\"/>"
+ +
+ " <link href=\"Employees('1')/ne_Room\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"ne_Room\"/>"
+ +
+ " <link href=\"Employees('1')/ne_Manager\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"ne_Manager\"/>"
+ +
+ " <link href=\"Employees('1')/ne_Team\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"ne_Team\"/>"
+ +
" <content type=\"application/octet-stream\" src=\"Employees('1')/$value\"/>" +
" <m:properties>" +
" <d:EmployeeId>1</d:EmployeeId>" +
@@ -105,20 +127,40 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
"</entry>";
public static final String EMPLOYEE_1_ROOM_XML =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/\" m:etag=\"W/"1"\">" +
- " <id>http://localhost:19000/Employees('1')</id>" +
- " <title type=\"text\">Walter Winter</title>" +
- " <updated>1999-01-01T00:00:00Z</updated>" +
- " <category term=\"RefScenario.Employee\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- " <link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>" +
- " <link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\" m:etag=\"mmEtag\"/>" +
- " <link href=\"Employees('1')/ne_Room\" " +
- " rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room\" " +
- " type=\"application/atom+xml; type=entry\" title=\"ne_Room\">" +
- " <m:inline>" +
- " <entry m:etag=\"W/1\" xml:base=\"http://some.host.com/service.root/\">" +
- " <id>http://some.host.com/service.root/Rooms('1')</id><title type=\"text\">Room 1</title><updated>2013-04-10T10:19:12Z</updated>" +
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/\" " +
+ "m:etag=\"W/"1"\">"
+ +
+ " <id>http://localhost:19000/Employees('1')</id>"
+ +
+ " <title type=\"text\">Walter Winter</title>"
+ +
+ " <updated>1999-01-01T00:00:00Z</updated>"
+ +
+ " <category term=\"RefScenario.Employee\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ " <link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>"
+ +
+ " <link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\" " +
+ "m:etag=\"mmEtag\"/>"
+ +
+ " <link href=\"Employees('1')/ne_Room\" "
+ +
+ " rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room\" "
+ +
+ " type=\"application/atom+xml; type=entry\" title=\"ne_Room\">"
+ +
+ " <m:inline>"
+ +
+ " <entry m:etag=\"W/1\" xml:base=\"http://some.host.com/service.root/\">"
+ +
+ " <id>http://some.host.com/service.root/Rooms('1')</id><title " +
+ "type=\"text\">Room 1</title><updated>2013-04-10T10:19:12Z</updated>"
+ +
" <content type=\"application/xml\">" +
" <m:properties>" +
" <d:Id>1</d:Id>" +
@@ -138,14 +180,27 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
"</entry>";
public static final String EMPLOYEE_1_NULL_ROOM_XML =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/\" m:etag=\"W/"1"\">" +
- " <id>http://localhost:19000/Employees('1')</id>" +
- " <title type=\"text\">Walter Winter</title>" +
- " <updated>1999-01-01T00:00:00Z</updated>" +
- " <category term=\"RefScenario.Employee\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- " <link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>" +
- " <link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\" m:etag=\"mmEtag\"/>" +
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/\" " +
+ "m:etag=\"W/"1"\">"
+ +
+ " <id>http://localhost:19000/Employees('1')</id>"
+ +
+ " <title type=\"text\">Walter Winter</title>"
+ +
+ " <updated>1999-01-01T00:00:00Z</updated>"
+ +
+ " <category term=\"RefScenario.Employee\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ " <link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>"
+ +
+ " <link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\" " +
+ "m:etag=\"mmEtag\"/>"
+ +
" <link href=\"Employees('1')/ne_Room\" " +
" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room\" " +
" type=\"application/atom+xml; type=entry\" title=\"ne_Room\">" +
@@ -159,15 +214,32 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
"</entry>";
private static final String ROOM_1_XML =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
- " <id>http://localhost:19000/test/Rooms('1')</id>" +
- " <title type=\"text\">Room 1</title>" +
- " <updated>2013-01-11T13:50:50.541+01:00</updated>" +
- " <category term=\"RefScenario.Room\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- " <link href=\"Rooms('1')\" rel=\"edit\" title=\"Room\"/>" +
- " <link href=\"Rooms('1')/nr_Employees\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees\" type=\"application/atom+xml; type=feed\" title=\"nr_Employees\"/>" +
- " <link href=\"Rooms('1')/nr_Building\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building\" type=\"application/atom+xml; type=entry\" title=\"nr_Building\"/>" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
+ " <id>http://localhost:19000/test/Rooms('1')</id>"
+ +
+ " <title type=\"text\">Room 1</title>"
+ +
+ " <updated>2013-01-11T13:50:50.541+01:00</updated>"
+ +
+ " <category term=\"RefScenario.Room\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ " <link href=\"Rooms('1')\" rel=\"edit\" title=\"Room\"/>"
+ +
+ " <link href=\"Rooms('1')/nr_Employees\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees\" " +
+ "type=\"application/atom+xml; type=feed\" title=\"nr_Employees\"/>"
+ +
+ " <link href=\"Rooms('1')/nr_Building\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"nr_Building\"/>"
+ +
" <content type=\"application/xml\">" +
" <m:properties>" +
" <d:Id>1</d:Id>" +
@@ -176,17 +248,35 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
"</entry>";
private static final String ROOM_1_NULL_EMPLOYEE_XML =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
- " <id>http://localhost:19000/test/Rooms('1')</id>" +
- " <title type=\"text\">Room 1</title>" +
- " <updated>2013-01-11T13:50:50.541+01:00</updated>" +
- " <category term=\"RefScenario.Room\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- " <link href=\"Rooms('1')\" rel=\"edit\" title=\"Room\"/>" +
- " <link href=\"Rooms('1')/nr_Employees\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees\" " +
- " type=\"application/atom+xml; type=feed\" title=\"nr_Employees\">" +
- " <m:inline/> </link> " +
- " <link href=\"Rooms('1')/nr_Building\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building\" type=\"application/atom+xml; type=entry\" title=\"nr_Building\"/>" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
+ " <id>http://localhost:19000/test/Rooms('1')</id>"
+ +
+ " <title type=\"text\">Room 1</title>"
+ +
+ " <updated>2013-01-11T13:50:50.541+01:00</updated>"
+ +
+ " <category term=\"RefScenario.Room\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ " <link href=\"Rooms('1')\" rel=\"edit\" title=\"Room\"/>"
+ +
+ " <link href=\"Rooms('1')/nr_Employees\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees\" "
+ +
+ " type=\"application/atom+xml; type=feed\" title=\"nr_Employees\">"
+ +
+ " <m:inline/> </link> "
+ +
+ " <link href=\"Rooms('1')/nr_Building\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"nr_Building\"/>"
+ +
" <content type=\"application/xml\">" +
" <m:properties>" +
" <d:Id>1</d:Id>" +
@@ -194,49 +284,69 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
" </content>" +
"</entry>";
- private static final String PHOTO_XML = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
- "<entry m:etag=\"W/"1"\" xml:base=\"http://localhost:19000/test\" " +
- "xmlns=\"http://www.w3.org/2005/Atom\" " +
- "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
- "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\">" +
- " <id>http://localhost:19000/test/Container2.Photos(Id=1,Type='image%2Fpng')</id>" +
- " <title type=\"text\">Photo1</title><updated>2013-01-16T12:57:43Z</updated>" +
- " <category term=\"RefScenario2.Photo\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- " <link href=\"Container2.Photos(Id=1,Type='image%2Fpng')\" rel=\"edit\" title=\"Photo\"/>" +
- " <link href=\"Container2.Photos(Id=1,Type='image%2Fpng')/$value\" rel=\"edit-media\" type=\"image/png\"/>" +
- " <ру:Содержание xmlns:ру=\"http://localhost\">Образ</ру:Содержание>" +
- " <content type=\"image/png\" src=\"Container2.Photos(Id=1,Type='image%2Fpng')/$value\"/>" +
- " <m:properties>" +
- " <d:Id>1</d:Id>" +
- " <d:Name>Photo1</d:Name>" +
- " <d:Type>image/png</d:Type>" +
- " </m:properties>" +
- "</entry>";
-
- private static final String PHOTO_XML_INVALID_MAPPING = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
- "<entry m:etag=\"W/"1"\" xml:base=\"http://localhost:19000/test\" " +
- "xmlns=\"http://www.w3.org/2005/Atom\" " +
- "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
- "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\">" +
- " <id>http://localhost:19000/test/Container2.Photos(Id=1,Type='image%2Fpng')</id>" +
- " <title type=\"text\">Photo1</title><updated>2013-01-16T12:57:43Z</updated>" +
- " <category term=\"RefScenario2.Photo\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- " <link href=\"Container2.Photos(Id=1,Type='image%2Fpng')\" rel=\"edit\" title=\"Photo\"/>" +
- " <link href=\"Container2.Photos(Id=1,Type='image%2Fpng')/$value\" rel=\"edit-media\" type=\"image/png\"/>" +
- " <ру:Содержание xmlns:ру=\"http://localhost\">Образ</ру:Содержание>" +
- " <ig:ignore xmlns:ig=\"http://localhost\">ignore</ig:ignore>" + // 406 Bad Request
- " <content type=\"image/png\" src=\"Container2.Photos(Id=1,Type='image%2Fpng')/$value\"/>" +
- " <m:properties>" +
- " <d:Id>1</d:Id>" +
- " <d:Name>Photo1</d:Name>" +
- " <d:Type>image/png</d:Type>" +
- " </m:properties>" +
- "</entry>";
+ private static final String PHOTO_XML =
+ "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+ +
+ "<entry m:etag=\"W/"1"\" xml:base=\"http://localhost:19000/test\" "
+ +
+ "xmlns=\"http://www.w3.org/2005/Atom\" "
+ +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" "
+ +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\">"
+ +
+ " <id>http://localhost:19000/test/Container2.Photos(Id=1,Type='image%2Fpng')</id>"
+ +
+ " <title type=\"text\">Photo1</title><updated>2013-01-16T12:57:43Z</updated>"
+ +
+ " <category term=\"RefScenario2.Photo\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ " <link href=\"Container2.Photos(Id=1,Type='image%2Fpng')\" rel=\"edit\" title=\"Photo\"/>" +
+ " <link href=\"Container2.Photos(Id=1,Type='image%2Fpng')/$value\" rel=\"edit-media\" type=\"image/png\"/>" +
+ " <ру:Содержание xmlns:ру=\"http://localhost\">Образ</ру:Содержание>" +
+ " <content type=\"image/png\" src=\"Container2.Photos(Id=1,Type='image%2Fpng')/$value\"/>" +
+ " <m:properties>" +
+ " <d:Id>1</d:Id>" +
+ " <d:Name>Photo1</d:Name>" +
+ " <d:Type>image/png</d:Type>" +
+ " </m:properties>" +
+ "</entry>";
+
+ private static final String PHOTO_XML_INVALID_MAPPING =
+ "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+ +
+ "<entry m:etag=\"W/"1"\" xml:base=\"http://localhost:19000/test\" "
+ +
+ "xmlns=\"http://www.w3.org/2005/Atom\" "
+ +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" "
+ +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\">"
+ +
+ " <id>http://localhost:19000/test/Container2.Photos(Id=1,Type='image%2Fpng')</id>"
+ +
+ " <title type=\"text\">Photo1</title><updated>2013-01-16T12:57:43Z</updated>"
+ +
+ " <category term=\"RefScenario2.Photo\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ " <link href=\"Container2.Photos(Id=1,Type='image%2Fpng')\" rel=\"edit\" title=\"Photo\"/>" +
+ " <link href=\"Container2.Photos(Id=1,Type='image%2Fpng')/$value\" rel=\"edit-media\" type=\"image/png\"/>" +
+ " <ру:Содержание xmlns:ру=\"http://localhost\">Образ</ру:Содержание>" +
+ " <ig:ignore xmlns:ig=\"http://localhost\">ignore</ig:ignore>" + // 406 Bad Request
+ " <content type=\"image/png\" src=\"Container2.Photos(Id=1,Type='image%2Fpng')/$value\"/>" +
+ " <m:properties>" +
+ " <d:Id>1</d:Id>" +
+ " <d:Name>Photo1</d:Name>" +
+ " <d:Type>image/png</d:Type>" +
+ " </m:properties>" +
+ "</entry>";
public XmlEntityConsumerTest() {
// CHECKSTYLE:OFF:Regexp
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); //NOSONAR
- System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); //NOSONAR
+ System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); // NOSONAR
+ System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); // NOSONAR
// CHECKSTYLE:ON
}
@@ -267,7 +377,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
}
@Override
- public EntityProviderReadProperties receiveReadProperties(final EntityProviderReadProperties readProperties, final EdmNavigationProperty navString) {
+ public EntityProviderReadProperties receiveReadProperties(final EntityProviderReadProperties readProperties,
+ final EdmNavigationProperty navString) {
Map<String, Object> typeMappings = new HashMap<String, Object>();
typeMappings.put("EmployeeName", String.class);
return EntityProviderReadProperties.initFrom(readProperties).addTypeMappings(typeMappings).build();
@@ -318,7 +429,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
}
@Override
- public EntityProviderReadProperties receiveReadProperties(final EntityProviderReadProperties readProperties, final EdmNavigationProperty navigationProperty) {
+ public EntityProviderReadProperties receiveReadProperties(final EntityProviderReadProperties readProperties,
+ final EdmNavigationProperty navigationProperty) {
return readProperties;
}
}
@@ -344,7 +456,7 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
assertNotNull(feedMetadata);
String deltaLink = feedMetadata.getDeltaLink();
- //Null means no deltaLink found
+ // Null means no deltaLink found
assertNotNull(deltaLink);
assertEquals("http://thisisadeltalink", deltaLink);
@@ -668,7 +780,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry entry = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry entry =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
// validate
assertNotNull(entry);
@@ -691,7 +804,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry entry = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry entry =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
// validate
assertNotNull(entry);
@@ -718,7 +832,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry entry = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry entry =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
// validate
assertNotNull(entry);
@@ -746,7 +861,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry entry = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry entry =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
// validate
assertNotNull(entry);
@@ -769,7 +885,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry entry = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry entry =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
// validate
assertNotNull(entry);
@@ -792,7 +909,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry entry = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry entry =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
// validate
assertNotNull(entry);
@@ -820,7 +938,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
InputStream reqContent = createContentAsStream(content);
// execute
- readAndExpectException(entitySet, reqContent, EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"));
+ readAndExpectException(entitySet, reqContent,
+ EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"));
}
/**
@@ -840,7 +959,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
InputStream reqContent = createContentAsStream(content);
// execute
- readAndExpectException(entitySet, reqContent, EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"));
+ readAndExpectException(entitySet, reqContent,
+ EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"));
}
/**
@@ -891,13 +1011,19 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test(expected = EntityProviderException.class)
public void validationOfWrongXmlEncodingUtf32() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-32'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='UTF-32'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
"</entry>";
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
- readAndExpectException(entitySet, reqContent, EntityProviderException.UNSUPPORTED_CHARACTER_ENCODING.addContent("UTF-32"));
+ readAndExpectException(entitySet, reqContent, EntityProviderException.UNSUPPORTED_CHARACTER_ENCODING
+ .addContent("UTF-32"));
}
/**
@@ -908,13 +1034,19 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test(expected = EntityProviderException.class)
public void validationOfWrongXmlEncodingIso8859_1() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='iso-8859-1'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='iso-8859-1'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
"</entry>";
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
- readAndExpectException(entitySet, reqContent, EntityProviderException.UNSUPPORTED_CHARACTER_ENCODING.addContent("iso-8859-1"));
+ readAndExpectException(entitySet, reqContent, EntityProviderException.UNSUPPORTED_CHARACTER_ENCODING
+ .addContent("iso-8859-1"));
}
/**
@@ -926,8 +1058,13 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test
public void validationCaseInsensitiveXmlEncodingUtf8() throws Exception {
String room =
- "<?xml version='1.0' encoding='uTf-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='uTf-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
" <id>http://localhost:19000/test/Rooms('1')</id>" +
" <title type=\"text\">Room 1</title>" +
" <updated>2013-01-11T13:50:50.541+01:00</updated>" +
@@ -941,14 +1078,16 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(room);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
assertNotNull(result);
assertEquals("1", result.getProperties().get("Id"));
}
/**
- * For none media resource if <code>properties</code> tag is not within <code>content</code> tag it results in an exception.
+ * For none media resource if <code>properties</code> tag is not within <code>content</code> tag it results in an
+ * exception.
*
* OData specification v2: 2.2.6.2.2 Entity Type (as an Atom Entry Element)
*
@@ -957,8 +1096,13 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test(expected = EntityProviderException.class)
public void validationOfWrongPropertiesTagPositionForNoneMediaLinkEntry() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\"" +
+ " xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
" <id>http://localhost:19000/test/Rooms('1')</id>" +
" <title type=\"text\">Room 1</title>" +
" <updated>2013-01-11T13:50:50.541+01:00</updated>" +
@@ -970,7 +1114,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
- readAndExpectException(entitySet, reqContent, EntityProviderException.INVALID_PARENT_TAG.addContent("content").addContent("properties"));
+ readAndExpectException(entitySet, reqContent, EntityProviderException.INVALID_PARENT_TAG.addContent("content")
+ .addContent("properties"));
}
/**
@@ -984,8 +1129,13 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test(expected = EntityProviderException.class)
public void validationOfWrongPropertiesTagPositionForMediaLinkEntry() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
" <id>http://localhost:19000/test/Employees('1')</id>" +
" <title type=\"text\">Walter Winter</title>" +
" <updated>2013-01-11T13:50:50.541+01:00</updated>" +
@@ -998,14 +1148,20 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
- readAndExpectException(entitySet, reqContent, EntityProviderException.INVALID_PARENT_TAG.addContent("properties").addContent("content"));
+ readAndExpectException(entitySet, reqContent, EntityProviderException.INVALID_PARENT_TAG.addContent("properties")
+ .addContent("content"));
}
@Test
public void validationOfNamespacesSuccess() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
" <id>http://localhost:19000/test/Rooms('1')</id>" +
" <title type=\"text\">Room 1</title>" +
" <updated>2013-01-11T13:50:50.541+01:00</updated>" +
@@ -1019,11 +1175,11 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
assertNotNull(result);
}
-
@Test
public void validationOfNamespaceAtPropertiesSuccess() throws Exception {
String roomWithValidNamespaces =
@@ -1042,11 +1198,12 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
assertNotNull(result);
}
- @Test(expected=EntityProviderException.class)
+ @Test(expected = EntityProviderException.class)
public void validationOfNamespaceAtTagsMissing() throws Exception {
String roomWithValidNamespaces =
"<?xml version='1.0' encoding='UTF-8'?>" +
@@ -1063,7 +1220,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
- readAndExpectException(entitySet, reqContent, EntityProviderException.EXCEPTION_OCCURRED.addContent("WstxParsingException"));
+ readAndExpectException(entitySet, reqContent, EntityProviderException.EXCEPTION_OCCURRED
+ .addContent("WstxParsingException"));
}
/**
@@ -1097,13 +1255,14 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
assertNotNull(result);
}
/**
* Add <code>unknown property</code> in own namespace which is defined in entry tag.
- *
+ *
* @throws Exception
*/
@Test
@@ -1134,7 +1293,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
assertNotNull(result);
}
@@ -1146,8 +1306,13 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test
public void validationOfUnknownPropertyDefaultNamespaceSuccess() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
" <id>http://localhost:19000/test/Rooms('1')</id>" +
" <title type=\"text\">Room 1</title>" +
" <updated>2013-01-11T13:50:50.541+01:00</updated>" +
@@ -1162,32 +1327,48 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
assertNotNull(result);
}
/**
* Add <code>unknown property</code> in own namespace which is defined directly in unknown tag.
- *
+ *
* @throws Exception
*/
@Test
public void validationOfUnknownPropertyInlineNamespaceSuccess() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
- " xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
- " xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
- " xml:base=\"http://localhost:19000/test/\" " +
- " m:etag=\"W/"1"\">" +
- "" +
- " <id>http://localhost:19000/test/Rooms('1')</id>" +
- " <title type=\"text\">Room 1</title>" +
- " <updated>2013-01-11T13:50:50.541+01:00</updated>" +
- " <content type=\"application/xml\">" +
- " <m:properties>" +
- " <d:Id>1</d:Id>" +
- " <more:somePropertyToBeIgnored xmlns:more=\"http://sample.com/more\">ignore me</more:somePropertyToBeIgnored>" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" "
+ +
+ " xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" "
+ +
+ " xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" "
+ +
+ " xml:base=\"http://localhost:19000/test/\" "
+ +
+ " m:etag=\"W/"1"\">"
+ +
+ ""
+ +
+ " <id>http://localhost:19000/test/Rooms('1')</id>"
+ +
+ " <title type=\"text\">Room 1</title>"
+ +
+ " <updated>2013-01-11T13:50:50.541+01:00</updated>"
+ +
+ " <content type=\"application/xml\">"
+ +
+ " <m:properties>"
+ +
+ " <d:Id>1</d:Id>"
+ +
+ " <more:somePropertyToBeIgnored " +
+ "xmlns:more=\"http://sample.com/more\">ignore me</more:somePropertyToBeIgnored>"
+ +
" <d:Seats>11</d:Seats>" +
" <d:Name>Room 42</d:Name>" +
" <d:Version>4711</d:Version>" +
@@ -1198,7 +1379,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
assertNotNull(result);
}
@@ -1217,7 +1399,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
- readAndExpectException(entitySet, reqContent, EntityProviderException.EXCEPTION_OCCURRED.addContent("WstxParsingException"));
+ readAndExpectException(entitySet, reqContent, EntityProviderException.EXCEPTION_OCCURRED
+ .addContent("WstxParsingException"));
}
/**
@@ -1286,7 +1469,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(room);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
assertNotNull(result);
}
@@ -1324,7 +1508,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(room);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
assertNotNull(result);
}
@@ -1362,15 +1547,21 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(room);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
assertNotNull(result);
}
@Test(expected = EntityProviderException.class)
public void validationOfNamespacesMissingM_NamespaceAtProperties() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
" <id>http://localhost:19000/test/Rooms('1')</id>" +
" <title type=\"text\">Room 1</title>" +
" <updated>2013-01-11T13:50:50.541+01:00</updated>" +
@@ -1383,7 +1574,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
- readAndExpectException(entitySet, reqContent, EntityProviderException.EXCEPTION_OCCURRED.addContent("WstxParsingException"));
+ readAndExpectException(entitySet, reqContent, EntityProviderException.EXCEPTION_OCCURRED
+ .addContent("WstxParsingException"));
}
/**
@@ -1394,8 +1586,13 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test
public void validationOfNamespacesMissingD_NamespaceAtKeyPropertyTag() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
" <id>http://localhost:19000/test/Rooms('1')</id>" +
" <title type=\"text\">Room 1</title>" +
" <updated>2013-01-11T13:50:50.541+01:00</updated>" +
@@ -1412,7 +1609,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
assertNotNull(result);
}
@@ -1422,8 +1620,13 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
*/
public void validationOfNamespacesMissingD_NamespaceAtNonNullableTag() throws Exception {
String roomWithValidNamespaces =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
" <id>http://localhost:19000/test/Rooms('1')</id>" +
" <title type=\"text\">Room 1</title>" +
" <updated>2013-01-11T13:50:50.541+01:00</updated>" +
@@ -1442,18 +1645,23 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
Mockito.when(facets.isNullable()).thenReturn(false);
InputStream reqContent = createContentAsStream(roomWithValidNamespaces);
- final ODataEntry result = new XmlEntityConsumer().readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ final ODataEntry result =
+ new XmlEntityConsumer().readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(
+ false).build());
assertNotNull(result);
}
- private void readAndExpectException(final EdmEntitySet entitySet, final InputStream reqContent, final MessageReference messageReference) throws ODataMessageException {
+ private void readAndExpectException(final EdmEntitySet entitySet, final InputStream reqContent,
+ final MessageReference messageReference) throws ODataMessageException {
readAndExpectException(entitySet, reqContent, true, messageReference);
}
- private void readAndExpectException(final EdmEntitySet entitySet, final InputStream reqContent, final boolean merge, final MessageReference messageReference) throws ODataMessageException {
+ private void readAndExpectException(final EdmEntitySet entitySet, final InputStream reqContent, final boolean merge,
+ final MessageReference messageReference) throws ODataMessageException {
try {
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(merge).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(merge).build());
assertNotNull(result);
Assert.fail("Expected exception with MessageReference '" + messageReference.getKey() + "' was not thrown.");
} catch (ODataMessageException e) {
@@ -1471,7 +1679,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(true).build());
// verify
EntryMetadata metadata = result.getMetadata();
@@ -1512,7 +1721,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(true).build());
// verify
List<String> associationUris = result.getMetadata().getAssociationUris("ne_Room");
@@ -1536,7 +1746,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataFeed feedResult = xec.readFeed(entitySet, contentAsStream, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataFeed feedResult =
+ xec.readFeed(entitySet, contentAsStream, EntityProviderReadProperties.init().mergeSemantic(false).build());
// verify feed result
// metadata
@@ -1581,7 +1792,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataFeed feedResult = xec.readFeed(entitySet, contentAsStream, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataFeed feedResult =
+ xec.readFeed(entitySet, contentAsStream, EntityProviderReadProperties.init().mergeSemantic(false).build());
// verify feed result
// metadata
@@ -1625,7 +1837,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -1660,7 +1873,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -1698,7 +1912,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -1730,7 +1945,9 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
"<d:EntryDate m:null='true' />");
InputStream contentBody = createContentAsStream(content);
- final ODataEntry result = new XmlEntityConsumer().readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ final ODataEntry result =
+ new XmlEntityConsumer().readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(
+ true).build());
final Map<String, Object> properties = result.getProperties();
assertEquals(9, properties.size());
@@ -1742,12 +1959,15 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
public void readEntryTooManyValues() throws Exception {
// prepare
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
- String content = EMPLOYEE_1_XML.replace("<d:Age>52</d:Age>", "<d:Age>52</d:Age><d:SomeUnknownTag>SomeUnknownValue</d:SomeUnknownTag>");
+ String content =
+ EMPLOYEE_1_XML.replace("<d:Age>52</d:Age>",
+ "<d:Age>52</d:Age><d:SomeUnknownTag>SomeUnknownValue</d:SomeUnknownTag>");
InputStream contentBody = createContentAsStream(content);
// execute
try {
- new XmlEntityConsumer().readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ new XmlEntityConsumer().readEntry(entitySet, contentBody, EntityProviderReadProperties.init()
+ .mergeSemantic(false).build());
} catch (EntityProviderException e) {
// do some assertions...
assertEquals(EntityProviderException.INVALID_PROPERTY.getKey(), e.getMessageReference().getKey());
@@ -1767,7 +1987,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(true).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -1807,7 +2028,7 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
XmlEntityConsumer xec = new XmlEntityConsumer();
ODataEntry result = xec.readEntry(entitySet, contentBody,
EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(
- createTypeMappings("Age", Long.class, // test unused type mapping
+ createTypeMappings("Age", Long.class, // test unused type mapping
"EntryDate", Date.class))
.build());
@@ -1842,7 +2063,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
InputStream content = createContentAsStream(EMPLOYEE_1_XML);
- ODataEntry result = xec.readEntry(entitySet, content, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, content, EntityProviderReadProperties.init().mergeSemantic(true).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -1874,7 +2096,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
InputStream content = createContentAsStream(EMPLOYEE_1_XML);
- ODataEntry result = xec.readEntry(entitySet, content, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, content, EntityProviderReadProperties.init().mergeSemantic(true).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -1937,8 +2160,10 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
InputStream content = createContentAsStream(EMPLOYEE_1_XML);
- ODataEntry result = xec.readEntry(entitySet, content,
- EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(createTypeMappings("EmployeeName", Integer.class)).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, content,
+ EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(
+ createTypeMappings("EmployeeName", Integer.class)).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -1951,8 +2176,10 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
InputStream content = createContentAsStream(EMPLOYEE_1_XML);
- ODataEntry result = xec.readEntry(entitySet, content,
- EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(createTypeMappings("EmployeeName", Object.class)).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, content,
+ EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(
+ createTypeMappings("EmployeeName", Object.class)).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -1974,10 +2201,11 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
InputStream content = createContentAsStream(EMPLOYEE_1_XML);
- ODataEntry result = xec.readEntry(entitySet, content, EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(
- createTypeMappings("Age", Short.class,
- "Heidelberg", String.class,
- "EntryDate", Long.class)).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, content, EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(
+ createTypeMappings("Age", Short.class,
+ "Heidelberg", String.class,
+ "EntryDate", Long.class)).build());
// verify
Map<String, Object> properties = result.getProperties();
@@ -2006,7 +2234,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos");
InputStream reqContent = createContentAsStream(PHOTO_XML);
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(false).build());
// verify
EntryMetadata entryMetadata = result.getMetadata();
@@ -2025,7 +2254,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos");
InputStream reqContent = createContentAsStream(PHOTO_XML);
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
// verify
EntryMetadata entryMetadata = result.getMetadata();
@@ -2051,7 +2281,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
public void readIncompleteEntry() throws Exception {
final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(ROOM_1_XML);
- final ODataEntry result = new XmlEntityConsumer().readEntry(entitySet, reqContent, EntityProviderReadProperties.init().build());
+ final ODataEntry result =
+ new XmlEntityConsumer().readEntry(entitySet, reqContent, EntityProviderReadProperties.init().build());
final EntryMetadata entryMetadata = result.getMetadata();
assertEquals("http://localhost:19000/test/Rooms('1')", entryMetadata.getId());
@@ -2076,7 +2307,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
InputStream reqContent = createContentAsStream(ROOM_1_XML);
- ODataEntry result = xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, reqContent, EntityProviderReadProperties.init().mergeSemantic(true).build());
// verify
EntryMetadata entryMetadata = result.getMetadata();
@@ -2097,11 +2329,14 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test
public void readProperty() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">67</Age>";
InputStream content = createContentAsStream(xml);
- Map<String, Object> value = new XmlEntityConsumer().readProperty(property, content, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ Map<String, Object> value =
+ new XmlEntityConsumer().readProperty(property, content, EntityProviderReadProperties.init().mergeSemantic(true)
+ .build());
assertEquals(Integer.valueOf(67), value.get("Age"));
}
@@ -2110,7 +2345,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
public void readStringPropertyValue() throws Exception {
String xml = "<EmployeeName xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">Max Mustermann</EmployeeName>";
InputStream content = createContentAsStream(xml);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
Object result = new XmlEntityConsumer().readPropertyValue(property, content, String.class);
@@ -2122,7 +2358,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
String name = StringHelper.generateData(77777);
String xml = "<EmployeeName xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">" + name + "</EmployeeName>";
InputStream content = createContentAsStream(xml);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
Object result = new XmlEntityConsumer().readPropertyValue(property, content, String.class);
@@ -2131,12 +2368,15 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
@Test
public void testReadIntegerPropertyAsLong() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">42</Age>";
InputStream content = createContentAsStream(xml);
- Map<String, Object> value = new XmlEntityConsumer().readProperty(property, content,
- EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(createTypeMappings("Age", Long.class)).build());
+ Map<String, Object> value =
+ new XmlEntityConsumer().readProperty(property, content,
+ EntityProviderReadProperties.init().mergeSemantic(true).addTypeMappings(
+ createTypeMappings("Age", Long.class)).build());
assertEquals(Long.valueOf(42), value.get("Age"));
}
@@ -2145,7 +2385,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
public void readStringPropertyValueWithInvalidMapping() throws Exception {
String xml = "<EmployeeName xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">Max Mustermann</EmployeeName>";
InputStream content = createContentAsStream(xml);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
new XmlEntityConsumer().readPropertyValue(property, content, Integer.class);
}
@@ -2154,16 +2395,19 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
public void readPropertyWrongNamespace() throws Exception {
String xml = "<Age xmlns=\"" + Edm.NAMESPACE_M_2007_08 + "\">1</Age>";
InputStream content = createContentAsStream(xml);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
new XmlEntityConsumer().readPropertyValue(property, content, Integer.class);
}
@Test(expected = EntityProviderException.class)
public void readPropertyWrongClosingNamespace() throws Exception {
- String xml = "<d:Age xmlns:d=\"" + Edm.NAMESPACE_D_2007_08 + "\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">1</m:Age>";
+ String xml =
+ "<d:Age xmlns:d=\"" + Edm.NAMESPACE_D_2007_08 + "\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">1</m:Age>";
InputStream content = createContentAsStream(xml);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
new XmlEntityConsumer().readPropertyValue(property, content, Integer.class);
}
@@ -2177,7 +2421,8 @@ public class XmlEntityConsumerTest extends AbstractConsumerTest {
"<title type=\"text\"><title>Walter Winter</title></title>"));
// execute
XmlEntityConsumer xec = new XmlEntityConsumer();
- ODataEntry result = xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
+ ODataEntry result =
+ xec.readEntry(entitySet, contentBody, EntityProviderReadProperties.init().mergeSemantic(false).build());
// verify
String id = result.getMetadata().getId();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
index 399215a..eca718c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -56,7 +56,7 @@ public class XmlFeedConsumerTest extends AbstractConsumerTest {
assertNotNull(feedMetadata);
int inlineCount = feedMetadata.getInlineCount();
- //Null means no inlineCount found
+ // Null means no inlineCount found
assertNotNull(inlineCount);
assertEquals(6, inlineCount);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java
index 41a5665..0c20a7f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -48,8 +48,8 @@ public class XmlLinkConsumerTest extends AbstractConsumerTest {
public XmlLinkConsumerTest() {
// CHECKSTYLE:OFF:Regexp
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); //NOSONAR
- System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); //NOSONAR
+ System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); // NOSONAR
+ System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); // NOSONAR
// CHECKSTYLE:ON
}
@@ -93,7 +93,8 @@ public class XmlLinkConsumerTest extends AbstractConsumerTest {
@Test(expected = EntityProviderException.class)
public void wrongNamespace() throws Exception {
- new XmlLinkConsumer().readLink(createReaderForTest(SINGLE_LINK.replace(Edm.NAMESPACE_D_2007_08, Edm.NAMESPACE_M_2007_08), true), null);
+ new XmlLinkConsumer().readLink(createReaderForTest(SINGLE_LINK.replace(Edm.NAMESPACE_D_2007_08,
+ Edm.NAMESPACE_M_2007_08), true), null);
}
@Test(expected = EntityProviderException.class)
[42/59] [abbrv] git commit: cleanup of odata fit tests
Posted by ch...@apache.org.
cleanup of odata fit tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/b18130ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/b18130ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/b18130ac
Branch: refs/heads/master
Commit: b18130acd756c58ba85b5120240ec2b0bab69721
Parents: a030e42
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 14:57:00 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 14:57:00 2013 +0200
----------------------------------------------------------------------
.../odata2/fit/basic/AbstractBasicTest.java | 31 +-
.../odata2/fit/basic/AcceptHeaderTypeTest.java | 50 +-
.../olingo/odata2/fit/basic/BasicBatchTest.java | 49 +-
.../olingo/odata2/fit/basic/BasicHttpTest.java | 36 +-
.../ContentNegotiationDollarFormatTest.java | 47 +-
.../olingo/odata2/fit/basic/ContextTest.java | 36 +-
.../odata2/fit/basic/ErrorResponseTest.java | 33 +-
.../olingo/odata2/fit/basic/ExceptionsTest.java | 33 +-
.../olingo/odata2/fit/basic/FitLoadTest.java | 33 +-
.../fit/basic/HttpExceptionResponseTest.java | 55 +-
.../fit/basic/LanguageNegotiationTest.java | 39 +-
.../olingo/odata2/fit/basic/MetadataTest.java | 32 +-
.../fit/basic/RequestContentTypeTest.java | 31 +-
.../odata2/fit/basic/ServiceResolutionTest.java | 60 +-
.../olingo/odata2/fit/basic/UrlRewriteTest.java | 36 +-
.../odata2/fit/basic/issues/TestIssue105.java | 39 +-
.../odata2/fit/client/ClientBatchTest.java | 26 +-
.../olingo/odata2/fit/mapping/MapFactory.java | 26 +-
.../olingo/odata2/fit/mapping/MapProcessor.java | 50 +-
.../olingo/odata2/fit/mapping/MapProvider.java | 38 +-
.../olingo/odata2/fit/mapping/MappingTest.java | 35 +-
.../odata2/fit/ref/AbstractRefJsonTest.java | 26 +-
.../olingo/odata2/fit/ref/AbstractRefTest.java | 56 +-
.../odata2/fit/ref/AbstractRefXmlTest.java | 33 +-
.../apache/olingo/odata2/fit/ref/BatchTest.java | 61 +-
.../odata2/fit/ref/ContentNegotiationTest.java | 32 +-
.../odata2/fit/ref/DataServiceVersionTest.java | 32 +-
.../odata2/fit/ref/EntryJsonChangeTest.java | 70 ++-
.../fit/ref/EntryJsonCreateInlineTest.java | 101 ++--
.../odata2/fit/ref/EntryJsonCreateTest.java | 42 +-
.../odata2/fit/ref/EntryJsonReadOnlyTest.java | 39 +-
.../odata2/fit/ref/EntryXmlChangeTest.java | 70 ++-
.../odata2/fit/ref/EntryXmlCreateTest.java | 34 +-
.../odata2/fit/ref/EntryXmlReadOnlyTest.java | 93 ++-
.../odata2/fit/ref/FeedJsonReadOnlyTest.java | 35 +-
.../odata2/fit/ref/FeedXmlReadOnlyTest.java | 51 +-
.../odata2/fit/ref/FunctionImportJsonTest.java | 31 +-
.../odata2/fit/ref/FunctionImportXmlTest.java | 31 +-
.../odata2/fit/ref/LinksJsonChangeTest.java | 31 +-
.../odata2/fit/ref/LinksJsonReadOnlyTest.java | 31 +-
.../odata2/fit/ref/LinksXmlChangeTest.java | 37 +-
.../odata2/fit/ref/LinksXmlReadOnlyTest.java | 31 +-
.../olingo/odata2/fit/ref/MetadataTest.java | 561 ++++++++++++++-----
.../olingo/odata2/fit/ref/MiscChangeTest.java | 44 +-
.../olingo/odata2/fit/ref/MiscReadOnlyTest.java | 28 +-
.../odata2/fit/ref/PropertyJsonChangeTest.java | 40 +-
.../fit/ref/PropertyJsonReadOnlyTest.java | 31 +-
.../odata2/fit/ref/PropertyXmlChangeTest.java | 38 +-
.../odata2/fit/ref/PropertyXmlReadOnlyTest.java | 35 +-
.../olingo/odata2/fit/ref/ServiceJsonTest.java | 39 +-
.../olingo/odata2/fit/ref/ServiceXmlTest.java | 41 +-
.../AbstractContentNegotiationTest.java | 80 +--
.../BasicContentNegotiationTest.java | 115 ++--
.../ContentNegotiationGetRequestTest.java | 158 ++++--
.../ContentNegotiationPostRequestTest.java | 138 +++--
55 files changed, 1859 insertions(+), 1271 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
index 15e8a20..b0397aa 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -29,9 +29,6 @@ import java.net.URI;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
import org.apache.olingo.odata2.api.exception.ODataException;
@@ -39,6 +36,8 @@ import org.apache.olingo.odata2.api.processor.ODataContext;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.core.processor.ODataSingleProcessorService;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
index 59b2397..33b2e82 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -52,7 +52,8 @@ public class AcceptHeaderTypeTest extends AbstractBasicTest {
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
String contentType = "application/atom+xml";
- ODataResponse response = ODataResponse.status(HttpStatusCodes.OK).contentHeader(contentType).entity("Test passed.").build();
+ ODataResponse response =
+ ODataResponse.status(HttpStatusCodes.OK).contentHeader(contentType).entity("Test passed.").build();
when(processor.readEntity(any(GetEntityUriInfo.class), any(String.class))).thenReturn(response);
when(processor.readEntitySet(any(GetEntitySetUriInfo.class), any(String.class))).thenReturn(response);
@@ -64,7 +65,8 @@ public class AcceptHeaderTypeTest extends AbstractBasicTest {
return new EdmTestProvider();
}
- private HttpResponse testGetRequest(final String uriExtension, final String acceptHeader, final HttpStatusCodes expectedStatus, final String expectedContentType)
+ private HttpResponse testGetRequest(final String uriExtension, final String acceptHeader,
+ final HttpStatusCodes expectedStatus, final String expectedContentType)
throws ClientProtocolException, IOException, ODataException {
// prepare
ODataResponse expectedResponse = ODataResponse.contentHeader(expectedContentType).entity("Test passed.").build();
@@ -82,8 +84,10 @@ public class AcceptHeaderTypeTest extends AbstractBasicTest {
assertEquals(expectedStatus.getStatusCode(), response.getStatusLine().getStatusCode());
Header[] contentTypeHeaders = response.getHeaders("Content-Type");
assertEquals("Found more then one content type header in response.", 1, contentTypeHeaders.length);
- assertEquals("Received content type does not match expected.", expectedContentType, contentTypeHeaders[0].getValue());
- assertEquals("Received status code does not match expected.", expectedStatus.getStatusCode(), response.getStatusLine().getStatusCode());
+ assertEquals("Received content type does not match expected.", expectedContentType, contentTypeHeaders[0]
+ .getValue());
+ assertEquals("Received status code does not match expected.", expectedStatus.getStatusCode(), response
+ .getStatusLine().getStatusCode());
//
return response;
}
@@ -123,7 +127,8 @@ public class AcceptHeaderTypeTest extends AbstractBasicTest {
@Test
public void contentTypeApplicationXmlOnMetadataMultiAccept() throws Exception {
- testGetRequest("$metadata", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", HttpStatusCodes.OK, "application/xml");
+ testGetRequest("$metadata", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", HttpStatusCodes.OK,
+ "application/xml");
}
@Test
@@ -158,16 +163,19 @@ public class AcceptHeaderTypeTest extends AbstractBasicTest {
@Test
public void illegalLwsInAcceptHeaderParameter() throws Exception {
- testGetRequest("Employees('1')", "application/xml; param=\talskdf;", HttpStatusCodes.BAD_REQUEST, "application/xml");
+ testGetRequest("Employees('1')", "application/xml; param=\talskdf;", HttpStatusCodes.BAD_REQUEST,
+ "application/xml");
}
@Test
public void illegalSpacesBetweenAcceptHeaderParameterOnSet() throws Exception {
- testGetRequest("Employees", "application/xml; another= test ; param=alskdf", HttpStatusCodes.BAD_REQUEST, "application/xml");
+ testGetRequest("Employees", "application/xml; another= test ; param=alskdf", HttpStatusCodes.BAD_REQUEST,
+ "application/xml");
}
@Test
public void legalSpacesBetweenAcceptHeaderParameterOnSet() throws Exception {
- testGetRequest("Employees", "application/xml; another=test ; param=alskdf", HttpStatusCodes.NOT_ACCEPTABLE, "application/xml");
+ testGetRequest("Employees", "application/xml; another=test ; param=alskdf", HttpStatusCodes.NOT_ACCEPTABLE,
+ "application/xml");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
index ecf3351..761a3b5 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -66,7 +66,9 @@ import org.junit.Test;
public class BasicBatchTest extends AbstractBasicTest {
private static final String LF = "\n";
- private static final String REG_EX_BOUNDARY = "(([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+\\s\\(\\),/:=\\?]{1,69}[a-zA-Z0-9_\\-\\.'\\+\\(\\),/:=\\?])\")";
+ private static final String REG_EX_BOUNDARY =
+ "(([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+\\s\\(\\),/:=\\?]" +
+ "{1,69}[a-zA-Z0-9_\\-\\.'\\+\\(\\),/:=\\?])\")";
private static final String REG_EX = "multipart/mixed;\\s*boundary=" + REG_EX_BOUNDARY + "\\s*";
private static final String REQUEST_PAYLOAD =
@@ -153,7 +155,8 @@ public class BasicBatchTest extends AbstractBasicTest {
static class TestSingleProc extends ODataSingleProcessor {
@Override
- public ODataResponse executeBatch(final BatchHandler handler, final String requestContentType, final InputStream content) {
+ public ODataResponse executeBatch(final BatchHandler handler, final String requestContentType,
+ final InputStream content) {
assertFalse(getContext().isInBatchMode());
@@ -164,7 +167,8 @@ public class BasicBatchTest extends AbstractBasicTest {
pathInfo.setServiceRoot(new URI("http://localhost:19000/odata"));
EntityProviderBatchProperties batchProperties = EntityProviderBatchProperties.init().pathInfo(pathInfo).build();
- List<BatchRequestPart> batchParts = EntityProvider.parseBatchRequest(requestContentType, content, batchProperties);
+ List<BatchRequestPart> batchParts =
+ EntityProvider.parseBatchRequest(requestContentType, content, batchProperties);
for (BatchRequestPart batchPart : batchParts) {
batchResponseParts.add(handler.handleBatchPart(batchPart));
}
@@ -178,7 +182,8 @@ public class BasicBatchTest extends AbstractBasicTest {
}
@Override
- public BatchResponsePart executeChangeSet(final BatchHandler handler, final List<ODataRequest> requests) throws ODataException {
+ public BatchResponsePart executeChangeSet(final BatchHandler handler, final List<ODataRequest> requests)
+ throws ODataException {
assertTrue(getContext().isInBatchMode());
List<ODataResponse> responses = new ArrayList<ODataResponse>();
@@ -196,7 +201,8 @@ public class BasicBatchTest extends AbstractBasicTest {
}
@Override
- public ODataResponse readEntitySimpleProperty(final GetSimplePropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySimpleProperty(final GetSimplePropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
assertTrue(getContext().isInBatchMode());
CircleStreamBuffer buffer = new CircleStreamBuffer();
@@ -216,12 +222,15 @@ public class BasicBatchTest extends AbstractBasicTest {
throw new RuntimeException(e);
}
- ODataResponse oDataResponse = ODataResponse.entity(buffer.getInputStream()).status(HttpStatusCodes.OK).contentHeader("application/json").build();
+ ODataResponse oDataResponse =
+ ODataResponse.entity(buffer.getInputStream()).status(HttpStatusCodes.OK).contentHeader("application/json")
+ .build();
return oDataResponse;
}
@Override
- public ODataResponse updateEntitySimpleProperty(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntitySimpleProperty(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
assertTrue(getContext().isInBatchMode());
ODataResponse oDataResponse = ODataResponse.status(HttpStatusCodes.NO_CONTENT).build();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
index 0b08d76..e813fb1 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -38,8 +38,6 @@ import org.apache.http.client.methods.HttpPatch;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.StringEntity;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.edm.Edm;
@@ -53,6 +51,7 @@ import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.testutil.helper.HttpMerge;
import org.apache.olingo.odata2.testutil.helper.HttpSomethingUnsupported;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.junit.Test;
/**
*
@@ -64,7 +63,9 @@ public class BasicHttpTest extends AbstractBasicTest {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class)))
.thenReturn(ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
- when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), any(String.class)))
+ when(
+ ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class)))
.thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
return processor;
}
@@ -225,7 +226,8 @@ public class BasicHttpTest extends AbstractBasicTest {
tunnelPost(header, method.toString(), HttpStatusCodes.NOT_FOUND);
}
- private void tunnelPost(final String header, final String method, final HttpStatusCodes expectedStatus) throws IOException {
+ private void tunnelPost(final String header, final String method, final HttpStatusCodes expectedStatus)
+ throws IOException {
HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
post.setHeader(header, method);
final HttpResponse response = getHttpClient().execute(post);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
index 79a3854..1e4bb76 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -30,8 +30,6 @@ import java.util.Arrays;
import org.apache.http.Header;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.exception.ODataException;
@@ -41,6 +39,7 @@ import org.apache.olingo.odata2.api.processor.feature.CustomContentType;
import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.junit.Test;
/**
*
@@ -55,15 +54,21 @@ public class ContentNegotiationDollarFormatTest extends AbstractBasicTest {
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
- // service document
+ // service document
final String contentType = HttpContentType.APPLICATION_ATOM_SVC_UTF8;
- final ODataResponse responseAtomXml = ODataResponse.status(HttpStatusCodes.OK).contentHeader(contentType).entity("Test passed.").build();
- when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), eq(contentType))).thenReturn(responseAtomXml);
+ final ODataResponse responseAtomXml =
+ ODataResponse.status(HttpStatusCodes.OK).contentHeader(contentType).entity("Test passed.").build();
+ when(
+ ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ eq(contentType))).thenReturn(responseAtomXml);
// csv
- final ODataResponse value = ODataResponse.status(HttpStatusCodes.OK).contentHeader(CUSTOM_CONTENT_TYPE).entity("any content").build();
- when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), eq("csv"))).thenReturn(value);
- when(((CustomContentType) processor).getCustomContentTypes(ServiceDocumentProcessor.class)).thenReturn(Arrays.asList("csv"));
+ final ODataResponse value =
+ ODataResponse.status(HttpStatusCodes.OK).contentHeader(CUSTOM_CONTENT_TYPE).entity("any content").build();
+ when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), eq("csv")))
+ .thenReturn(value);
+ when(((CustomContentType) processor).getCustomContentTypes(ServiceDocumentProcessor.class)).thenReturn(
+ Arrays.asList("csv"));
return processor;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
index f3b754c..bd2bbde 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -35,8 +35,6 @@ import javax.ws.rs.core.Response.Status;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
@@ -48,6 +46,7 @@ import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
+import org.junit.Test;
/**
*
@@ -57,8 +56,11 @@ public class ContextTest extends AbstractBasicTest {
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
- when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
+ when(
+ ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class))).thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
return processor;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
index e02d7f2..c5c01eb 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -27,14 +27,13 @@ import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
+import org.junit.Test;
/**
*
@@ -45,7 +44,9 @@ public class ErrorResponseTest extends AbstractBasicTest {
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), any(String.class))).thenThrow(new ODataRuntimeException("unit testing"));
+ when(
+ ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class))).thenThrow(new ODataRuntimeException("unit testing"));
return processor;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
index a40747d..7d5d2f6 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -26,15 +26,14 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.http.HttpResponse;
-import org.custommonkey.xmlunit.SimpleNamespaceContext;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.custommonkey.xmlunit.SimpleNamespaceContext;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
index 2cc063a..7d846bd 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -56,8 +56,11 @@ public class FitLoadTest extends AbstractBasicTest {
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
- when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
+ when(
+ ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class))).thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
return processor;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
index f0c40d2..768c9f4 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -31,14 +31,6 @@ import java.util.Locale;
import java.util.Map;
import org.apache.http.HttpResponse;
-import org.custommonkey.xmlunit.SimpleNamespaceContext;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.junit.Test;
-import org.mockito.Matchers;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
@@ -54,6 +46,13 @@ import org.apache.olingo.odata2.core.uri.UriInfoImpl;
import org.apache.olingo.odata2.ref.edm.ScenarioEdmProvider;
import org.apache.olingo.odata2.testutil.helper.ClassHelper;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.custommonkey.xmlunit.SimpleNamespaceContext;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+import org.mockito.Matchers;
/**
*
@@ -77,7 +76,8 @@ public class HttpExceptionResponseTest extends AbstractBasicTest {
@Test
public void test404HttpNotFound() throws Exception {
- when(processor.readEntity(any(GetEntityUriInfo.class), any(String.class))).thenThrow(new ODataNotFoundException(ODataNotFoundException.ENTITY));
+ when(processor.readEntity(any(GetEntityUriInfo.class), any(String.class))).thenThrow(
+ new ODataNotFoundException(ODataNotFoundException.ENTITY));
final HttpResponse response = executeGetRequest("Managers('199')");
assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
@@ -87,7 +87,8 @@ public class HttpExceptionResponseTest extends AbstractBasicTest {
prefixMap.put("a", Edm.NAMESPACE_M_2007_08);
XMLUnit.setXpathNamespaceContext(new SimpleNamespaceContext(prefixMap));
assertXpathExists("/a:error/a:code", content);
- assertXpathValuesEqual("\"" + MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText() + "\"", "/a:error/a:message", content);
+ assertXpathValuesEqual("\"" + MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText()
+ + "\"", "/a:error/a:message", content);
}
@Test
@@ -104,7 +105,8 @@ public class HttpExceptionResponseTest extends AbstractBasicTest {
final HttpResponse response = executeGetRequest("Managers('" + key + "')");
- assertEquals("Expected status code does not match for exception type '" + oDataException.getClass().getSimpleName() + "'.",
+ assertEquals("Expected status code does not match for exception type '"
+ + oDataException.getClass().getSimpleName() + "'.",
oDataException.getHttpStatus().getStatusCode(), response.getStatusLine().getStatusCode());
final String content = StringHelper.inputStreamToString(response.getEntity().getContent());
@@ -117,7 +119,8 @@ public class HttpExceptionResponseTest extends AbstractBasicTest {
}
private List<ODataHttpException> getHttpExceptionsForTest() throws Exception {
- final List<Class<ODataHttpException>> exClasses = ClassHelper.getAssignableClasses("org.apache.olingo.odata2.api.exception", ODataHttpException.class);
+ final List<Class<ODataHttpException>> exClasses =
+ ClassHelper.getAssignableClasses("org.apache.olingo.odata2.api.exception", ODataHttpException.class);
final MessageReference mr = MessageReference.create(ODataHttpException.class, "SIMPLE FOR TEST");
return ClassHelper.getClassInstances(exClasses, new Class<?>[] { MessageReference.class }, new Object[] { mr });
@@ -150,7 +153,7 @@ public class HttpExceptionResponseTest extends AbstractBasicTest {
@Override
public void describeTo(final Description description) {
- // description.appendText("");
+ // description.appendText("");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
index 569b339..d73dd7d 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -33,13 +33,6 @@ import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
-import org.custommonkey.xmlunit.SimpleNamespaceContext;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.custommonkey.xmlunit.exceptions.XpathException;
-import org.junit.Before;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.exception.MessageReference;
@@ -49,6 +42,12 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.custommonkey.xmlunit.SimpleNamespaceContext;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.custommonkey.xmlunit.exceptions.XpathException;
+import org.junit.Before;
+import org.junit.Test;
+import org.xml.sax.SAXException;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
index 932eeeb..b91d784 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -27,8 +27,6 @@ import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.processor.ODataResponse;
@@ -36,6 +34,7 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.junit.Test;
/**
*
@@ -45,7 +44,8 @@ public class MetadataTest extends AbstractBasicTest {
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
return processor;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
index d41ec44..ba9bbdc 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -28,15 +28,14 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPatch;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.testutil.mock.EdmTestProvider;
+import org.junit.Before;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
index 156e019..f357602 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -36,12 +36,6 @@ import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
import org.apache.olingo.odata2.api.exception.ODataException;
@@ -56,6 +50,11 @@ import org.apache.olingo.odata2.core.processor.ODataSingleProcessorService;
import org.apache.olingo.odata2.testutil.fit.BaseTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.server.TestServer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
/**
*
@@ -74,7 +73,7 @@ public class ServiceResolutionTest extends BaseTest {
final EdmProvider provider = mock(EdmProvider.class);
service = new ODataSingleProcessorService(provider, processor) {};
- // FitStaticServiceFactory.setService(service);
+ // FitStaticServiceFactory.setService(service);
// science fiction (return context after setContext)
// see http://www.planetgeek.ch/2010/07/20/mockito-answer-vs-return/
@@ -94,8 +93,12 @@ public class ServiceResolutionTest extends BaseTest {
}
});
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
- when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("servicedocument").status(HttpStatusCodes.OK).build());
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
+ when(
+ ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class)))
+ .thenReturn(ODataResponse.entity("servicedocument").status(HttpStatusCodes.OK).build());
} catch (final ODataException e) {
throw new RuntimeException(e);
}
@@ -234,7 +237,8 @@ public class ServiceResolutionTest extends BaseTest {
}
@Test
- public void testBaseUriWithMatrixParameter() throws ClientProtocolException, IOException, ODataException, URISyntaxException {
+ public void testBaseUriWithMatrixParameter() throws ClientProtocolException, IOException, ODataException,
+ URISyntaxException {
server.setPathSplit(3);
startServer();
@@ -250,11 +254,14 @@ public class ServiceResolutionTest extends BaseTest {
}
@Test
- public void testBaseUriWithEncoding() throws ClientProtocolException, IOException, ODataException, URISyntaxException {
+ public void testBaseUriWithEncoding() throws ClientProtocolException, IOException, ODataException,
+ URISyntaxException {
server.setPathSplit(3);
startServer();
- final URI uri = new URI(server.getEndpoint().getScheme(), null, server.getEndpoint().getHost(), server.getEndpoint().getPort(), server.getEndpoint().getPath() + "/aaa/äдержb;n=2, 3;m=1/c c/", null, null);
+ final URI uri =
+ new URI(server.getEndpoint().getScheme(), null, server.getEndpoint().getHost(), server.getEndpoint().getPort(),
+ server.getEndpoint().getPath() + "/aaa/äдержb;n=2, 3;m=1/c c/", null, null);
final HttpGet get = new HttpGet(uri);
final HttpResponse response = httpClient.execute(get);
@@ -263,7 +270,8 @@ public class ServiceResolutionTest extends BaseTest {
final ODataContext context = service.getProcessor().getContext();
assertNotNull(context);
- assertEquals(server.getEndpoint() + "aaa/%C3%A4%D0%B4%D0%B5%D1%80%D0%B6b;n=2,%203;m=1/c%20c/", context.getPathInfo().getServiceRoot().toASCIIString());
+ assertEquals(server.getEndpoint() + "aaa/%C3%A4%D0%B4%D0%B5%D1%80%D0%B6b;n=2,%203;m=1/c%20c/", context
+ .getPathInfo().getServiceRoot().toASCIIString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
index 08683f4..d8417de 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
@@ -36,8 +36,6 @@ import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.processor.ODataResponse;
@@ -49,6 +47,7 @@ import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.testutil.helper.HttpMerge;
import org.apache.olingo.odata2.testutil.helper.HttpSomethingUnsupported;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.junit.Test;
/**
*
@@ -58,8 +57,11 @@ public class UrlRewriteTest extends AbstractBasicTest {
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
- when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
+ when(
+ ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class))).thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
return processor;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java
index c136552..219a334 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.basic.issues;
@@ -31,8 +31,6 @@ import java.net.URISyntaxException;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.processor.ODataResponse;
@@ -40,6 +38,7 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.fit.basic.AbstractBasicTest;
+import org.junit.Test;
/**
*
@@ -49,12 +48,14 @@ public class TestIssue105 extends AbstractBasicTest {
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
return processor;
}
@Test
- public void checkContextForDifferentHostNamesRequests() throws ClientProtocolException, IOException, ODataException, URISyntaxException {
+ public void checkContextForDifferentHostNamesRequests() throws ClientProtocolException, IOException, ODataException,
+ URISyntaxException {
URI uri1 = URI.create(getEndpoint().toString() + "$metadata");
HttpGet get1 = new HttpGet(uri1);
@@ -66,7 +67,9 @@ public class TestIssue105 extends AbstractBasicTest {
get1.reset();
- URI uri2 = new URI(uri1.getScheme(), uri1.getUserInfo(), "127.0.0.1", uri1.getPort(), uri1.getPath(), uri1.getQuery(), uri1.getFragment());
+ URI uri2 =
+ new URI(uri1.getScheme(), uri1.getUserInfo(), "127.0.0.1", uri1.getPort(), uri1.getPath(), uri1.getQuery(),
+ uri1.getFragment());
HttpGet get2 = new HttpGet(uri2);
HttpResponse response2 = getHttpClient().execute(get2);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
index 61eb4b2..82d3223 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.client;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java
index d7ee2c4..cfa15ee 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.mapping;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProcessor.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProcessor.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProcessor.java
index 2af6875..ded1086 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProcessor.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProcessor.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.mapping;
@@ -61,8 +61,10 @@ public class MapProcessor extends ODataSingleProcessor {
}
@Override
- public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType) throws ODataException {
- final EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(getContext().getPathInfo().getServiceRoot()).build();
+ public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType)
+ throws ODataException {
+ final EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(getContext().getPathInfo().getServiceRoot()).build();
final List<Map<String, Object>> values = new ArrayList<Map<String, Object>>();
@@ -78,17 +80,20 @@ public class MapProcessor extends ODataSingleProcessor {
values.add(data);
}
- final ODataResponse response = EntityProvider.writeFeed(contentType, uriInfo.getTargetEntitySet(), values, properties);
+ final ODataResponse response =
+ EntityProvider.writeFeed(contentType, uriInfo.getTargetEntitySet(), values, properties);
return response;
}
@Override
public ODataResponse readEntity(final GetEntityUriInfo uriInfo, final String contentType) throws ODataException {
- final EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(getContext().getPathInfo().getServiceRoot()).build();
+ final EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(getContext().getPathInfo().getServiceRoot()).build();
// query
- final String mappedKeyName = (String) uriInfo.getTargetEntitySet().getEntityType().getKeyProperties().get(0).getMapping().getObject();
+ final String mappedKeyName =
+ (String) uriInfo.getTargetEntitySet().getEntityType().getKeyProperties().get(0).getMapping().getObject();
final String keyValue = uriInfo.getKeyPredicates().get(0).getLiteral();
final int index = indexOf(mappedKeyName, keyValue);
if ((index < 0) || (index > records.size())) {
@@ -103,16 +108,19 @@ public class MapProcessor extends ODataSingleProcessor {
data.put(pName, record.get(mappedPropertyName));
}
- final ODataResponse response = EntityProvider.writeEntry(contentType, uriInfo.getTargetEntitySet(), data, properties);
+ final ODataResponse response =
+ EntityProvider.writeEntry(contentType, uriInfo.getTargetEntitySet(), data, properties);
return response;
}
@Override
- public ODataResponse readEntitySimplePropertyValue(final GetSimplePropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySimplePropertyValue(final GetSimplePropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
final List<EdmProperty> propertyPath = uriInfo.getPropertyPath();
final EdmProperty property = propertyPath.get(propertyPath.size() - 1);
- final String mappedKeyName = (String) uriInfo.getTargetEntitySet().getEntityType().getKeyProperties().get(0).getMapping().getObject();
+ final String mappedKeyName =
+ (String) uriInfo.getTargetEntitySet().getEntityType().getKeyProperties().get(0).getMapping().getObject();
final String keyValue = uriInfo.getKeyPredicates().get(0).getLiteral();
final int index = indexOf(mappedKeyName, keyValue);
[02/59] [abbrv] Clean up of odata api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
index 086dc85..89497f6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,14 +23,14 @@ import org.apache.olingo.odata2.api.edm.EdmProperty;
/**
* Key predicate, consisting of a simple-type property and its value as String literal
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface KeyPredicate {
/**
* <p>Gets the literal String in default representation.</p>
* <p>The description for {@link org.apache.olingo.odata2.api.edm.EdmLiteral} has some motivation for using
- * this representation.</p>
+ * this representation.</p>
* @return String literal in default (<em>not</em> URI) representation
* @see org.apache.olingo.odata2.api.edm.EdmLiteralKind
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
index c72080a..1716ad1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
* Navigation property segment, consisting of a navigation property and its
* target entity set.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface NavigationPropertySegment {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
index 2ce7a26..2881ca1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
* and, optionally, a list of key predicates to determine a single entity out of
* the target entity set.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface NavigationSegment {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
index daa64ab..0e59a24 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import java.util.List;
/**
* Object to keep OData URI information.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface PathInfo {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java
index 7f5b3f7..2f27328 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -27,10 +27,10 @@ import java.util.Map;
* <pre>{@code //moremaps.com/map/color;mul=50,25;long=20;scale=32000}</pre>
* where <code>color</code> is a path segment,
* <code>mul</code>, <code>long</code>, and <code>scale</code> are matrix parameters,
- * and the matrix parameter <code>mul</code> has a multi-value list.</p>
- *
+ * and the matrix parameter <code>mul</code> has a multi-value list.</p>
+ *
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface PathSegment {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java
index abf7975..2da76d0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmProperty;
/**
* An item of a $select system query option.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface SelectItem {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java
index c8b64a9..e15d3d0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -52,7 +52,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
* Structured parts of the request URI - the result of URI parsing.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
* @see UriParser
*/
public interface UriInfo extends GetServiceDocumentUriInfo,
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java
index 0eb9352..abab8fc 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,17 +23,21 @@ import org.apache.olingo.odata2.api.exception.ODataNotFoundException;
/**
* URI-parsing exception resulting in a 404 Not Found response.
- *
+ *
*/
public class UriNotMatchingException extends ODataNotFoundException {
private static final long serialVersionUID = 1L;
- public static final MessageReference MATCHPROBLEM = createMessageReference(UriNotMatchingException.class, "MATCHPROBLEM");
+ public static final MessageReference MATCHPROBLEM = createMessageReference(UriNotMatchingException.class,
+ "MATCHPROBLEM");
public static final MessageReference NOTFOUND = createMessageReference(UriNotMatchingException.class, "NOTFOUND");
- public static final MessageReference CONTAINERNOTFOUND = createMessageReference(UriNotMatchingException.class, "CONTAINERNOTFOUND");
- public static final MessageReference ENTITYNOTFOUND = createMessageReference(UriNotMatchingException.class, "ENTITYNOTFOUND");
- public static final MessageReference PROPERTYNOTFOUND = createMessageReference(UriNotMatchingException.class, "PROPERTYNOTFOUND");
+ public static final MessageReference CONTAINERNOTFOUND = createMessageReference(UriNotMatchingException.class,
+ "CONTAINERNOTFOUND");
+ public static final MessageReference ENTITYNOTFOUND = createMessageReference(UriNotMatchingException.class,
+ "ENTITYNOTFOUND");
+ public static final MessageReference PROPERTYNOTFOUND = createMessageReference(UriNotMatchingException.class,
+ "PROPERTYNOTFOUND");
public UriNotMatchingException(final MessageReference messageReference) {
super(messageReference);
@@ -47,7 +51,8 @@ public class UriNotMatchingException extends ODataNotFoundException {
super(messageReference, errorCode);
}
- public UriNotMatchingException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
+ public UriNotMatchingException(final MessageReference messageReference, final Throwable cause,
+ final String errorCode) {
super(messageReference, cause, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java
index ff83bc3..8f9b6f8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
/**
* Wrapper for UriParser functionality.
- *
+ *
*/
public abstract class UriParser {
@@ -46,7 +46,8 @@ public abstract class UriParser {
* @return {@link UriInfo} information about the parsed URI
* @throws ODataException
*/
- public static UriInfo parse(final Edm edm, final List<PathSegment> pathSegments, final Map<String, String> queryParameters) throws ODataException {
+ public static UriInfo parse(final Edm edm, final List<PathSegment> pathSegments,
+ final Map<String, String> queryParameters) throws ODataException {
return RuntimeDelegate.getUriParser(edm).parse(pathSegments, queryParameters);
}
@@ -59,42 +60,44 @@ public abstract class UriParser {
* @throws UriNotMatchingException
* @throws EdmException
*/
- public abstract UriInfo parse(List<PathSegment> pathSegments, Map<String, String> queryParameters) throws UriSyntaxException, UriNotMatchingException, EdmException;
+ public abstract UriInfo parse(List<PathSegment> pathSegments, Map<String, String> queryParameters)
+ throws UriSyntaxException, UriNotMatchingException, EdmException;
/**
* Parses a $filter expression string and create an expression tree.
* <p>The current expression parser supports expressions as defined in the
* OData specification 2.0 with the following restrictions:
* <ul>
- * <li>the methods "cast", "isof" and "replace" are not supported</li>
+ * <li>the methods "cast", "isof" and "replace" are not supported</li>
* </ul></p>
- *
+ *
* <p>The expression parser can be used with providing an Entity Data Model (EDM)
* and without providing it. When an EDM is provided the expression parser will be
* as strict as possible. That means:
* <ul>
- * <li>All properties used in the expression must be defined inside the EDM,</li>
- * <li>the types of EDM properties will be checked against the lists of allowed
- * types per method and per binary or unary operator, respectively</li>
+ * <li>All properties used in the expression must be defined inside the EDM,</li>
+ * <li>the types of EDM properties will be checked against the lists of allowed
+ * types per method and per binary or unary operator, respectively</li>
* </ul>
* If no EDM is provided the expression parser performs a lax validation:
* <ul>
- * <li>The properties used in the expression are not looked up inside the EDM
- * and the type of the expression node representing the property will be "null",</li>
- * <li>expression nodes with EDM type "null" are not considered during the parameter
- * type validation, so the return type of the parent expression node will
- * also become "null".</li>
+ * <li>The properties used in the expression are not looked up inside the EDM
+ * and the type of the expression node representing the property will be "null",</li>
+ * <li>expression nodes with EDM type "null" are not considered during the parameter
+ * type validation, so the return type of the parent expression node will
+ * also become "null".</li>
* </ul>
- * @param edm entity data model of the accessed OData service
- * @param edmType EDM type of the OData entity/complex type/... addressed by the URL
+ * @param edm entity data model of the accessed OData service
+ * @param edmType EDM type of the OData entity/complex type/... addressed by the URL
* @param expression $filter expression string to be parsed
- * @return expression tree which can be traversed with help of the interfaces
- * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor ExpressionVisitor}
- * and {@link org.apache.olingo.odata2.api.uri.expression.Visitable Visitable}
+ * @return expression tree which can be traversed with help of the interfaces
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor ExpressionVisitor} and
+ * {@link org.apache.olingo.odata2.api.uri.expression.Visitable Visitable}
* @throws ExpressionParserException thrown due to errors while parsing the $filter expression string
- * @throws ODataMessageException for extensibility
+ * @throws ODataMessageException for extensibility
*/
- public static FilterExpression parseFilter(final Edm edm, final EdmEntityType edmType, final String expression) throws ExpressionParserException, ODataMessageException {
+ public static FilterExpression parseFilter(final Edm edm, final EdmEntityType edmType, final String expression)
+ throws ExpressionParserException, ODataMessageException {
return RuntimeDelegate.getUriParser(edm).parseFilterString(edmType, expression);
}
@@ -103,79 +106,84 @@ public abstract class UriParser {
* <p>The current expression parser supports expressions as defined in the
* OData specification 2.0 with the following restrictions:
* <ul>
- * <li>the methods "cast", "isof" and "replace" are not supported</li>
+ * <li>the methods "cast", "isof" and "replace" are not supported</li>
* </ul></p>
- *
+ *
* <p>The expression parser can be used with providing an Entity Data Model (EDM)
* and without providing it. When an EDM is provided the expression parser will be
* as strict as possible. That means:
* <ul>
- * <li>All properties used in the expression must be defined inside the EDM,</li>
- * <li>the types of EDM properties will be checked against the lists of allowed
- * types per method and per binary or unary operator, respectively</li>
+ * <li>All properties used in the expression must be defined inside the EDM,</li>
+ * <li>the types of EDM properties will be checked against the lists of allowed
+ * types per method and per binary or unary operator, respectively</li>
* </ul>
* If no EDM is provided the expression parser performs a lax validation:
* <ul>
- * <li>The properties used in the expression are not looked up inside the EDM
- * and the type of the expression node representing the property will be "null",</li>
- * <li>expression nodes with EDM type "null" are not considered during the parameter
- * type validation, so the return type of the parent expression node will
- * also become "null".</li>
+ * <li>The properties used in the expression are not looked up inside the EDM
+ * and the type of the expression node representing the property will be "null",</li>
+ * <li>expression nodes with EDM type "null" are not considered during the parameter
+ * type validation, so the return type of the parent expression node will
+ * also become "null".</li>
* </ul>
- * @param edmType EDM type of the OData entity/complex type/... addressed by the URL
+ * @param edmType EDM type of the OData entity/complex type/... addressed by the URL
* @param expression $filter expression string to be parsed
- * @return expression tree which can be traversed with help of the interfaces
- * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor ExpressionVisitor}
- * and {@link org.apache.olingo.odata2.api.uri.expression.Visitable Visitable}
+ * @return expression tree which can be traversed with help of the interfaces
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor ExpressionVisitor} and
+ * {@link org.apache.olingo.odata2.api.uri.expression.Visitable Visitable}
* @throws ExpressionParserException thrown due to errors while parsing the $filter expression string
- * @throws ODataMessageException for extensibility
+ * @throws ODataMessageException for extensibility
*/
- public abstract FilterExpression parseFilterString(EdmEntityType edmType, String expression) throws ExpressionParserException, ODataMessageException;
+ public abstract FilterExpression parseFilterString(EdmEntityType edmType, String expression)
+ throws ExpressionParserException, ODataMessageException;
/**
* Parses a $orderby expression string and creates an expression tree.
- * @param edm EDM model of the accessed OData service
- * @param edmType EDM type of the OData entity/complex type/... addressed by the URL
+ * @param edm EDM model of the accessed OData service
+ * @param edmType EDM type of the OData entity/complex type/... addressed by the URL
* @param expression $orderby expression string to be parsed
- * @return expression tree which can be traversed with help of the interfaces
- * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor ExpressionVisitor}
- * and {@link org.apache.olingo.odata2.api.uri.expression.Visitable Visitable}
+ * @return expression tree which can be traversed with help of the interfaces
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor ExpressionVisitor} and
+ * {@link org.apache.olingo.odata2.api.uri.expression.Visitable Visitable}
* @throws ExpressionParserException thrown due to errors while parsing the $orderby expression string
- * @throws ODataMessageException used for extensibility
+ * @throws ODataMessageException used for extensibility
*/
- public static OrderByExpression parseOrderBy(final Edm edm, final EdmEntityType edmType, final String expression) throws ExpressionParserException, ODataMessageException {
+ public static OrderByExpression parseOrderBy(final Edm edm, final EdmEntityType edmType, final String expression)
+ throws ExpressionParserException, ODataMessageException {
return RuntimeDelegate.getUriParser(edm).parseOrderByString(edmType, expression);
}
/**
* Parses a $orderby expression string and creates an expression tree.
- * @param edmType EDM type of the OData entity/complex type/... addressed by the URL
+ * @param edmType EDM type of the OData entity/complex type/... addressed by the URL
* @param expression $orderby expression string to be parsed
- * @return expression tree which can be traversed with help of the interfaces
- * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor ExpressionVisitor}
- * and {@link org.apache.olingo.odata2.api.uri.expression.Visitable Visitable}
+ * @return expression tree which can be traversed with help of the interfaces
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor ExpressionVisitor} and
+ * {@link org.apache.olingo.odata2.api.uri.expression.Visitable Visitable}
* @throws ExpressionParserException thrown due to errors while parsing the $orderby expression string
- * @throws ODataMessageException used for extensibility
+ * @throws ODataMessageException used for extensibility
*/
- public abstract OrderByExpression parseOrderByString(EdmEntityType edmType, String expression) throws ExpressionParserException, ODataMessageException;
+ public abstract OrderByExpression parseOrderByString(EdmEntityType edmType, String expression)
+ throws ExpressionParserException, ODataMessageException;
/**
- * Creates an optimized expression tree out of $expand and $select expressions.
+ * Creates an optimized expression tree out of $expand and $select expressions.
* @param select List of {@link SelectItem select items}
* @param expand List of Lists of {@link NavigationPropertySegment navigation property segments}
- * @return expression tree of type {@link ExpandSelectTreeNode}
+ * @return expression tree of type {@link ExpandSelectTreeNode}
* @throws EdmException
*/
- public static ExpandSelectTreeNode createExpandSelectTree(final List<SelectItem> select, final List<ArrayList<NavigationPropertySegment>> expand) throws EdmException {
+ public static ExpandSelectTreeNode createExpandSelectTree(final List<SelectItem> select,
+ final List<ArrayList<NavigationPropertySegment>> expand) throws EdmException {
return RuntimeDelegate.getUriParser(null).buildExpandSelectTree(select, expand);
}
/**
- * Creates an optimized expression tree out of $expand and $select expressions.
+ * Creates an optimized expression tree out of $expand and $select expressions.
* @param select List of {@link SelectItem select items}
* @param expand List of Lists of {@link NavigationPropertySegment navigation property segments}
- * @return expression tree of type {@link ExpandSelectTreeNode}
+ * @return expression tree of type {@link ExpandSelectTreeNode}
* @throws EdmException
*/
- public abstract ExpandSelectTreeNode buildExpandSelectTree(List<SelectItem> select, List<ArrayList<NavigationPropertySegment>> expand) throws EdmException;
+ public abstract ExpandSelectTreeNode buildExpandSelectTree(List<SelectItem> select,
+ List<ArrayList<NavigationPropertySegment>> expand) throws EdmException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java
index 52e1782..f719343 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,37 +24,58 @@ import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
/**
* Exception for violation of the OData URI construction rules,
* resulting in a 400 Bad Request response.
- *
+ *
*/
public class UriSyntaxException extends ODataBadRequestException {
private static final long serialVersionUID = 1L;
public static final MessageReference URISYNTAX = createMessageReference(UriSyntaxException.class, "URISYNTAX");
- public static final MessageReference ENTITYSETINSTEADOFENTITY = createMessageReference(UriSyntaxException.class, "ENTITYSETINSTEADOFENTITY");
+ public static final MessageReference ENTITYSETINSTEADOFENTITY = createMessageReference(UriSyntaxException.class,
+ "ENTITYSETINSTEADOFENTITY");
public static final MessageReference NOTEXT = createMessageReference(UriSyntaxException.class, "NOTEXT");
- public static final MessageReference NOMEDIARESOURCE = createMessageReference(UriSyntaxException.class, "NOMEDIARESOURCE");
- public static final MessageReference NONAVIGATIONPROPERTY = createMessageReference(UriSyntaxException.class, "NONAVIGATIONPROPERTY");
- public static final MessageReference MISSINGPARAMETER = createMessageReference(UriSyntaxException.class, "MISSINGPARAMETER");
- public static final MessageReference MISSINGKEYPREDICATENAME = createMessageReference(UriSyntaxException.class, "MISSINGKEYPREDICATENAME");
- public static final MessageReference DUPLICATEKEYNAMES = createMessageReference(UriSyntaxException.class, "DUPLICATEKEYNAMES");
+ public static final MessageReference NOMEDIARESOURCE = createMessageReference(UriSyntaxException.class,
+ "NOMEDIARESOURCE");
+ public static final MessageReference NONAVIGATIONPROPERTY = createMessageReference(UriSyntaxException.class,
+ "NONAVIGATIONPROPERTY");
+ public static final MessageReference MISSINGPARAMETER = createMessageReference(UriSyntaxException.class,
+ "MISSINGPARAMETER");
+ public static final MessageReference MISSINGKEYPREDICATENAME = createMessageReference(UriSyntaxException.class,
+ "MISSINGKEYPREDICATENAME");
+ public static final MessageReference DUPLICATEKEYNAMES = createMessageReference(UriSyntaxException.class,
+ "DUPLICATEKEYNAMES");
public static final MessageReference EMPTYSEGMENT = createMessageReference(UriSyntaxException.class, "EMPTYSEGMENT");
- public static final MessageReference MUSTNOTBELASTSEGMENT = createMessageReference(UriSyntaxException.class, "MUSTNOTBELASTSEGMENT");
- public static final MessageReference MUSTBELASTSEGMENT = createMessageReference(UriSyntaxException.class, "MUSTBELASTSEGMENT");
- public static final MessageReference INVALIDSEGMENT = createMessageReference(UriSyntaxException.class, "INVALIDSEGMENT");
+ public static final MessageReference MUSTNOTBELASTSEGMENT = createMessageReference(UriSyntaxException.class,
+ "MUSTNOTBELASTSEGMENT");
+ public static final MessageReference MUSTBELASTSEGMENT = createMessageReference(UriSyntaxException.class,
+ "MUSTBELASTSEGMENT");
+ public static final MessageReference INVALIDSEGMENT = createMessageReference(UriSyntaxException.class,
+ "INVALIDSEGMENT");
public static final MessageReference INVALIDVALUE = createMessageReference(UriSyntaxException.class, "INVALIDVALUE");
- public static final MessageReference INVALIDNULLVALUE = createMessageReference(UriSyntaxException.class, "INVALIDNULLVALUE");
- public static final MessageReference INVALIDNEGATIVEVALUE = createMessageReference(UriSyntaxException.class, "INVALIDNEGATIVEVALUE");
- public static final MessageReference INVALIDRETURNTYPE = createMessageReference(UriSyntaxException.class, "INVALIDRETURNTYPE");
- public static final MessageReference INVALIDPROPERTYTYPE = createMessageReference(UriSyntaxException.class, "INVALIDPROPERTYTYPE");
- public static final MessageReference INVALIDKEYPREDICATE = createMessageReference(UriSyntaxException.class, "INVALIDKEYPREDICATE");
- public static final MessageReference INVALIDSYSTEMQUERYOPTION = createMessageReference(UriSyntaxException.class, "INVALIDSYSTEMQUERYOPTION");
- public static final MessageReference INVALIDFILTEREXPRESSION = createMessageReference(UriSyntaxException.class, "INVALIDFILTEREXPRESSION");
- public static final MessageReference INVALIDORDERBYEXPRESSION = createMessageReference(UriSyntaxException.class, "INVALIDORDERBYEXPRESSION");
- public static final MessageReference LITERALFORMAT = createMessageReference(UriSyntaxException.class, "LITERALFORMAT");
- public static final MessageReference UNKNOWNLITERAL = createMessageReference(UriSyntaxException.class, "UNKNOWNLITERAL");
- public static final MessageReference INCOMPATIBLELITERAL = createMessageReference(UriSyntaxException.class, "INCOMPATIBLELITERAL");
- public static final MessageReference INCOMPATIBLESYSTEMQUERYOPTION = createMessageReference(UriSyntaxException.class, "INCOMPATIBLESYSTEMQUERYOPTION");
+ public static final MessageReference INVALIDNULLVALUE = createMessageReference(UriSyntaxException.class,
+ "INVALIDNULLVALUE");
+ public static final MessageReference INVALIDNEGATIVEVALUE = createMessageReference(UriSyntaxException.class,
+ "INVALIDNEGATIVEVALUE");
+ public static final MessageReference INVALIDRETURNTYPE = createMessageReference(UriSyntaxException.class,
+ "INVALIDRETURNTYPE");
+ public static final MessageReference INVALIDPROPERTYTYPE = createMessageReference(UriSyntaxException.class,
+ "INVALIDPROPERTYTYPE");
+ public static final MessageReference INVALIDKEYPREDICATE = createMessageReference(UriSyntaxException.class,
+ "INVALIDKEYPREDICATE");
+ public static final MessageReference INVALIDSYSTEMQUERYOPTION = createMessageReference(UriSyntaxException.class,
+ "INVALIDSYSTEMQUERYOPTION");
+ public static final MessageReference INVALIDFILTEREXPRESSION = createMessageReference(UriSyntaxException.class,
+ "INVALIDFILTEREXPRESSION");
+ public static final MessageReference INVALIDORDERBYEXPRESSION = createMessageReference(UriSyntaxException.class,
+ "INVALIDORDERBYEXPRESSION");
+ public static final MessageReference LITERALFORMAT =
+ createMessageReference(UriSyntaxException.class, "LITERALFORMAT");
+ public static final MessageReference UNKNOWNLITERAL = createMessageReference(UriSyntaxException.class,
+ "UNKNOWNLITERAL");
+ public static final MessageReference INCOMPATIBLELITERAL = createMessageReference(UriSyntaxException.class,
+ "INCOMPATIBLELITERAL");
+ public static final MessageReference INCOMPATIBLESYSTEMQUERYOPTION = createMessageReference(UriSyntaxException.class,
+ "INCOMPATIBLESYSTEMQUERYOPTION");
public UriSyntaxException(final MessageReference MessageReference) {
super(MessageReference);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java
index 40893a7..1596b13 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java
@@ -1,39 +1,37 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Represents a binary expression node in the expression tree returned by the methods
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
- * <br>
+ * Represents a binary expression node in the expression tree returned by the methods
+ * <br>
* <br>
* A binary expression node is inserted in the expression tree for any valid
* ODATA binary operator in {@link BinaryOperator} (e.g. for "and", "div", "eg", ... )
* <br>
- *
+ *
*/
public interface BinaryExpression extends CommonExpression {
/**
- * @return Operator object that represents the used operator
- * @see BinaryOperator
- */
+ * @return Operator object that represents the used operator
+ * @see BinaryOperator
+ */
public BinaryOperator getOperator();
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java
index 93140f4..0da1a84 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java
@@ -1,30 +1,31 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Enumerations for supported binary operators of the ODATA expression parser
+ * Enumerations for supported binary operators of the ODATA expression parser
* for ODATA version 2.0 (with some restrictions)
- *
-*/
+ *
+ */
public enum BinaryOperator {
- AND("and"), OR("or"), EQ("eq"), NE("ne"), LT("lt"), LE("le"), GT("gt"), GE("ge"), ADD("add"), SUB("sub"), MUL("mul"), DIV("div"), MODULO("mod"),
+ AND("and"), OR("or"), EQ("eq"), NE("ne"), LT("lt"), LE("le"), GT("gt"), GE("ge"), ADD("add"), SUB("sub"),
+ MUL("mul"), DIV("div"), MODULO("mod"),
/**
* Property access operator. E.g. $filter=address/city eq "Sydney"
@@ -44,7 +45,7 @@ public enum BinaryOperator {
this.stringRespresentation = stringRespresentation;
}
- /**
+ /**
* @return Operator name for usage in text
*/
@Override
@@ -53,7 +54,7 @@ public enum BinaryOperator {
}
/**
- * @return URI literal of the binary operator as used in the URL.
+ * @return URI literal of the binary operator as used in the URL.
*/
public String toUriLiteral() {
return uriSyntax;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java
index 04a99ec..932c507 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,15 +21,13 @@ package org.apache.olingo.odata2.api.uri.expression;
import org.apache.olingo.odata2.api.edm.EdmType;
/**
- * Parent class of all classes used to build the expression tree returned by
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}</li>
+ * Parent class of all classes used to build the expression tree
* <br>
* <br>
- * <p>This interface defines the default methods for all expression tree nodes
+ * <p>This interface defines the default methods for all expression tree nodes
* <br>
* <br>
- *
+ *
*/
public interface CommonExpression extends Visitable {
/**
@@ -39,21 +37,21 @@ public interface CommonExpression extends Visitable {
ExpressionKind getKind();
/**
- * @return The return type of the value represented with
+ * @return The return type of the value represented with
* this expression. For example the {@link #getEdmType()} method
- * for an expression representing the "concat" method will return always
+ * for an expression representing the "concat" method will return always
* "Edm.String".<br>
* <br>
- * <p>This type information is set while parsing the $filter or $orderby
+ * <p>This type information is set while parsing the $filter or $orderby
* expressions and used to do a first validation of the expression.
* For calculating operators like "add, sub, mul" this type
- * information is purely based on input and output types of the
+ * information is purely based on input and output types of the
* operator as defined in the OData specification.
- * So for $filter=2 add 7 the {@link #getEdmType()} method of the binary expression
- * will return Edm.Byte and not Edm.Int16 because the parser performs no real
+ * So for $filter=2 add 7 the {@link #getEdmType()} method of the binary expression
+ * will return Edm.Byte and not Edm.Int16 because the parser performs no real
* addition.<br>
* <br>
- * <p>However, the application may change this type while evaluating the
+ * <p>However, the application may change this type while evaluating the
* expression tree.
*/
EdmType getEdmType();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java
index 5007c2a..bcf9955 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
/**
* Exception thrown while traversing/visiting a filter expression tree
- *
+ *
*/
public class ExceptionVisitExpression extends ODataMessageException {
private static final long serialVersionUID = 7701L;
@@ -40,20 +40,21 @@ public class ExceptionVisitExpression extends ODataMessageException {
* Create {@link ExceptionVisitExpression} with given {@link MessageReference}.
*
* @param messageReference
- * references the message text (and additional values) of this {@link ExceptionVisitExpression}
+ * references the message text (and additional values) of this {@link ExceptionVisitExpression}
*/
public ExceptionVisitExpression(final MessageReference messageReference) {
super(messageReference);
}
/**
- * Create {@link ExceptionVisitExpression} with given {@link MessageReference} and cause {@link Throwable} which caused
+ * Create {@link ExceptionVisitExpression} with given {@link MessageReference} and cause {@link Throwable} which
+ * caused
* this {@link ExceptionVisitExpression}.
*
* @param message
- * references the message text (and additional values) of this {@link ExceptionVisitExpression}
+ * references the message text (and additional values) of this {@link ExceptionVisitExpression}
* @param cause
- * exception which caused this {@link ExceptionVisitExpression}
+ * exception which caused this {@link ExceptionVisitExpression}
*/
public ExceptionVisitExpression(final MessageReference message, final Throwable cause) {
super(message, cause);
@@ -61,7 +62,7 @@ public class ExceptionVisitExpression extends ODataMessageException {
/**
* Get erroneous filter for debug information
- * @return Erroneous filter tree
+ * @return Erroneous filter tree
*/
public CommonExpression getFilterTree() {
return filterTree;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java
index ad666c6..6ff5c32 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,17 +20,17 @@ package org.apache.olingo.odata2.api.uri.expression;
/**
* Enumeration describing all possible node types inside an expression tree
- *
+ *
*/
public enum ExpressionKind {
/**
* Used to mark the root node of a filter expression tree
- * @see FilterExpression
+ * @see FilterExpression
*/
FILTER,
/**
* Literal expressions like "1.1d" or "'This is a string'"
- * @see LiteralExpression
+ * @see LiteralExpression
*/
LITERAL,
@@ -41,37 +41,37 @@ public enum ExpressionKind {
UNARY,
/**
- * Binary operator expressions like "eq" and "or"
+ * Binary operator expressions like "eq" and "or"
* @see BinaryExpression
*/
BINARY,
/**
- * Method operator expressions like "substringof" and "concat"
+ * Method operator expressions like "substringof" and "concat"
* @see MethodExpression
*/
METHOD,
/**
* Member access expressions like "/" in "adress/street"
- * @see MemberExpression
+ * @see MemberExpression
*/
MEMBER,
/**
- * Property expressions like "age"
+ * Property expressions like "age"
* @see PropertyExpression
*/
PROPERTY,
/**
- * Order expressions like "age desc"
+ * Order expressions like "age desc"
* @see OrderExpression
*/
ORDER,
/**
- * Orderby expression like "age desc, name asc"
+ * Orderby expression like "age desc, name asc"
* @see OrderByExpression
*/
ORDERBY;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
index 68d199e..c9b84a5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,49 +23,69 @@ import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
/**
* Exception thrown while parsing a filter or orderby expression
- *
+ *
*/
public class ExpressionParserException extends ODataBadRequestException {
private static final long serialVersionUID = 7702L;
public static final MessageReference COMMON_ERROR = createMessageReference(ExpressionParserException.class, "COMMON");
- //token related exception texts
- public static final MessageReference ERROR_IN_TOKENIZER = createMessageReference(ExpressionParserException.class, "ERROR_IN_TOKENIZER");
- public static final MessageReference TOKEN_UNDETERMINATED_STRING = createMessageReference(ExpressionParserException.class, "TOKEN_UNDETERMINATED_STRING");
- public static final MessageReference INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING = createMessageReference(ExpressionParserException.class, "INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING");
+ // token related exception texts
+ public static final MessageReference ERROR_IN_TOKENIZER = createMessageReference(ExpressionParserException.class,
+ "ERROR_IN_TOKENIZER");
+ public static final MessageReference TOKEN_UNDETERMINATED_STRING = createMessageReference(
+ ExpressionParserException.class, "TOKEN_UNDETERMINATED_STRING");
+ public static final MessageReference INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING = createMessageReference(
+ ExpressionParserException.class, "INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING");
- //parsing
- public static final MessageReference EXPRESSION_EXPECTED_AFTER_POS = createMessageReference(ExpressionParserException.class, "EXPRESSION_EXPECTED_AFTER_POS");
- public static final MessageReference COMMA_OR_END_EXPECTED_AT_POS = createMessageReference(ExpressionParserException.class, "COMMA_OR_END_EXPECTED_AT_POS");
- public static final MessageReference EXPRESSION_EXPECTED_AT_POS = createMessageReference(ExpressionParserException.class, "EXPRESSION_EXPECTED_AT_POS");
- public static final MessageReference MISSING_CLOSING_PHARENTHESIS = createMessageReference(ExpressionParserException.class, "MISSING_CLOSING_PHARENTHESIS");
- public static final MessageReference COMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS = createMessageReference(ExpressionParserException.class, "COMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS");
- public static final MessageReference INVALID_METHOD_CALL = createMessageReference(ExpressionParserException.class, "INVALID_METHOD_CALL");
- public static final MessageReference TYPE_EXPECTED_AT = createMessageReference(ExpressionParserException.class, "TYPE_EXPECTED_AT");
+ // parsing
+ public static final MessageReference EXPRESSION_EXPECTED_AFTER_POS = createMessageReference(
+ ExpressionParserException.class, "EXPRESSION_EXPECTED_AFTER_POS");
+ public static final MessageReference COMMA_OR_END_EXPECTED_AT_POS = createMessageReference(
+ ExpressionParserException.class, "COMMA_OR_END_EXPECTED_AT_POS");
+ public static final MessageReference EXPRESSION_EXPECTED_AT_POS = createMessageReference(
+ ExpressionParserException.class, "EXPRESSION_EXPECTED_AT_POS");
+ public static final MessageReference MISSING_CLOSING_PHARENTHESIS = createMessageReference(
+ ExpressionParserException.class, "MISSING_CLOSING_PHARENTHESIS");
+ public static final MessageReference COMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS = createMessageReference(
+ ExpressionParserException.class, "COMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS");
+ public static final MessageReference INVALID_METHOD_CALL = createMessageReference(ExpressionParserException.class,
+ "INVALID_METHOD_CALL");
+ public static final MessageReference TYPE_EXPECTED_AT = createMessageReference(ExpressionParserException.class,
+ "TYPE_EXPECTED_AT");
- //validation exceptions texts - method
- public static final MessageReference METHOD_WRONG_ARG_EXACT = createMessageReference(ExpressionParserException.class, "METHOD_WRONG_ARG_EXACT");
- public static final MessageReference METHOD_WRONG_ARG_BETWEEN = createMessageReference(ExpressionParserException.class, "METHOD_WRONG_ARG_BETWEEN");
- public static final MessageReference METHOD_WRONG_ARG_X_OR_MORE = createMessageReference(ExpressionParserException.class, "METHOD_WRONG_ARG_X_OR_MORE");
- public static final MessageReference METHOD_WRONG_ARG_X_OR_LESS = createMessageReference(ExpressionParserException.class, "METHOD_WRONG_ARG_X_OR_LESS");
- public static final MessageReference METHOD_WRONG_INPUT_TYPE = createMessageReference(ExpressionParserException.class, "METHOD_WRONG_INPUT_TYPE");
+ // validation exceptions texts - method
+ public static final MessageReference METHOD_WRONG_ARG_EXACT = createMessageReference(ExpressionParserException.class,
+ "METHOD_WRONG_ARG_EXACT");
+ public static final MessageReference METHOD_WRONG_ARG_BETWEEN = createMessageReference(
+ ExpressionParserException.class, "METHOD_WRONG_ARG_BETWEEN");
+ public static final MessageReference METHOD_WRONG_ARG_X_OR_MORE = createMessageReference(
+ ExpressionParserException.class, "METHOD_WRONG_ARG_X_OR_MORE");
+ public static final MessageReference METHOD_WRONG_ARG_X_OR_LESS = createMessageReference(
+ ExpressionParserException.class, "METHOD_WRONG_ARG_X_OR_LESS");
+ public static final MessageReference METHOD_WRONG_INPUT_TYPE = createMessageReference(
+ ExpressionParserException.class, "METHOD_WRONG_INPUT_TYPE");
- //validation exceptions texts - member
- public static final MessageReference LEFT_SIDE_NOT_STRUCTURAL_TYPE = createMessageReference(ExpressionParserException.class, "LEFT_SIDE_NOT_STRUCTURAL_TYPE");
- public static final MessageReference LEFT_SIDE_NOT_A_PROPERTY = createMessageReference(ExpressionParserException.class, "LEFT_SIDE_NOT_A_PROPERTY");
- public static final MessageReference PROPERTY_NAME_NOT_FOUND_IN_TYPE = createMessageReference(ExpressionParserException.class, "PROPERTY_NAME_NOT_FOUND_IN_TYPE");
+ // validation exceptions texts - member
+ public static final MessageReference LEFT_SIDE_NOT_STRUCTURAL_TYPE = createMessageReference(
+ ExpressionParserException.class, "LEFT_SIDE_NOT_STRUCTURAL_TYPE");
+ public static final MessageReference LEFT_SIDE_NOT_A_PROPERTY = createMessageReference(
+ ExpressionParserException.class, "LEFT_SIDE_NOT_A_PROPERTY");
+ public static final MessageReference PROPERTY_NAME_NOT_FOUND_IN_TYPE = createMessageReference(
+ ExpressionParserException.class, "PROPERTY_NAME_NOT_FOUND_IN_TYPE");
- //validation exceptions texts - binary
- public static final MessageReference INVALID_TYPES_FOR_BINARY_OPERATOR = createMessageReference(ExpressionParserException.class, "INVALID_TYPES_FOR_BINARY_OPERATOR");
+ // validation exceptions texts - binary
+ public static final MessageReference INVALID_TYPES_FOR_BINARY_OPERATOR = createMessageReference(
+ ExpressionParserException.class, "INVALID_TYPES_FOR_BINARY_OPERATOR");
- //orderby
- public static final MessageReference INVALID_SORT_ORDER = createMessageReference(ExpressionParserException.class, "INVALID_SORT_ORDER");
+ // orderby
+ public static final MessageReference INVALID_SORT_ORDER = createMessageReference(ExpressionParserException.class,
+ "INVALID_SORT_ORDER");
- //instance attributes
+ // instance attributes
private CommonExpression filterTree;
- //Constructors
+ // Constructors
public ExpressionParserException() {
super(COMMON_ERROR);
}
@@ -74,20 +94,21 @@ public class ExpressionParserException extends ODataBadRequestException {
* Create {@link ExpressionParserException} with given {@link MessageReference}.
*
* @param messageReference
- * references the message text (and additional values) of this {@link ExpressionParserException}
+ * references the message text (and additional values) of this {@link ExpressionParserException}
*/
public ExpressionParserException(final MessageReference messageReference) {
super(messageReference);
}
/**
- * Create {@link ExpressionParserException} with given {@link MessageReference} and cause {@link Throwable} which caused
+ * Create {@link ExpressionParserException} with given {@link MessageReference} and cause {@link Throwable} which
+ * caused
* this {@link ExpressionParserException}.
*
* @param messageReference
- * References the message text (and additional values) of this {@link ExpressionParserException}
+ * References the message text (and additional values) of this {@link ExpressionParserException}
* @param cause
- * Exception which caused this {@link ExpressionParserException}
+ * Exception which caused this {@link ExpressionParserException}
*/
public ExpressionParserException(final MessageReference messageReference, final Throwable cause) {
super(messageReference, cause);
@@ -95,7 +116,7 @@ public class ExpressionParserException extends ODataBadRequestException {
/**
* Gets erroneous filter expression tree for debug information.
- * @return erroneous filter tree
+ * @return erroneous filter tree
*/
public CommonExpression getFilterTree() {
return filterTree;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java
index 8b1da90..7bba921 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,126 +25,128 @@ import org.apache.olingo.odata2.api.edm.EdmTyped;
/**
* Interface {@link ExpressionVisitor} is used to traverse a $filter or $orderby expression tree.
- * Any class instance implementing this interface can be passed to the method {@link Visitable#accept(ExpressionVisitor)}
- * of an expression node to start the traversing. While traversing, the appropriate methods of the visitor implementation
+ * Any class instance implementing this interface can be passed to the method
+ * {@link Visitable#accept(ExpressionVisitor)} of an expression node to start the traversing. While traversing, the
+ * appropriate methods of the visitor implementation
* will be called.
- *
+ *
*/
public interface ExpressionVisitor {
/**
* Visits a filter expression
* @param filterExpression
- * The visited filter expression node
+ * The visited filter expression node
* @param expressionString
- * The $filter expression string used to build the filter expression tree
+ * The $filter expression string used to build the filter expression tree
* @param expression
- * The expression node representing the first <i>operator</i>,<i>method</i>,<i>literal</i> or <i>property</i> of the expression tree
+ * The expression node representing the first <i>operator</i>,<i>method</i>,<i>literal</i> or <i>property</i> of the
+ * expression tree
* @return
- * The overall result of evaluating the whole filter expression tree
+ * The overall result of evaluating the whole filter expression tree
*/
Object visitFilterExpression(FilterExpression filterExpression, String expressionString, Object expression);
/**
* Visits a binary expression
* @param binaryExpression
- * The visited binary expression node
+ * The visited binary expression node
* @param operator
- * The operator used in the binary expression
+ * The operator used in the binary expression
* @param leftSide
- * The result of visiting the left expression node
+ * The result of visiting the left expression node
* @param rightSide
- * The result of visiting the right expression node
+ * The result of visiting the right expression node
* @return
- * Returns the result from evaluating operator, leftSide and rightSide
+ * Returns the result from evaluating operator, leftSide and rightSide
*/
Object visitBinary(BinaryExpression binaryExpression, BinaryOperator operator, Object leftSide, Object rightSide);
/**
* Visits a orderby expression
* @param orderByExpression
- * The visited orderby expression node
+ * The visited orderby expression node
* @param expressionString
- * The $orderby expression string used to build the orderby expression tree
+ * The $orderby expression string used to build the orderby expression tree
* @param orders
- * The result of visiting the orders of the orderby expression
+ * The result of visiting the orders of the orderby expression
* @return
- * The overall result of evaluating the orderby expression tree
+ * The overall result of evaluating the orderby expression tree
*/
Object visitOrderByExpression(OrderByExpression orderByExpression, String expressionString, List<Object> orders);
/**
* Visits a order expression
* @param orderExpression
- * The visited order expression node
+ * The visited order expression node
* @param filterResult
- * The result of visiting the filter expression contained in the order
+ * The result of visiting the filter expression contained in the order
* @param sortOrder
- * The sort order
+ * The sort order
* @return
- * The overall result of evaluating the order
+ * The overall result of evaluating the order
*/
Object visitOrder(OrderExpression orderExpression, Object filterResult, SortOrder sortOrder);
/**
- * Visits a literal expression
+ * Visits a literal expression
* @param literal
- * The visited literal expression node
+ * The visited literal expression node
* @param edmLiteral
- * The detected EDM literal (value and type)
+ * The detected EDM literal (value and type)
* @return
- * The value of the literal
+ * The value of the literal
*/
Object visitLiteral(LiteralExpression literal, EdmLiteral edmLiteral);
/**
* Visits a method expression
* @param methodExpression
- * The visited method expression node
+ * The visited method expression node
* @param method
- * The method used in the method expression
+ * The method used in the method expression
* @param parameters
- * The result of visiting the parameters of the method
+ * The result of visiting the parameters of the method
* @return
- * Returns the result from evaluating the method and the method parameters
+ * Returns the result from evaluating the method and the method parameters
*/
Object visitMethod(MethodExpression methodExpression, MethodOperator method, List<Object> parameters);
/**
* Visits a member expression (e.g. <path property>/<member property>)
* @param memberExpression
- * The visited member expression node
+ * The visited member expression node
* @param path
- * The result of visiting the path property expression node (the left side of the property operator)
+ * The result of visiting the path property expression node (the left side of the property operator)
* @param property
- * The result of visiting the member property expression node
+ * The result of visiting the member property expression node
* @return
- * Returns the <b>value</b> of the corresponding property (which may be a single EDM value or a structured EDM value)
+ * Returns the <b>value</b> of the corresponding property (which may be a single EDM value or a structured EDM value)
*/
Object visitMember(MemberExpression memberExpression, Object path, Object property);
- /**
- * Visits a property expression
- * @param propertyExpression
- * The visited property expression node
- * @param uriLiteral
- * The URI literal of the property
- * @param edmProperty
- * The EDM property matching the property name used in the expression String
- * @return
- * Returns the <b>value</b> of the corresponding property ( which may be a single EDM value or a structured EDM value)
- */
+ /**
+ * Visits a property expression
+ * @param propertyExpression
+ * The visited property expression node
+ * @param uriLiteral
+ * The URI literal of the property
+ * @param edmProperty
+ * The EDM property matching the property name used in the expression String
+ * @return
+ * Returns the <b>value</b> of the corresponding property ( which may be a single EDM value or a structured EDM value)
+ */
Object visitProperty(PropertyExpression propertyExpression, String uriLiteral, EdmTyped edmProperty);
/**
* Visits a unary expression
* @param unaryExpression
- * The visited unary expression node
+ * The visited unary expression node
* @param operator
- * The operator used in the unary expression
+ * The operator used in the unary expression
* @param operand
- * The result of visiting the operand expression node
+ * The result of visiting the operand expression node
* @return
- * Returns the result from evaluating operator and operand
+ * Returns the result from evaluating operator and operand
*/
Object visitUnary(UnaryExpression unaryExpression, UnaryOperator operator, Object operand);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java
index 65c1bb2..0fc5755 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java
@@ -1,28 +1,28 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Represents a $filter expression in the expression tree returned by {@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}
- * Used to define the <b>root</b> expression node in an $filter expression tree.
+ * Represents a $filter expression in the expression tree
+ * Used to define the <b>root</b> expression node in an $filter expression tree.
+ *
*
- *
*/
public interface FilterExpression extends CommonExpression {
@@ -32,7 +32,8 @@ public interface FilterExpression extends CommonExpression {
String getExpressionString();
/**
- * @return Returns the expression node representing the first <i>operator</i>,<i>method</i>,<i>literal</i> or <i>property</i> of the expression tree
+ * @return Returns the expression node representing the first <i>operator</i>,<i>method</i>,<i>literal</i> or
+ * <i>property</i> of the expression tree
*/
CommonExpression getExpression();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java
index e8e6819..ab18b0e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java
@@ -1,27 +1,25 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.uri.expression;
/**
- * Represents a literal expression node in the expression tree returned by the methods:
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String) }</li>
- * <li>{@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String) }</li>
+ * Represents a literal expression node in the expression tree
* <br>
* <br>
* <p>A literal expression node is inserted in the expression tree for any token witch is no
@@ -32,7 +30,7 @@ package org.apache.olingo.odata2.api.uri.expression;
* with a literal expression node for "12".
* <br>
* <br>
- *
+ *
*/
public interface LiteralExpression extends CommonExpression {
[58/59] [abbrv] git commit: cleanup jpa ref
Posted by ch...@apache.org.
cleanup jpa ref
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/b31ec847
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/b31ec847
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/b31ec847
Branch: refs/heads/master
Commit: b31ec84741e4356a1b0e7fcf454e3a3ed1e82695
Parents: 02a598b
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 15:25:55 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 15:25:55 2013 +0200
----------------------------------------------------------------------
.../ref/factory/JPAEntityManagerFactory.java | 13 ++++-----
.../odata2/jpa/processor/ref/model/Address.java | 10 +++----
.../jpa/processor/ref/model/Material.java | 10 +++----
.../odata2/jpa/processor/ref/model/Note.java | 10 +++----
.../processor/ref/model/SalesOrderHeader.java | 30 +++++++++++---------
.../jpa/processor/ref/model/SalesOrderItem.java | 10 +++----
.../processor/ref/model/SalesOrderItemKey.java | 10 +++----
.../odata2/jpa/processor/ref/model/Store.java | 10 +++----
8 files changed, 52 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b31ec847/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java
index 688d125..1f4a7a8 100644
--- a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java
+++ b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -36,8 +36,7 @@ public class JPAEntityManagerFactory {
if (emfMap.containsKey(pUnit)) {
return emfMap.get(pUnit);
- } else
- {
+ } else {
EntityManagerFactory emf = Persistence.createEntityManagerFactory(pUnit);
emfMap.put(pUnit, emf);
return emf;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b31ec847/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java
----------------------------------------------------------------------
diff --git a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java
index d7a5ea0..a0aabcb 100644
--- a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java
+++ b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b31ec847/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java
----------------------------------------------------------------------
diff --git a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java
index a34f240..6f08119 100644
--- a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java
+++ b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b31ec847/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java
----------------------------------------------------------------------
diff --git a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java
index ea09511..4a93509 100644
--- a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java
+++ b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b31ec847/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
----------------------------------------------------------------------
diff --git a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
index c40512c..2aad540 100644
--- a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
+++ b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -61,15 +61,15 @@ public class SalesOrderHeader {
@Temporal(TemporalType.TIMESTAMP)
private Calendar creationDate;
-
+
@Column
private Character status;
-
+
public Character getStatus() {
return status;
}
- public void setStatus(Character status) {
+ public void setStatus(final Character status) {
this.status = status;
}
@@ -127,9 +127,9 @@ public class SalesOrderHeader {
long originalTime;
if (creationDate != null) {
originalTime = creationDate.getTime().getTime();
- }
- else
+ } else {
originalTime = Calendar.getInstance(TimeZone.getDefault()).getTime().getTime();
+ }
Date newDate = new Date(originalTime - TimeZone.getDefault().getOffset(originalTime));
Calendar newCalendar = Calendar.getInstance();
newCalendar.setTime(newDate);
@@ -212,7 +212,7 @@ public class SalesOrderHeader {
return shortText;
}
- public void setShortText(char[] shortText) {
+ public void setShortText(final char[] shortText) {
this.shortText = shortText;
}
@@ -220,13 +220,15 @@ public class SalesOrderHeader {
return longText;
}
- public void setLongText(Character[] longText) {
+ public void setLongText(final Character[] longText) {
this.longText = longText;
}
@PostPersist
public void defaultValues() {
- if (this.creationDate == null) setCreationDate(this.creationDate);
+ if (creationDate == null) {
+ setCreationDate(creationDate);
+ }
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b31ec847/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
----------------------------------------------------------------------
diff --git a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
index 07eb6e6..fa20b47 100644
--- a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
+++ b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b31ec847/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java
----------------------------------------------------------------------
diff --git a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java
index f4bc895..efc09d2 100644
--- a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java
+++ b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b31ec847/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java
----------------------------------------------------------------------
diff --git a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java
index 95c2625..b88bc3a 100644
--- a/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java
+++ b/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
[29/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java
index 4c9d696..ea36828 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -30,11 +30,12 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
* Provider for writing a collection of simple-type or complex-type instances
- *
+ *
*/
public class XmlCollectionEntityProducer {
- public static void append(final XMLStreamWriter writer, final EntityPropertyInfo propertyInfo, final List<?> data) throws EntityProviderException {
+ public static void append(final XMLStreamWriter writer, final EntityPropertyInfo propertyInfo, final List<?> data)
+ throws EntityProviderException {
try {
writer.writeStartElement(propertyInfo.getName());
writer.writeDefaultNamespace(Edm.NAMESPACE_D_2007_08);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorDocumentProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorDocumentProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorDocumentProducer.java
index a94f395..05ee992 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorDocumentProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorDocumentProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -28,7 +28,8 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
public class XmlErrorDocumentProducer {
- public void writeErrorDocument(final XMLStreamWriter writer, final String errorCode, final String message, final Locale locale, final String innerError) throws XMLStreamException {
+ public void writeErrorDocument(final XMLStreamWriter writer, final String errorCode, final String message,
+ final Locale locale, final String innerError) throws XMLStreamException {
writer.writeStartDocument();
writer.writeStartElement(FormatXml.M_ERROR);
writer.writeDefaultNamespace(Edm.NAMESPACE_M_2007_08);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java
index 320c45c..fe59c4a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
* Provider for writing a single link.
- *
+ *
*/
public class XmlLinkEntityProducer {
@@ -41,7 +41,8 @@ public class XmlLinkEntityProducer {
this.properties = properties == null ? EntityProviderWriteProperties.serviceRoot(null).build() : properties;
}
- public void append(final XMLStreamWriter writer, final EntityInfoAggregator entityInfo, final Map<String, Object> data, final boolean isRootElement) throws EntityProviderException {
+ public void append(final XMLStreamWriter writer, final EntityInfoAggregator entityInfo,
+ final Map<String, Object> data, final boolean isRootElement) throws EntityProviderException {
try {
writer.writeStartElement(FormatXml.D_URI);
if (isRootElement) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java
index 8dd7ab8..84eff3b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
* Provider for writing a collection of links
- *
+ *
*/
public class XmlLinksEntityProducer {
@@ -42,7 +42,8 @@ public class XmlLinksEntityProducer {
this.properties = properties == null ? EntityProviderWriteProperties.serviceRoot(null).build() : properties;
}
- public void append(final XMLStreamWriter writer, final EntityInfoAggregator entityInfo, final List<Map<String, Object>> data) throws EntityProviderException {
+ public void append(final XMLStreamWriter writer, final EntityInfoAggregator entityInfo,
+ final List<Map<String, Object>> data) throws EntityProviderException {
try {
writer.writeStartElement(FormatXml.D_LINKS);
writer.writeDefaultNamespace(Edm.NAMESPACE_D_2007_08);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducer.java
index 3ac20a5..51a09b4 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlMetadataProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -62,7 +62,8 @@ import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
public class XmlMetadataProducer {
- public static void writeMetadata(final DataServices metadata, final XMLStreamWriter xmlStreamWriter, Map<String, String> predefinedNamespaces) throws EntityProviderException {
+ public static void writeMetadata(final DataServices metadata, final XMLStreamWriter xmlStreamWriter,
+ Map<String, String> predefinedNamespaces) throws EntityProviderException {
try {
xmlStreamWriter.writeStartDocument();
@@ -75,7 +76,8 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeNamespace(Edm.PREFIX_EDMX, Edm.NAMESPACE_EDMX_2007_06);
xmlStreamWriter.writeStartElement(Edm.NAMESPACE_EDMX_2007_06, XmlMetadataConstants.EDM_DATA_SERVICES);
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.EDM_DATA_SERVICE_VERSION, metadata.getDataServiceVersion());
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08,
+ XmlMetadataConstants.EDM_DATA_SERVICE_VERSION, metadata.getDataServiceVersion());
xmlStreamWriter.writeNamespace(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08);
if (predefinedNamespaces != null) {
@@ -123,12 +125,14 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_TYPE_ABSTRACT, "true");
}
if (entityType.isHasStream()) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_ENTITY_TYPE_HAS_STREAM, "true");
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08,
+ XmlMetadataConstants.M_ENTITY_TYPE_HAS_STREAM, "true");
}
writeCustomizableFeedMappings(entityType.getCustomizableFeedMappings(), xmlStreamWriter);
- writeAnnotationAttributes(entityType.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(entityType.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(entityType.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
@@ -142,7 +146,8 @@ public class XmlMetadataProducer {
for (PropertyRef propertyRef : propertyRefs) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_PROPERTY_REF);
- writeAnnotationAttributes(propertyRef.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(propertyRef.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, propertyRef.getName());
@@ -166,15 +171,20 @@ public class XmlMetadataProducer {
for (NavigationProperty navigationProperty : navigationProperties) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_NAVIGATION_PROPERTY);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, navigationProperty.getName());
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAVIGATION_RELATIONSHIP, navigationProperty.getRelationship().toString());
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAVIGATION_FROM_ROLE, navigationProperty.getFromRole());
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAVIGATION_TO_ROLE, navigationProperty.getToRole());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAVIGATION_RELATIONSHIP, navigationProperty
+ .getRelationship().toString());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAVIGATION_FROM_ROLE, navigationProperty
+ .getFromRole());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAVIGATION_TO_ROLE, navigationProperty
+ .getToRole());
- writeAnnotationAttributes(navigationProperty.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(navigationProperty.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(navigationProperty.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
- writeAnnotationElements(navigationProperty.getAnnotationElements(), predefinedNamespaces, xmlStreamWriter);
+ writeAnnotationElements(navigationProperty.getAnnotationElements(), predefinedNamespaces,
+ xmlStreamWriter);
xmlStreamWriter.writeEndElement();
}
@@ -192,13 +202,15 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_COMPLEX_TYPE);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, complexType.getName());
if (complexType.getBaseType() != null) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_BASE_TYPE, complexType.getBaseType().toString());
+ xmlStreamWriter
+ .writeAttribute(XmlMetadataConstants.EDM_BASE_TYPE, complexType.getBaseType().toString());
}
if (complexType.isAbstract()) {
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_TYPE_ABSTRACT, "true");
}
- writeAnnotationAttributes(complexType.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(complexType.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(complexType.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
@@ -219,7 +231,8 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ASSOCIATION);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, association.getName());
- writeAnnotationAttributes(association.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(association.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(association.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
@@ -229,13 +242,15 @@ public class XmlMetadataProducer {
ReferentialConstraint referentialConstraint = association.getReferentialConstraint();
if (referentialConstraint != null) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ASSOCIATION_CONSTRAINT);
- writeAnnotationAttributes(referentialConstraint.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(referentialConstraint.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(referentialConstraint.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
ReferentialConstraintRole principal = referentialConstraint.getPrincipal();
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ASSOCIATION_PRINCIPAL);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ROLE, principal.getRole());
- writeAnnotationAttributes(principal.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(principal.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
for (PropertyRef propertyRef : principal.getPropertyRefs()) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_PROPERTY_REF);
@@ -248,7 +263,8 @@ public class XmlMetadataProducer {
ReferentialConstraintRole dependent = referentialConstraint.getDependent();
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ASSOCIATION_DEPENDENT);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ROLE, dependent.getRole());
- writeAnnotationAttributes(dependent.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(dependent.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
for (PropertyRef propertyRef : dependent.getPropertyRefs()) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_PROPERTY_REF);
@@ -258,7 +274,8 @@ public class XmlMetadataProducer {
writeAnnotationElements(dependent.getAnnotationElements(), predefinedNamespaces, xmlStreamWriter);
xmlStreamWriter.writeEndElement();
- writeAnnotationElements(referentialConstraint.getAnnotationElements(), predefinedNamespaces, xmlStreamWriter);
+ writeAnnotationElements(referentialConstraint.getAnnotationElements(), predefinedNamespaces,
+ xmlStreamWriter);
xmlStreamWriter.writeEndElement();
}
@@ -274,13 +291,16 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ENTITY_CONTAINER);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, entityContainer.getName());
if (entityContainer.getExtendz() != null) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_CONTAINER_EXTENDZ, entityContainer.getExtendz());
+ xmlStreamWriter
+ .writeAttribute(XmlMetadataConstants.EDM_CONTAINER_EXTENDZ, entityContainer.getExtendz());
}
if (entityContainer.isDefaultEntityContainer()) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.EDM_CONTAINER_IS_DEFAULT, "true");
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08,
+ XmlMetadataConstants.EDM_CONTAINER_IS_DEFAULT, "true");
}
- writeAnnotationAttributes(entityContainer.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(entityContainer.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(entityContainer.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
@@ -289,9 +309,11 @@ public class XmlMetadataProducer {
for (EntitySet entitySet : entitySets) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ENTITY_SET);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, entitySet.getName());
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ENTITY_TYPE, entitySet.getEntityType().toString());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ENTITY_TYPE, entitySet.getEntityType()
+ .toString());
- writeAnnotationAttributes(entitySet.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(entitySet.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(entitySet.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
@@ -306,16 +328,19 @@ public class XmlMetadataProducer {
for (AssociationSet associationSet : associationSets) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ASSOCIATION_SET);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, associationSet.getName());
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ASSOCIATION, associationSet.getAssociation().toString());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ASSOCIATION, associationSet.getAssociation()
+ .toString());
- writeAnnotationAttributes(associationSet.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(associationSet.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(associationSet.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
writeAssociationSetEnd(associationSet.getEnd1(), predefinedNamespaces, xmlStreamWriter);
writeAssociationSetEnd(associationSet.getEnd2(), predefinedNamespaces, xmlStreamWriter);
- writeAnnotationElements(associationSet.getAnnotationElements(), predefinedNamespaces, xmlStreamWriter);
+ writeAnnotationElements(associationSet.getAnnotationElements(), predefinedNamespaces,
+ xmlStreamWriter);
xmlStreamWriter.writeEndElement();
}
@@ -327,16 +352,19 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_FUNCTION_IMPORT);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, functionImport.getName());
if (functionImport.getReturnType() != null) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_FUNCTION_IMPORT_RETURN, functionImport.getReturnType().toString());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_FUNCTION_IMPORT_RETURN, functionImport
+ .getReturnType().toString());
}
if (functionImport.getEntitySet() != null) {
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ENTITY_SET, functionImport.getEntitySet());
}
if (functionImport.getHttpMethod() != null) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.EDM_FUNCTION_IMPORT_HTTP_METHOD, functionImport.getHttpMethod());
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08,
+ XmlMetadataConstants.EDM_FUNCTION_IMPORT_HTTP_METHOD, functionImport.getHttpMethod());
}
- writeAnnotationAttributes(functionImport.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(functionImport.getAnnotationAttributes(), predefinedNamespaces, null,
+ xmlStreamWriter);
writeDocumentation(functionImport.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
@@ -345,24 +373,30 @@ public class XmlMetadataProducer {
for (FunctionImportParameter functionImportParameter : functionImportParameters) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_FUNCTION_PARAMETER);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, functionImportParameter.getName());
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_TYPE, functionImportParameter.getType().getFullQualifiedName().toString());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_TYPE, functionImportParameter.getType()
+ .getFullQualifiedName().toString());
if (functionImportParameter.getMode() != null) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_FUNCTION_PARAMETER_MODE, functionImportParameter.getMode());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_FUNCTION_PARAMETER_MODE,
+ functionImportParameter.getMode());
}
writeFacets(xmlStreamWriter, functionImportParameter.getFacets());
- writeAnnotationAttributes(functionImportParameter.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
+ writeAnnotationAttributes(functionImportParameter.getAnnotationAttributes(),
+ predefinedNamespaces, null, xmlStreamWriter);
- writeDocumentation(functionImportParameter.getDocumentation(), predefinedNamespaces, xmlStreamWriter);
+ writeDocumentation(functionImportParameter.getDocumentation(), predefinedNamespaces,
+ xmlStreamWriter);
- writeAnnotationElements(functionImportParameter.getAnnotationElements(), predefinedNamespaces, xmlStreamWriter);
+ writeAnnotationElements(functionImportParameter.getAnnotationElements(), predefinedNamespaces,
+ xmlStreamWriter);
xmlStreamWriter.writeEndElement();
}
}
- writeAnnotationElements(functionImport.getAnnotationElements(), predefinedNamespaces, xmlStreamWriter);
+ writeAnnotationElements(functionImport.getAnnotationElements(), predefinedNamespaces,
+ xmlStreamWriter);
xmlStreamWriter.writeEndElement();
}
@@ -392,37 +426,48 @@ public class XmlMetadataProducer {
}
}
- private static void writeCustomizableFeedMappings(final CustomizableFeedMappings customizableFeedMappings, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ private static void writeCustomizableFeedMappings(final CustomizableFeedMappings customizableFeedMappings,
+ final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
if (customizableFeedMappings != null) {
if (customizableFeedMappings.getFcKeepInContent() != null) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_KEEP_IN_CONTENT, customizableFeedMappings.getFcKeepInContent().toString().toLowerCase(Locale.ROOT));
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08,
+ XmlMetadataConstants.M_FC_KEEP_IN_CONTENT, customizableFeedMappings.getFcKeepInContent().toString()
+ .toLowerCase(Locale.ROOT));
}
if (customizableFeedMappings.getFcContentKind() != null) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_CONTENT_KIND, customizableFeedMappings.getFcContentKind().toString());
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_CONTENT_KIND,
+ customizableFeedMappings.getFcContentKind().toString());
}
if (customizableFeedMappings.getFcNsPrefix() != null) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_PREFIX, customizableFeedMappings.getFcNsPrefix());
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_PREFIX,
+ customizableFeedMappings.getFcNsPrefix());
}
if (customizableFeedMappings.getFcNsUri() != null) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_NS_URI, customizableFeedMappings.getFcNsUri());
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_NS_URI,
+ customizableFeedMappings.getFcNsUri());
}
if (customizableFeedMappings.getFcSourcePath() != null) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_SOURCE_PATH, customizableFeedMappings.getFcSourcePath());
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_SOURCE_PATH,
+ customizableFeedMappings.getFcSourcePath());
}
if (customizableFeedMappings.getFcTargetPath() != null) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_TARGET_PATH, customizableFeedMappings.getFcTargetPath().toString());
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_TARGET_PATH,
+ customizableFeedMappings.getFcTargetPath().toString());
}
}
}
- private static void writeProperties(final Collection<Property> properties, final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ private static void writeProperties(final Collection<Property> properties,
+ final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
for (Property property : properties) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_PROPERTY);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_NAME, property.getName());
if (property instanceof SimpleProperty) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_TYPE, ((SimpleProperty) property).getType().getFullQualifiedName().toString());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_TYPE, ((SimpleProperty) property).getType()
+ .getFullQualifiedName().toString());
} else if (property instanceof ComplexProperty) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_TYPE, ((ComplexProperty) property).getType().toString());
+ xmlStreamWriter
+ .writeAttribute(XmlMetadataConstants.EDM_TYPE, ((ComplexProperty) property).getType().toString());
} else {
throw new ODataRuntimeException();
}
@@ -430,7 +475,8 @@ public class XmlMetadataProducer {
writeFacets(xmlStreamWriter, property.getFacets());
if (property.getMimeType() != null) {
- xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_MIMETYPE, property.getMimeType());
+ xmlStreamWriter.writeAttribute(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_MIMETYPE, property
+ .getMimeType());
}
writeCustomizableFeedMappings(property.getCustomizableFeedMappings(), xmlStreamWriter);
@@ -445,10 +491,12 @@ public class XmlMetadataProducer {
}
}
- private static void writeFacets(final XMLStreamWriter xmlStreamWriter, final EdmFacets facets) throws XMLStreamException {
+ private static void writeFacets(final XMLStreamWriter xmlStreamWriter, final EdmFacets facets)
+ throws XMLStreamException {
if (facets != null) {
if (facets.isNullable() != null) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_NULLABLE, facets.isNullable().toString().toLowerCase(Locale.ROOT));
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_NULLABLE, facets.isNullable().toString()
+ .toLowerCase(Locale.ROOT));
}
if (facets.getDefaultValue() != null) {
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_DEFAULT_VALUE, facets.getDefaultValue());
@@ -457,7 +505,8 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_MAX_LENGTH, facets.getMaxLength().toString());
}
if (facets.isFixedLength() != null) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_FIXED_LENGTH, facets.isFixedLength().toString().toLowerCase(Locale.ROOT));
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_FIXED_LENGTH, facets.isFixedLength()
+ .toString().toLowerCase(Locale.ROOT));
}
if (facets.getPrecision() != null) {
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_PRECISION, facets.getPrecision().toString());
@@ -472,12 +521,14 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_COLLATION, facets.getCollation());
}
if (facets.getConcurrencyMode() != null) {
- xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_CONCURRENCY_MODE, facets.getConcurrencyMode().toString());
+ xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_PROPERTY_CONCURRENCY_MODE, facets.getConcurrencyMode()
+ .toString());
}
}
}
- private static void writeAssociationEnd(final AssociationEnd end, final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ private static void writeAssociationEnd(final AssociationEnd end, final Map<String, String> predefinedNamespaces,
+ final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ASSOCIATION_END);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_TYPE, end.getType().toString());
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ASSOCIATION_MULTIPLICITY, end.getMultiplicity().toString());
@@ -504,7 +555,8 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeEndElement();
}
- private static void writeAssociationSetEnd(final AssociationSetEnd end, final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ private static void writeAssociationSetEnd(final AssociationSetEnd end,
+ final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.EDM_ASSOCIATION_END);
xmlStreamWriter.writeAttribute(XmlMetadataConstants.EDM_ENTITY_SET, end.getEntitySet().toString());
if (end.getRole() != null) {
@@ -516,7 +568,8 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeEndElement();
}
- private static void writeDocumentation(final Documentation documentation, final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ private static void writeDocumentation(final Documentation documentation,
+ final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
if (documentation != null) {
xmlStreamWriter.writeStartElement(XmlMetadataConstants.DOCUMENTATION);
writeAnnotationAttributes(documentation.getAnnotationAttributes(), predefinedNamespaces, null, xmlStreamWriter);
@@ -534,15 +587,19 @@ public class XmlMetadataProducer {
}
}
- private static void writeAnnotationAttributes(final Collection<AnnotationAttribute> annotationAttributes, final Map<String, String> predefinedNamespaces, ArrayList<String> setNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ private static void writeAnnotationAttributes(final Collection<AnnotationAttribute> annotationAttributes,
+ final Map<String, String> predefinedNamespaces, ArrayList<String> setNamespaces,
+ final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
if (annotationAttributes != null) {
if (setNamespaces == null) {
setNamespaces = new ArrayList<String>();
}
for (AnnotationAttribute annotationAttribute : annotationAttributes) {
if (annotationAttribute.getNamespace() != null) {
- xmlStreamWriter.writeAttribute(annotationAttribute.getPrefix(), annotationAttribute.getNamespace(), annotationAttribute.getName(), annotationAttribute.getText());
- if (setNamespaces.contains(annotationAttribute.getNamespace()) == false && predefinedNamespaces.containsValue(annotationAttribute.getNamespace()) == false) {
+ xmlStreamWriter.writeAttribute(annotationAttribute.getPrefix(), annotationAttribute.getNamespace(),
+ annotationAttribute.getName(), annotationAttribute.getText());
+ if (setNamespaces.contains(annotationAttribute.getNamespace()) == false
+ && predefinedNamespaces.containsValue(annotationAttribute.getNamespace()) == false) {
xmlStreamWriter.writeNamespace(annotationAttribute.getPrefix(), annotationAttribute.getNamespace());
setNamespaces.add(annotationAttribute.getNamespace());
}
@@ -553,13 +610,15 @@ public class XmlMetadataProducer {
}
}
- private static void writeAnnotationElements(final Collection<AnnotationElement> annotationElements, final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ private static void writeAnnotationElements(final Collection<AnnotationElement> annotationElements,
+ final Map<String, String> predefinedNamespaces, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
if (annotationElements != null) {
for (AnnotationElement annotationElement : annotationElements) {
ArrayList<String> setNamespaces = new ArrayList<String>();
if (annotationElement.getNamespace() != null) {
if (annotationElement.getPrefix() != null) {
- xmlStreamWriter.writeStartElement(annotationElement.getPrefix(), annotationElement.getName(), annotationElement.getNamespace());
+ xmlStreamWriter.writeStartElement(annotationElement.getPrefix(), annotationElement.getName(),
+ annotationElement.getNamespace());
if (!predefinedNamespaces.containsValue(annotationElement.getNamespace())) {
xmlStreamWriter.writeNamespace(annotationElement.getPrefix(), annotationElement.getNamespace());
setNamespaces.add(annotationElement.getNamespace());
@@ -575,7 +634,8 @@ public class XmlMetadataProducer {
xmlStreamWriter.writeStartElement(annotationElement.getName());
}
- writeAnnotationAttributes(annotationElement.getAttributes(), predefinedNamespaces, setNamespaces, xmlStreamWriter);
+ writeAnnotationAttributes(annotationElement.getAttributes(), predefinedNamespaces, setNamespaces,
+ xmlStreamWriter);
if (annotationElement.getChildElements() != null) {
writeAnnotationElements(annotationElement.getChildElements(), predefinedNamespaces, xmlStreamWriter);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
index 4f2444d..90931d6 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -36,21 +36,22 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
* Internal EntityProvider for simple and complex EDM properties which are pre-analyzed as {@link EntityPropertyInfo}.
- *
+ *
*/
public class XmlPropertyEntityProducer {
/**
- * Append {@link Object} <code>value</code> based on {@link EntityPropertyInfo} to {@link XMLStreamWriter}
- * in an already existing XML structure inside the d namespace.
+ * Append {@link Object} <code>value</code> based on {@link EntityPropertyInfo} to {@link XMLStreamWriter} in an
+ * already existing XML structure inside the d namespace.
*
* @param writer
- * @param name Name of the outer XML tag
+ * @param name Name of the outer XML tag
* @param propertyInfo
* @param value
* @throws EntityProviderException
*/
- public void append(final XMLStreamWriter writer, final String name, final EntityPropertyInfo propertyInfo, final Object value) throws EntityProviderException {
+ public void append(final XMLStreamWriter writer, final String name, final EntityPropertyInfo propertyInfo,
+ final Object value) throws EntityProviderException {
try {
writer.writeStartElement(Edm.NAMESPACE_D_2007_08, name);
@@ -68,7 +69,8 @@ public class XmlPropertyEntityProducer {
}
}
- public void appendCustomProperty(final XMLStreamWriter writer, final String name, final EntityPropertyInfo propertyInfo, final Object value) throws EntityProviderException {
+ public void appendCustomProperty(final XMLStreamWriter writer, final String name,
+ final EntityPropertyInfo propertyInfo, final Object value) throws EntityProviderException {
try {
if (!propertyInfo.isComplex()) {
writeStartElementWithCustomNamespace(writer, propertyInfo, name);
@@ -83,8 +85,8 @@ public class XmlPropertyEntityProducer {
}
/**
- * Append {@link Object} <code>value</code> based on {@link EntityPropertyInfo} to {@link XMLStreamWriter}
- * as a stand-alone XML structure, including writing of default namespace declarations.
+ * Append {@link Object} <code>value</code> based on {@link EntityPropertyInfo} to {@link XMLStreamWriter} as a
+ * stand-alone XML structure, including writing of default namespace declarations.
* The name of the outermost XML element comes from the {@link EntityPropertyInfo}.
*
* @param writer
@@ -92,7 +94,8 @@ public class XmlPropertyEntityProducer {
* @param value
* @throws EntityProviderException
*/
- public void append(final XMLStreamWriter writer, final EntityPropertyInfo propertyInfo, final Object value) throws EntityProviderException {
+ public void append(final XMLStreamWriter writer, final EntityPropertyInfo propertyInfo, final Object value)
+ throws EntityProviderException {
try {
writer.writeStartElement(propertyInfo.getName());
writer.writeDefaultNamespace(Edm.NAMESPACE_D_2007_08);
@@ -121,7 +124,8 @@ public class XmlPropertyEntityProducer {
* @throws EdmException
* @throws EntityProviderException
*/
- private void appendProperty(final XMLStreamWriter writer, final EntityComplexPropertyInfo propertyInfo, final Object value) throws XMLStreamException, EdmException, EntityProviderException {
+ private void appendProperty(final XMLStreamWriter writer, final EntityComplexPropertyInfo propertyInfo,
+ final Object value) throws XMLStreamException, EdmException, EntityProviderException {
if (value == null) {
writer.writeAttribute(Edm.NAMESPACE_M_2007_08, FormatXml.ATOM_NULL, FormatXml.ATOM_VALUE_TRUE);
@@ -167,7 +171,8 @@ public class XmlPropertyEntityProducer {
* @throws XMLStreamException
* @throws EdmException
*/
- private void appendProperty(final XMLStreamWriter writer, final EntityPropertyInfo prop, final Object value) throws XMLStreamException, EdmException {
+ private void appendProperty(final XMLStreamWriter writer, final EntityPropertyInfo prop, final Object value)
+ throws XMLStreamException, EdmException {
Object contentValue = value;
String mimeType = null;
if (prop.getMimeType() != null) {
@@ -198,7 +203,8 @@ public class XmlPropertyEntityProducer {
* @throws XMLStreamException
* @throws EntityProviderException
*/
- private void writeStartElementWithCustomNamespace(final XMLStreamWriter writer, final EntityPropertyInfo prop, final String name) throws XMLStreamException, EntityProviderException {
+ private void writeStartElementWithCustomNamespace(final XMLStreamWriter writer, final EntityPropertyInfo prop,
+ final String name) throws XMLStreamException, EntityProviderException {
EdmCustomizableFeedMappings mapping = prop.getCustomMapping();
String nsPrefix = mapping.getFcNsPrefix();
String nsUri = mapping.getFcNsUri();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java
index fe29250..9a14f66 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.util;
@@ -29,7 +29,7 @@ import java.util.concurrent.LinkedBlockingQueue;
* Circular stream buffer to write/read into/from one single buffer.
* With support of {@link InputStream} and {@link OutputStream} access to buffered data.
*
- *
+ *
*/
public class CircleStreamBuffer {
@@ -231,7 +231,8 @@ public class CircleStreamBuffer {
}
/**
- * Creates a new buffer (per {@link #allocateBuffer(int)}) with the requested capacity as minimum capacity, add the new allocated
+ * Creates a new buffer (per {@link #allocateBuffer(int)}) with the requested capacity as minimum capacity, add the
+ * new allocated
* buffer to the {@link #bufferQueue} and set it as {@link #currentWriteBuffer}.
*
* @param requestedCapacity minimum capacity for new allocated buffer
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java
index 05b1a29..28b31e1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java
@@ -1,26 +1,26 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.util;
/**
* String constants for formatting and parsing of JSON.
- *
+ *
*/
public class FormatJson {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java
index f43809e..153647b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java
@@ -1,26 +1,26 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.util;
/**
* String constants for formatting and parsing of XML.
- *
+ *
*/
public class FormatXml {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java
index 5822217..b4cf8c4 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.util;
@@ -23,7 +23,7 @@ import java.io.Writer;
/**
* Writes JSON output.
- *
+ *
*/
public class JsonStreamWriter {
private final Writer writer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonUtils.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonUtils.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonUtils.java
index b724957..786c24e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonUtils.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonUtils.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.util;
@@ -28,8 +28,8 @@ import com.google.gson.stream.JsonToken;
public class JsonUtils {
public static int startJson(final JsonReader reader) throws EntityProviderException {
- //The enclosing "d" and "results" are optional - so we cannot check for the presence
- //but we have to read over them in case they are present.
+ // The enclosing "d" and "results" are optional - so we cannot check for the presence
+ // but we have to read over them in case they are present.
JsonToken token;
try {
token = reader.peek();
@@ -41,8 +41,9 @@ public class JsonUtils {
if (JsonToken.NAME == token) {
String name = reader.nextName();
if (!("d".equals(name) ^ "results".equals(name))) {
- //TODO I18N
- throw new EntityProviderException(EntityProviderException.COMMON, name + " not expected, only d or results");
+ // TODO I18N
+ throw new EntityProviderException(EntityProviderException.COMMON, name +
+ " not expected, only d or results");
}
}
@@ -51,19 +52,20 @@ public class JsonUtils {
reader.beginObject();
openJsonObjects++;
} else if (JsonToken.BEGIN_ARRAY == token) {
- //TODO I18N
+ // TODO I18N
throw new EntityProviderException(EntityProviderException.COMMON, "Array not expected");
}
}
return openJsonObjects;
} catch (IOException e) {
- //TODO I18N
+ // TODO I18N
throw new EntityProviderException(EntityProviderException.COMMON, e);
}
}
- public static boolean endJson(final JsonReader reader, final int openJsonObjects) throws IOException, EntityProviderException {
+ public static boolean endJson(final JsonReader reader, final int openJsonObjects) throws IOException,
+ EntityProviderException {
for (int closedJsonObjects = 0; closedJsonObjects < openJsonObjects; closedJsonObjects++) {
reader.endObject();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/XmlMetadataConstants.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/XmlMetadataConstants.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/XmlMetadataConstants.java
index 875df95..52adf2d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/XmlMetadataConstants.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/XmlMetadataConstants.java
@@ -1,26 +1,26 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.util;
/**
* String constants for deserialization and serialization of metadata document.
- *
+ *
*/
public class XmlMetadataConstants {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java
index 6f8a310..bd87eff 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.exception;
@@ -50,7 +50,8 @@ public class MessageService {
/**
* Create a {@link ResourceBundle} based on given locale and name ({@value #BUNDLE_NAME}).
- * If during creation an exception occurs it is catched and an special bundle is created with error type and message of
+ * If during creation an exception occurs it is catched and an special bundle is created with error type and message
+ * of
* this exception.
*
* @param locale for which locale the {@link ResourceBundle} is created
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java
index 42a7026..d5eaacb 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.exception;
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.core.exception;
* Common un-checked exception for the <code>OData</code> library and
* base exception for all <code>OData</code>-related exceptions
* caused by programming errors and/or unexpected behavior within the code.
- *
+ *
*/
public final class ODataRuntimeException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java
index 0aec7b5..fed0a43 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.processor;
@@ -49,10 +49,10 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
/**
* <p>An {@link ODataService} implementation that uses {@link ODataSingleProcessor}.</p>
* <p>Usually custom services create an instance by their implementation of
- * {@link org.apache.olingo.odata2.api.ODataServiceFactory} and populate it with their custom {@link EdmProvider}
- * and custom {@link ODataSingleProcessor} implementations.</p>
- *
- *
+ * {@link org.apache.olingo.odata2.api.ODataServiceFactory} and populate it with their custom {@link EdmProvider} and
+ * custom {@link ODataSingleProcessor} implementations.</p>
+ *
+ *
*/
public class ODataSingleProcessorService implements ODataService {
@@ -198,7 +198,8 @@ public class ODataSingleProcessorService implements ODataService {
}
@Override
- public List<String> getSupportedContentTypes(final Class<? extends ODataProcessor> processorFeature) throws ODataException {
+ public List<String> getSupportedContentTypes(final Class<? extends ODataProcessor> processorFeature)
+ throws ODataException {
List<String> result = new ArrayList<String>();
if (processor instanceof CustomContentType) {
@@ -206,7 +207,7 @@ public class ODataSingleProcessorService implements ODataService {
}
if (processorFeature == BatchProcessor.class) {
- //set wildcard for now to ignore accept header completely, reasoning: there is only one representation for $batch
+ // set wildcard for now to ignore accept header completely, reasoning: there is only one representation for $batch
result.add(HttpContentType.WILDCARD);
} else if (processorFeature == EntityProcessor.class) {
result.add(HttpContentType.APPLICATION_ATOM_XML_ENTRY_UTF8);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java
index ec05a98..330030b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
[30/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java
index 851daf0..5911d3c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.entry;
@@ -68,6 +68,7 @@ public class MediaMetadataImpl implements MediaMetadata {
@Override
public String toString() {
- return "MediaMetadataImpl [sourceLink=" + sourceLink + ", etag=" + etag + ", contentType=" + contentType + ", editLink=" + editLink + "]";
+ return "MediaMetadataImpl [sourceLink=" + sourceLink + ", etag=" + etag + ", contentType=" + contentType
+ + ", editLink=" + editLink + "]";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java
index 73e2b27..96ecf75 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.entry;
@@ -37,11 +37,14 @@ public class ODataEntryImpl implements ODataEntry {
private final ExpandSelectTreeNode expandSelectTree;
private boolean containsInlineEntry;
- public ODataEntryImpl(final Map<String, Object> data, final MediaMetadata mediaMetadata, final EntryMetadata entryMetadata, final ExpandSelectTreeNodeImpl expandSelectTree) {
+ public ODataEntryImpl(final Map<String, Object> data, final MediaMetadata mediaMetadata,
+ final EntryMetadata entryMetadata, final ExpandSelectTreeNodeImpl expandSelectTree) {
this(data, mediaMetadata, entryMetadata, expandSelectTree, false);
}
- public ODataEntryImpl(final Map<String, Object> data, final MediaMetadata mediaMetadata, final EntryMetadata entryMetadata, final ExpandSelectTreeNode expandSelectTree, final boolean containsInlineEntry) {
+ public ODataEntryImpl(final Map<String, Object> data, final MediaMetadata mediaMetadata,
+ final EntryMetadata entryMetadata, final ExpandSelectTreeNode expandSelectTree,
+ final boolean containsInlineEntry) {
this.data = data;
this.entryMetadata = entryMetadata;
this.mediaMetadata = mediaMetadata;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/FeedMetadataImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/FeedMetadataImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/FeedMetadataImpl.java
index 3f18298..94aa2d3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/FeedMetadataImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/FeedMetadataImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.feed;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataFeedImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataFeedImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataFeedImpl.java
index 9dd0328..634c0bc 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataFeedImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataFeedImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.feed;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
index 38b5132..d85e577 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -62,7 +62,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
* Serializes an ATOM entry.
- *
+ *
*/
public class AtomEntryEntityProducer {
@@ -74,7 +74,8 @@ public class AtomEntryEntityProducer {
this.properties = properties == null ? EntityProviderWriteProperties.serviceRoot(null).build() : properties;
}
- public void append(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data, final boolean isRootElement, final boolean isFeedPart) throws EntityProviderException {
+ public void append(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data,
+ final boolean isRootElement, final boolean isFeedPart) throws EntityProviderException {
try {
writer.writeStartElement(FormatXml.ATOM_ENTRY);
@@ -84,7 +85,8 @@ public class AtomEntryEntityProducer {
writer.writeNamespace(Edm.PREFIX_D, Edm.NAMESPACE_D_2007_08);
}
if (!isFeedPart) {
- writer.writeAttribute(Edm.PREFIX_XML, Edm.NAMESPACE_XML_1998, FormatXml.XML_BASE, properties.getServiceRoot().toASCIIString());
+ writer.writeAttribute(Edm.PREFIX_XML, Edm.NAMESPACE_XML_1998, FormatXml.XML_BASE, properties.getServiceRoot()
+ .toASCIIString());
}
etag = createETag(eia, data);
@@ -129,7 +131,8 @@ public class AtomEntryEntityProducer {
}
}
- private void appendCustomProperties(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException {
+ private void appendCustomProperties(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> data) throws EntityProviderException {
List<String> noneSyndicationTargetPaths = eia.getNoneSyndicationTargetPathNames();
for (String tpName : noneSyndicationTargetPaths) {
EntityPropertyInfo info = eia.getTargetPathInfo(tpName);
@@ -139,7 +142,8 @@ public class AtomEntryEntityProducer {
}
}
- protected static String createETag(final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException {
+ protected static String createETag(final EntityInfoAggregator eia, final Map<String, Object> data)
+ throws EntityProviderException {
try {
String etag = null;
@@ -149,9 +153,15 @@ public class AtomEntryEntityProducer {
if (edmType instanceof EdmSimpleType) {
EdmSimpleType edmSimpleType = (EdmSimpleType) edmType;
if (etag == null) {
- etag = edmSimpleType.valueToString(data.get(propertyInfo.getName()), EdmLiteralKind.DEFAULT, propertyInfo.getFacets());
+ etag =
+ edmSimpleType.valueToString(data.get(propertyInfo.getName()), EdmLiteralKind.DEFAULT, propertyInfo
+ .getFacets());
} else {
- etag = etag + Edm.DELIMITER + edmSimpleType.valueToString(data.get(propertyInfo.getName()), EdmLiteralKind.DEFAULT, propertyInfo.getFacets());
+ etag =
+ etag
+ + Edm.DELIMITER
+ + edmSimpleType.valueToString(data.get(propertyInfo.getName()), EdmLiteralKind.DEFAULT,
+ propertyInfo.getFacets());
}
}
}
@@ -166,7 +176,8 @@ public class AtomEntryEntityProducer {
}
}
- private void appendAtomNavigationLinks(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException, EdmException, URISyntaxException {
+ private void appendAtomNavigationLinks(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> data) throws EntityProviderException, EdmException, URISyntaxException {
for (String name : eia.getSelectedNavigationPropertyNames()) {
NavigationPropertyInfo info = eia.getNavigationPropertyInfo(name);
boolean isFeed = (info.getMultiplicity() == EdmMultiplicity.MANY);
@@ -175,7 +186,9 @@ public class AtomEntryEntityProducer {
}
}
- private void appendAtomNavigationLink(final XMLStreamWriter writer, final String self, final String navigationPropertyName, final boolean isFeed, final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException, EdmException, URISyntaxException {
+ private void appendAtomNavigationLink(final XMLStreamWriter writer, final String self,
+ final String navigationPropertyName, final boolean isFeed, final EntityInfoAggregator eia,
+ final Map<String, Object> data) throws EntityProviderException, EdmException, URISyntaxException {
try {
writer.writeStartElement(FormatXml.ATOM_LINK);
writer.writeAttribute(FormatXml.ATOM_HREF, self);
@@ -195,7 +208,9 @@ public class AtomEntryEntityProducer {
}
}
- private void appendInlineFeed(final XMLStreamWriter writer, final String navigationPropertyName, final EntityInfoAggregator eia, final Map<String, Object> data, final String self) throws EntityProviderException, XMLStreamException, EdmException, URISyntaxException {
+ private void appendInlineFeed(final XMLStreamWriter writer, final String navigationPropertyName,
+ final EntityInfoAggregator eia, final Map<String, Object> data, final String self)
+ throws EntityProviderException, XMLStreamException, EdmException, URISyntaxException {
if (eia.getExpandedNavigationPropertyNames().contains(navigationPropertyName)) {
if (properties.getCallbacks() != null && properties.getCallbacks().containsKey(navigationPropertyName)) {
@@ -228,7 +243,8 @@ public class AtomEntryEntityProducer {
EntityProviderWriteProperties inlineProperties = result.getInlineProperties();
EdmEntitySet inlineEntitySet = eia.getEntitySet().getRelatedEntitySet(navProp);
AtomFeedProducer inlineFeedProducer = new AtomFeedProducer(inlineProperties);
- EntityInfoAggregator inlineEia = EntityInfoAggregator.create(inlineEntitySet, inlineProperties.getExpandSelectTree());
+ EntityInfoAggregator inlineEia =
+ EntityInfoAggregator.create(inlineEntitySet, inlineProperties.getExpandSelectTree());
inlineFeedProducer.append(writer, inlineEia, inlineData, true);
writer.writeEndElement();
@@ -236,7 +252,9 @@ public class AtomEntryEntityProducer {
}
}
- private void appendInlineEntry(final XMLStreamWriter writer, final String navigationPropertyName, final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException, XMLStreamException, EdmException {
+ private void appendInlineEntry(final XMLStreamWriter writer, final String navigationPropertyName,
+ final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException,
+ XMLStreamException, EdmException {
if (eia.getExpandedNavigationPropertyNames().contains(navigationPropertyName)) {
if (properties.getCallbacks() != null && properties.getCallbacks().containsKey(navigationPropertyName)) {
@@ -265,7 +283,8 @@ public class AtomEntryEntityProducer {
EntityProviderWriteProperties inlineProperties = result.getInlineProperties();
EdmEntitySet inlineEntitySet = eia.getEntitySet().getRelatedEntitySet(navProp);
AtomEntryEntityProducer inlineProducer = new AtomEntryEntityProducer(inlineProperties);
- EntityInfoAggregator inlineEia = EntityInfoAggregator.create(inlineEntitySet, inlineProperties.getExpandSelectTree());
+ EntityInfoAggregator inlineEia =
+ EntityInfoAggregator.create(inlineEntitySet, inlineProperties.getExpandSelectTree());
inlineProducer.append(writer, inlineEia, inlineData, false, false);
}
@@ -275,7 +294,8 @@ public class AtomEntryEntityProducer {
}
- private void appendAtomEditLink(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException {
+ private void appendAtomEditLink(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> data) throws EntityProviderException {
try {
String self = createSelfLink(eia, data, null);
@@ -291,7 +311,8 @@ public class AtomEntryEntityProducer {
}
}
- private void appendAtomContentLink(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data, String mediaResourceMimeType) throws EntityProviderException {
+ private void appendAtomContentLink(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> data, String mediaResourceMimeType) throws EntityProviderException {
try {
String self = createSelfLink(eia, data, "$value");
@@ -309,7 +330,8 @@ public class AtomEntryEntityProducer {
}
}
- private void appendAtomContentPart(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data, String mediaResourceMimeType) throws EntityProviderException {
+ private void appendAtomContentPart(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> data, String mediaResourceMimeType) throws EntityProviderException {
try {
String self = createSelfLink(eia, data, "$value");
@@ -326,7 +348,8 @@ public class AtomEntryEntityProducer {
}
}
- private void appendAtomMandatoryParts(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException {
+ private void appendAtomMandatoryParts(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> data) throws EntityProviderException {
try {
writer.writeStartElement(FormatXml.ATOM_ID);
location = properties.getServiceRoot().toASCIIString() + createSelfLink(eia, data, null);
@@ -360,7 +383,8 @@ public class AtomEntryEntityProducer {
}
}
- String getUpdatedString(final EntityInfoAggregator eia, final Map<String, Object> data) throws EdmSimpleTypeException {
+ String getUpdatedString(final EntityInfoAggregator eia, final Map<String, Object> data)
+ throws EdmSimpleTypeException {
Object updateDate = null;
EdmFacets updateFacets = null;
EntityPropertyInfo updatedInfo = eia.getTargetPathInfo(EdmTargetPath.SYNDICATION_UPDATED);
@@ -373,11 +397,13 @@ public class AtomEntryEntityProducer {
if (updateDate == null) {
updateDate = new Date();
}
- String valueToString = EdmDateTimeOffset.getInstance().valueToString(updateDate, EdmLiteralKind.DEFAULT, updateFacets);
+ String valueToString =
+ EdmDateTimeOffset.getInstance().valueToString(updateDate, EdmLiteralKind.DEFAULT, updateFacets);
return valueToString;
}
- private String getTargetPathValue(final EntityInfoAggregator eia, final String targetPath, final Map<String, Object> data) throws EntityProviderException {
+ private String getTargetPathValue(final EntityInfoAggregator eia, final String targetPath,
+ final Map<String, Object> data) throws EntityProviderException {
try {
EntityPropertyInfo info = eia.getTargetPathInfo(targetPath);
if (info != null) {
@@ -391,7 +417,8 @@ public class AtomEntryEntityProducer {
}
}
- private void appendAtomOptionalParts(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException {
+ private void appendAtomOptionalParts(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> data) throws EntityProviderException {
try {
String authorEmail = getTargetPathValue(eia, EdmTargetPath.SYNDICATION_AUTHOREMAIL, data);
String authorName = getTargetPathValue(eia, EdmTargetPath.SYNDICATION_AUTHORNAME, data);
@@ -435,7 +462,8 @@ public class AtomEntryEntityProducer {
}
}
- private void appendAtomOptionalPart(final XMLStreamWriter writer, final String name, final String value, final boolean writeType) throws EntityProviderException {
+ private void appendAtomOptionalPart(final XMLStreamWriter writer, final String name, final String value,
+ final boolean writeType) throws EntityProviderException {
try {
if (value != null) {
writer.writeStartElement(name);
@@ -450,7 +478,8 @@ public class AtomEntryEntityProducer {
}
}
- static String createSelfLink(final EntityInfoAggregator eia, final Map<String, Object> data, final String extension) throws EntityProviderException {
+ static String createSelfLink(final EntityInfoAggregator eia, final Map<String, Object> data, final String extension)
+ throws EntityProviderException {
StringBuilder sb = new StringBuilder();
if (!eia.isDefaultEntityContainer()) {
sb.append(Encoder.encode(eia.getEntityContainerName())).append(Edm.DELIMITER);
@@ -461,7 +490,8 @@ public class AtomEntryEntityProducer {
return sb.toString();
}
- private static String createEntryKey(final EntityInfoAggregator entityInfo, final Map<String, Object> data) throws EntityProviderException {
+ private static String createEntryKey(final EntityInfoAggregator entityInfo, final Map<String, Object> data)
+ throws EntityProviderException {
final List<EntityPropertyInfo> keyPropertyInfos = entityInfo.getKeyPropertyInfos();
StringBuilder keys = new StringBuilder();
@@ -477,7 +507,8 @@ public class AtomEntryEntityProducer {
final EdmSimpleType type = (EdmSimpleType) keyPropertyInfo.getType();
try {
- keys.append(Encoder.encode(type.valueToString(data.get(name), EdmLiteralKind.URI, keyPropertyInfo.getFacets())));
+ keys.append(Encoder.encode(type.valueToString(data.get(name), EdmLiteralKind.URI,
+ keyPropertyInfo.getFacets())));
} catch (final EdmSimpleTypeException e) {
throw new EntityProviderException(EntityProviderException.COMMON, e);
}
@@ -486,7 +517,8 @@ public class AtomEntryEntityProducer {
return keys.toString();
}
- private void appendProperties(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> data) throws EntityProviderException {
+ private void appendProperties(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> data) throws EntityProviderException {
try {
List<String> propertyNames = eia.getSelectedPropertyNames();
if (!propertyNames.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java
index 4e37197..5684814 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -42,7 +42,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
* Serializes an ATOM feed.
- *
+ *
*/
public class AtomFeedProducer {
@@ -52,7 +52,8 @@ public class AtomFeedProducer {
this.properties = properties == null ? EntityProviderWriteProperties.serviceRoot(null).build() : properties;
}
- public void append(final XMLStreamWriter writer, final EntityInfoAggregator eia, final List<Map<String, Object>> data, final boolean isInline) throws EntityProviderException {
+ public void append(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final List<Map<String, Object>> data, final boolean isInline) throws EntityProviderException {
try {
writer.writeStartElement(FormatXml.ATOM_FEED);
TombstoneCallback callback = null;
@@ -65,7 +66,8 @@ public class AtomFeedProducer {
writer.writeNamespace(TombstoneCallback.PREFIX_TOMBSTONE, TombstoneCallback.NAMESPACE_TOMBSTONE);
}
}
- writer.writeAttribute(Edm.PREFIX_XML, Edm.NAMESPACE_XML_1998, FormatXml.XML_BASE, properties.getServiceRoot().toASCIIString());
+ writer.writeAttribute(Edm.PREFIX_XML, Edm.NAMESPACE_XML_1998, FormatXml.XML_BASE, properties.getServiceRoot()
+ .toASCIIString());
// write all atom infos (mandatory and optional)
appendAtomMandatoryParts(writer, eia);
@@ -91,15 +93,18 @@ public class AtomFeedProducer {
}
private TombstoneCallback getTombstoneCallback() {
- if (properties.getCallbacks() != null && properties.getCallbacks().containsKey(TombstoneCallback.CALLBACK_KEY_TOMBSTONE)) {
- TombstoneCallback callback = (TombstoneCallback) properties.getCallbacks().get(TombstoneCallback.CALLBACK_KEY_TOMBSTONE);
+ if (properties.getCallbacks() != null
+ && properties.getCallbacks().containsKey(TombstoneCallback.CALLBACK_KEY_TOMBSTONE)) {
+ TombstoneCallback callback =
+ (TombstoneCallback) properties.getCallbacks().get(TombstoneCallback.CALLBACK_KEY_TOMBSTONE);
return callback;
} else {
return null;
}
}
- private void appendDeletedEntries(final XMLStreamWriter writer, final EntityInfoAggregator eia, final TombstoneCallback callback) throws EntityProviderException {
+ private void appendDeletedEntries(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final TombstoneCallback callback) throws EntityProviderException {
TombstoneCallbackResult callbackResult = callback.getTombstoneCallbackResult();
List<Map<String, Object>> tombstoneData = callbackResult.getDeletedEntriesData();
if (tombstoneData != null) {
@@ -131,14 +136,16 @@ public class AtomFeedProducer {
}
}
- private void appendEntries(final XMLStreamWriter writer, final EntityInfoAggregator eia, final List<Map<String, Object>> data) throws EntityProviderException {
+ private void appendEntries(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final List<Map<String, Object>> data) throws EntityProviderException {
AtomEntryEntityProducer entryProvider = new AtomEntryEntityProducer(properties);
for (Map<String, Object> singleEntryData : data) {
entryProvider.append(writer, eia, singleEntryData, false, true);
}
}
- private void appendInlineCount(final XMLStreamWriter writer, final Integer inlineCount) throws EntityProviderException {
+ private void appendInlineCount(final XMLStreamWriter writer, final Integer inlineCount)
+ throws EntityProviderException {
if (inlineCount == null || inlineCount < 0) {
throw new EntityProviderException(EntityProviderException.INLINECOUNT_INVALID);
}
@@ -151,7 +158,8 @@ public class AtomFeedProducer {
}
}
- private void appendAtomSelfLink(final XMLStreamWriter writer, final EntityInfoAggregator eia) throws EntityProviderException {
+ private void appendAtomSelfLink(final XMLStreamWriter writer, final EntityInfoAggregator eia)
+ throws EntityProviderException {
URI self = properties.getSelfLink();
String selfLink = "";
@@ -182,7 +190,8 @@ public class AtomFeedProducer {
return sb.toString();
}
- private void appendAtomMandatoryParts(final XMLStreamWriter writer, final EntityInfoAggregator eia) throws EntityProviderException {
+ private void appendAtomMandatoryParts(final XMLStreamWriter writer, final EntityInfoAggregator eia)
+ throws EntityProviderException {
try {
writer.writeStartElement(FormatXml.ATOM_ID);
writer.writeCharacters(createAtomId(eia));
@@ -198,7 +207,8 @@ public class AtomFeedProducer {
Object updateDate = null;
EdmFacets updateFacets = null;
updateDate = new Date();
- writer.writeCharacters(EdmDateTimeOffset.getInstance().valueToString(updateDate, EdmLiteralKind.DEFAULT, updateFacets));
+ writer.writeCharacters(EdmDateTimeOffset.getInstance().valueToString(updateDate, EdmLiteralKind.DEFAULT,
+ updateFacets));
writer.writeEndElement();
writer.writeStartElement(FormatXml.ATOM_AUTHOR);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java
index 5291efb..1c82ce2 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -35,8 +35,8 @@ import org.apache.olingo.odata2.core.commons.ContentType;
import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
- * Writes the OData service document in XML.
- *
+ * Writes the OData service document in XML.
+ *
*/
public class AtomServiceDocumentProducer {
@@ -82,29 +82,30 @@ public class AtomServiceDocumentProducer {
xmlStreamWriter.writeEndElement();
}
- // Collection<Schema> schemas = edmProvider.getSchemas();
- // if (schemas != null) {
- // for (Schema schema : schemas) {
- // Collection<EntityContainer> entityContainers = schema.getEntityContainers();
- // if (entityContainers != null) {
- // for (EntityContainer entityContainer : entityContainers) {
- // Collection<EntitySet> entitySets = entityContainer.getEntitySets();
- // for (EntitySet entitySet : entitySets) {
- // xmlStreamWriter.writeStartElement(FormatXml.APP_COLLECTION);
- // if (entityContainer.isDefaultEntityContainer()) {
- // xmlStreamWriter.writeAttribute(FormatXml.ATOM_HREF, entitySet.getName());
- // } else {
- // xmlStreamWriter.writeAttribute(FormatXml.ATOM_HREF, entityContainer.getName() + Edm.DELIMITER + entitySet.getName());
- // }
- // xmlStreamWriter.writeStartElement(Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_TITLE);
- // xmlStreamWriter.writeCharacters(entitySet.getName());
- // xmlStreamWriter.writeEndElement();
- // xmlStreamWriter.writeEndElement();
- // }
- // }
- // }
- // }
- // }
+ // Collection<Schema> schemas = edmProvider.getSchemas();
+ // if (schemas != null) {
+ // for (Schema schema : schemas) {
+ // Collection<EntityContainer> entityContainers = schema.getEntityContainers();
+ // if (entityContainers != null) {
+ // for (EntityContainer entityContainer : entityContainers) {
+ // Collection<EntitySet> entitySets = entityContainer.getEntitySets();
+ // for (EntitySet entitySet : entitySets) {
+ // xmlStreamWriter.writeStartElement(FormatXml.APP_COLLECTION);
+ // if (entityContainer.isDefaultEntityContainer()) {
+ // xmlStreamWriter.writeAttribute(FormatXml.ATOM_HREF, entitySet.getName());
+ // } else {
+ // xmlStreamWriter.writeAttribute(FormatXml.ATOM_HREF, entityContainer.getName() + Edm.DELIMITER +
+ // entitySet.getName());
+ // }
+ // xmlStreamWriter.writeStartElement(Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_TITLE);
+ // xmlStreamWriter.writeCharacters(entitySet.getName());
+ // xmlStreamWriter.writeEndElement();
+ // xmlStreamWriter.writeEndElement();
+ // }
+ // }
+ // }
+ // }
+ // }
xmlStreamWriter.writeEndElement();
xmlStreamWriter.writeEndElement();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java
index 4a4d3f8..48900bf 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -31,11 +31,12 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
/**
* Provider for writing a collection of simple-type or complex-type instances in JSON.
- *
+ *
*/
public class JsonCollectionEntityProducer {
- public void append(final Writer writer, final EntityPropertyInfo propertyInfo, final List<?> data) throws EntityProviderException {
+ public void append(final Writer writer, final EntityPropertyInfo propertyInfo, final List<?> data)
+ throws EntityProviderException {
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
try {
@@ -45,8 +46,10 @@ public class JsonCollectionEntityProducer {
jsonStreamWriter.name(FormatJson.METADATA)
.beginObject()
- .namedStringValueRaw(FormatJson.TYPE,
- "Collection(" + propertyInfo.getType().getNamespace() + Edm.DELIMITER + propertyInfo.getType().getName() + ")")
+ .namedStringValueRaw(
+ FormatJson.TYPE,
+ "Collection(" + propertyInfo.getType().getNamespace() + Edm.DELIMITER + propertyInfo.getType().getName()
+ + ")")
.endObject()
.separator();
@@ -66,9 +69,11 @@ public class JsonCollectionEntityProducer {
jsonStreamWriter.endObject()
.endObject();
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
index 8ee51f7..3d2d98f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
/**
* Producer for writing an entity in JSON, also usable for function imports
* returning a single instance of an entity type.
- *
+ *
*/
public class JsonEntryEntityProducer {
@@ -63,7 +63,8 @@ public class JsonEntryEntityProducer {
this.properties = properties == null ? EntityProviderWriteProperties.serviceRoot(null).build() : properties;
}
- public void append(final Writer writer, final EntityInfoAggregator entityInfo, final Map<String, Object> data, final boolean isRootElement) throws EntityProviderException {
+ public void append(final Writer writer, final EntityInfoAggregator entityInfo, final Map<String, Object> data,
+ final boolean isRootElement) throws EntityProviderException {
final EdmEntityType type = entityInfo.getEntityType();
try {
@@ -89,10 +90,13 @@ public class JsonEntryEntityProducer {
}
if (type.hasStream()) {
jsonStreamWriter.separator()
- .namedStringValueRaw(FormatJson.CONTENT_TYPE,
+ .namedStringValueRaw(
+ FormatJson.CONTENT_TYPE,
properties.getMediaResourceMimeType() == null ?
- type.getMapping() == null || type.getMapping().getMimeType() == null || data.get(type.getMapping().getMimeType()) == null ?
- HttpContentType.APPLICATION_OCTET_STREAM : data.get(type.getMapping().getMimeType()).toString() :
+ type.getMapping() == null || type.getMapping().getMimeType() == null
+ || data.get(type.getMapping().getMimeType()) == null ?
+ HttpContentType.APPLICATION_OCTET_STREAM : data.get(type.getMapping().getMimeType()).toString()
+ :
properties.getMediaResourceMimeType())
.separator()
.namedStringValue(FormatJson.MEDIA_SRC, self + "/$value").separator()
@@ -104,7 +108,8 @@ public class JsonEntryEntityProducer {
if (entityInfo.getSelectedPropertyNames().contains(propertyName)) {
jsonStreamWriter.separator()
.name(propertyName);
- JsonPropertyEntityProducer.appendPropertyValue(jsonStreamWriter, entityInfo.getPropertyInfo(propertyName), data.get(propertyName));
+ JsonPropertyEntityProducer.appendPropertyValue(jsonStreamWriter, entityInfo.getPropertyInfo(propertyName),
+ data.get(propertyName));
}
}
@@ -114,7 +119,8 @@ public class JsonEntryEntityProducer {
.name(navigationPropertyName);
if (entityInfo.getExpandedNavigationPropertyNames().contains(navigationPropertyName)) {
if (properties.getCallbacks() != null && properties.getCallbacks().containsKey(navigationPropertyName)) {
- final EdmNavigationProperty navigationProperty = (EdmNavigationProperty) type.getProperty(navigationPropertyName);
+ final EdmNavigationProperty navigationProperty =
+ (EdmNavigationProperty) type.getProperty(navigationPropertyName);
final boolean isFeed = navigationProperty.getMultiplicity() == EdmMultiplicity.MANY;
final EdmEntitySet entitySet = entityInfo.getEntitySet();
final EdmEntitySet inlineEntitySet = entitySet.getRelatedEntitySet(navigationProperty);
@@ -123,7 +129,8 @@ public class JsonEntryEntityProducer {
context.setSourceEntitySet(entitySet);
context.setNavigationProperty(navigationProperty);
context.setEntryData(data);
- context.setCurrentExpandSelectTreeNode(properties.getExpandSelectTree().getLinks().get(navigationPropertyName));
+ context.setCurrentExpandSelectTreeNode(properties.getExpandSelectTree().getLinks().get(
+ navigationPropertyName));
ODataCallback callback = properties.getCallbacks().get(navigationPropertyName);
if (callback == null) {
@@ -131,28 +138,33 @@ public class JsonEntryEntityProducer {
}
try {
if (isFeed) {
- final WriteFeedCallbackResult result = ((OnWriteFeedContent) callback).retrieveFeedResult((WriteFeedCallbackContext) context);
+ final WriteFeedCallbackResult result =
+ ((OnWriteFeedContent) callback).retrieveFeedResult((WriteFeedCallbackContext) context);
List<Map<String, Object>> inlineData = result.getFeedData();
if (inlineData == null) {
inlineData = new ArrayList<Map<String, Object>>();
}
final EntityProviderWriteProperties inlineProperties = result.getInlineProperties();
- final EntityInfoAggregator inlineEntityInfo = EntityInfoAggregator.create(inlineEntitySet, inlineProperties.getExpandSelectTree());
+ final EntityInfoAggregator inlineEntityInfo =
+ EntityInfoAggregator.create(inlineEntitySet, inlineProperties.getExpandSelectTree());
new JsonFeedEntityProducer(inlineProperties).append(writer, inlineEntityInfo, inlineData, false);
} else {
- final WriteEntryCallbackResult result = ((OnWriteEntryContent) callback).retrieveEntryResult((WriteEntryCallbackContext) context);
+ final WriteEntryCallbackResult result =
+ ((OnWriteEntryContent) callback).retrieveEntryResult((WriteEntryCallbackContext) context);
Map<String, Object> inlineData = result.getEntryData();
if (inlineData != null && !inlineData.isEmpty()) {
final EntityProviderWriteProperties inlineProperties = result.getInlineProperties();
- final EntityInfoAggregator inlineEntityInfo = EntityInfoAggregator.create(inlineEntitySet, inlineProperties.getExpandSelectTree());
+ final EntityInfoAggregator inlineEntityInfo =
+ EntityInfoAggregator.create(inlineEntitySet, inlineProperties.getExpandSelectTree());
new JsonEntryEntityProducer(inlineProperties).append(writer, inlineEntityInfo, inlineData, false);
} else {
jsonStreamWriter.unquotedValue("null");
}
}
} catch (final ODataApplicationException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
} else {
writeDeferredUri(navigationPropertyName);
@@ -172,9 +184,11 @@ public class JsonEntryEntityProducer {
writer.flush();
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java
index 7967412..54b5760 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -30,18 +30,23 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
*/
public class JsonErrorDocumentProducer {
- public void writeErrorDocument(final Writer writer, final String errorCode, final String message, final Locale locale, final String innerError) throws IOException {
+ public void writeErrorDocument(final Writer writer, final String errorCode, final String message,
+ final Locale locale, final String innerError) throws IOException {
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject()
+ jsonStreamWriter
+ .beginObject()
.name(FormatJson.ERROR)
.beginObject()
- .namedStringValue(FormatJson.CODE, errorCode).separator()
+ .namedStringValue(FormatJson.CODE, errorCode)
+ .separator()
.name(FormatJson.MESSAGE)
.beginObject()
- .namedStringValueRaw(FormatJson.LANG,
+ .namedStringValueRaw(
+ FormatJson.LANG,
locale == null || locale.getLanguage() == null ? null :
- locale.getLanguage() + (locale.getCountry() == null || locale.getCountry().isEmpty() ? "" : ("-" + locale.getCountry())))
+ locale.getLanguage()
+ + (locale.getCountry() == null || locale.getCountry().isEmpty() ? "" : ("-" + locale.getCountry())))
.separator()
.namedStringValue(FormatJson.VALUE, message)
.endObject();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
index f9de3a3..9be2fb0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
/**
* Producer for writing an entity collection (a feed) in JSON.
- *
+ *
*/
public class JsonFeedEntityProducer {
@@ -42,7 +42,8 @@ public class JsonFeedEntityProducer {
this.properties = properties == null ? EntityProviderWriteProperties.serviceRoot(null).build() : properties;
}
- public void append(final Writer writer, final EntityInfoAggregator entityInfo, final List<Map<String, Object>> data, final boolean isRootElement) throws EntityProviderException {
+ public void append(final Writer writer, final EntityInfoAggregator entityInfo, final List<Map<String, Object>> data,
+ final boolean isRootElement) throws EntityProviderException {
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
try {
@@ -87,7 +88,8 @@ public class JsonFeedEntityProducer {
jsonStreamWriter.endObject();
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java
index a2de22c..69a0c5a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
/**
* Producer for writing a link in JSON.
- *
+ *
*/
public class JsonLinkEntityProducer {
@@ -40,7 +40,8 @@ public class JsonLinkEntityProducer {
this.properties = properties == null ? EntityProviderWriteProperties.serviceRoot(null).build() : properties;
}
- public void append(final Writer writer, final EntityInfoAggregator entityInfo, final Map<String, Object> data) throws EntityProviderException {
+ public void append(final Writer writer, final EntityInfoAggregator entityInfo, final Map<String, Object> data)
+ throws EntityProviderException {
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
final String uri = (properties.getServiceRoot() == null ? "" : properties.getServiceRoot().toASCIIString())
@@ -51,7 +52,8 @@ public class JsonLinkEntityProducer {
appendUri(jsonStreamWriter, uri);
jsonStreamWriter.endObject();
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java
index 8b66fda..a3a5e79 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
/**
* Producer for writing a link collection in JSON.
- *
+ *
*/
public class JsonLinksEntityProducer {
@@ -42,7 +42,8 @@ public class JsonLinksEntityProducer {
this.properties = properties == null ? EntityProviderWriteProperties.serviceRoot(null).build() : properties;
}
- public void append(final Writer writer, final EntityInfoAggregator entityInfo, final List<Map<String, Object>> data) throws EntityProviderException {
+ public void append(final Writer writer, final EntityInfoAggregator entityInfo, final List<Map<String, Object>> data)
+ throws EntityProviderException {
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
try {
@@ -66,7 +67,8 @@ public class JsonLinksEntityProducer {
jsonStreamWriter.separator();
}
JsonLinkEntityProducer.appendUri(jsonStreamWriter,
- (serviceRoot == null ? "" : serviceRoot) + AtomEntryEntityProducer.createSelfLink(entityInfo, entryData, null));
+ (serviceRoot == null ? "" : serviceRoot)
+ + AtomEntryEntityProducer.createSelfLink(entityInfo, entryData, null));
}
jsonStreamWriter.endArray();
@@ -76,7 +78,8 @@ public class JsonLinksEntityProducer {
jsonStreamWriter.endObject();
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java
index 8ea01c9..659e4b9 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -37,11 +37,12 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
/**
* Producer for writing a single simple or complex property in JSON, also usable
* for function imports returning a single instance of a simple or complex type.
- *
+ *
*/
public class JsonPropertyEntityProducer {
- public void append(final Writer writer, final EntityPropertyInfo propertyInfo, final Object value) throws EntityProviderException {
+ public void append(final Writer writer, final EntityPropertyInfo propertyInfo, final Object value)
+ throws EntityProviderException {
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
try {
@@ -50,31 +51,39 @@ public class JsonPropertyEntityProducer {
.beginObject();
jsonStreamWriter.name(propertyInfo.getName());
- appendPropertyValue(jsonStreamWriter, propertyInfo.isComplex() ? (EntityComplexPropertyInfo) propertyInfo : propertyInfo, value);
+ appendPropertyValue(jsonStreamWriter, propertyInfo.isComplex() ? (EntityComplexPropertyInfo) propertyInfo
+ : propertyInfo, value);
jsonStreamWriter.endObject()
.endObject();
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
- protected static void appendPropertyValue(final JsonStreamWriter jsonStreamWriter, final EntityPropertyInfo propertyInfo, final Object value) throws IOException, EdmException, EntityProviderException {
+ protected static void appendPropertyValue(final JsonStreamWriter jsonStreamWriter,
+ final EntityPropertyInfo propertyInfo, final Object value) throws IOException, EdmException,
+ EntityProviderException {
if (propertyInfo.isComplex()) {
if (value == null || value instanceof Map<?, ?>) {
jsonStreamWriter.beginObject();
appendPropertyMetadata(jsonStreamWriter, propertyInfo.getType());
- for (final EntityPropertyInfo childPropertyInfo : ((EntityComplexPropertyInfo) propertyInfo).getPropertyInfos()) {
+ for (final EntityPropertyInfo childPropertyInfo : ((EntityComplexPropertyInfo) propertyInfo).getPropertyInfos())
+ {
jsonStreamWriter.separator();
final String name = childPropertyInfo.getName();
jsonStreamWriter.name(name);
- appendPropertyValue(jsonStreamWriter, childPropertyInfo, value == null ? null : ((Map<?, ?>) value).get(name));
+ appendPropertyValue(jsonStreamWriter, childPropertyInfo,
+ value == null ? null : ((Map<?, ?>) value).get(name));
}
jsonStreamWriter.endObject();
} else {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("A complex property must have a Map as data"));
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("A complex property must have a Map as data"));
}
} else {
final EdmSimpleType type = (EdmSimpleType) propertyInfo.getType();
@@ -105,7 +114,8 @@ public class JsonPropertyEntityProducer {
}
}
- protected static void appendPropertyMetadata(final JsonStreamWriter jsonStreamWriter, final EdmType type) throws IOException, EdmException {
+ protected static void appendPropertyMetadata(final JsonStreamWriter jsonStreamWriter, final EdmType type)
+ throws IOException, EdmException {
jsonStreamWriter.name(FormatJson.METADATA)
.beginObject()
.namedStringValueRaw(FormatJson.TYPE, type.getNamespace() + Edm.DELIMITER + type.getName())
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java
index a58c9d8..6b2134b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -30,8 +30,8 @@ import org.apache.olingo.odata2.core.ep.util.FormatJson;
import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
/**
- * Writes the OData service document in JSON.
- *
+ * Writes the OData service document in JSON.
+ *
*/
public class JsonServiceDocumentProducer {
@@ -60,9 +60,11 @@ public class JsonServiceDocumentProducer {
.endObject()
.endObject();
} catch (final IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (final ODataException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java
index 1474909..7f1babb 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -47,13 +47,15 @@ public class TombstoneProducer {
/**
* Appends tombstones to an already started feed.
* If the list is empty no elements will be appended.
- * @param writer same as in feed
- * @param eia same as in feed
- * @param properties same as in feed
+ * @param writer same as in feed
+ * @param eia same as in feed
+ * @param properties same as in feed
* @param deletedEntries data to be appended
* @throws EntityProviderException
*/
- public void appendTombstones(final XMLStreamWriter writer, final EntityInfoAggregator eia, final EntityProviderWriteProperties properties, final List<Map<String, Object>> deletedEntries) throws EntityProviderException {
+ public void appendTombstones(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final EntityProviderWriteProperties properties, final List<Map<String, Object>> deletedEntries)
+ throws EntityProviderException {
try {
for (Map<String, Object> deletedEntry : deletedEntries) {
writer.writeStartElement(TombstoneCallback.NAMESPACE_TOMBSTONE, FormatXml.ATOM_TOMBSTONE_DELETED_ENTRY);
@@ -70,7 +72,8 @@ public class TombstoneProducer {
}
}
- private void appendWhenAttribute(final XMLStreamWriter writer, final EntityInfoAggregator eia, final Map<String, Object> deletedEntry) throws XMLStreamException, EdmSimpleTypeException {
+ private void appendWhenAttribute(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final Map<String, Object> deletedEntry) throws XMLStreamException, EdmSimpleTypeException {
Object updateDate = null;
EntityPropertyInfo updatedInfo = eia.getTargetPathInfo(EdmTargetPath.SYNDICATION_UPDATED);
if (updatedInfo != null) {
@@ -84,17 +87,23 @@ public class TombstoneProducer {
}
}
- private void appendCustomWhenAttribute(final XMLStreamWriter writer, final Object updateDate, final EntityPropertyInfo updatedInfo) throws XMLStreamException, EdmSimpleTypeException {
+ private void appendCustomWhenAttribute(final XMLStreamWriter writer, final Object updateDate,
+ final EntityPropertyInfo updatedInfo) throws XMLStreamException, EdmSimpleTypeException {
EdmFacets updateFacets = updatedInfo.getFacets();
- writer.writeAttribute(FormatXml.ATOM_TOMBSTONE_WHEN, EdmDateTimeOffset.getInstance().valueToString(updateDate, EdmLiteralKind.DEFAULT, updateFacets));
+ writer.writeAttribute(FormatXml.ATOM_TOMBSTONE_WHEN, EdmDateTimeOffset.getInstance().valueToString(updateDate,
+ EdmLiteralKind.DEFAULT, updateFacets));
}
- private void appendRefAttribute(final XMLStreamWriter writer, final EntityInfoAggregator eia, final EntityProviderWriteProperties properties, final Map<String, Object> deletedEntry) throws XMLStreamException, EntityProviderException {
- String ref = properties.getServiceRoot().toASCIIString() + AtomEntryEntityProducer.createSelfLink(eia, deletedEntry, null);
+ private void appendRefAttribute(final XMLStreamWriter writer, final EntityInfoAggregator eia,
+ final EntityProviderWriteProperties properties, final Map<String, Object> deletedEntry)
+ throws XMLStreamException, EntityProviderException {
+ String ref =
+ properties.getServiceRoot().toASCIIString() + AtomEntryEntityProducer.createSelfLink(eia, deletedEntry, null);
writer.writeAttribute(FormatXml.ATOM_TOMBSTONE_REF, ref);
}
- private void appendDefaultWhenAttribute(final XMLStreamWriter writer) throws XMLStreamException, EdmSimpleTypeException {
+ private void appendDefaultWhenAttribute(final XMLStreamWriter writer) throws XMLStreamException,
+ EdmSimpleTypeException {
if (defaultDateString == null) {
Object defaultDate = new Date();
defaultDateString = EdmDateTimeOffset.getInstance().valueToString(defaultDate, EdmLiteralKind.DEFAULT, null);
[52/59] [abbrv] cleanup jpa core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderHeader.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderHeader.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderHeader.java
index 2df187e..c54411e 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderHeader.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderHeader.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.data;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItem.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItem.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItem.java
index 847ab99..ba9c09a 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItem.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItem.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.data;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItemKey.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItemKey.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItemKey.java
index 1f6f6ab..d8b7ee3 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItemKey.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/data/SalesOrderLineItemKey.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.data;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java
index 87c52b5..879c2c2 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
@@ -86,8 +86,10 @@ public class EdmSchemaMock {
AssociationSet associationSet = new AssociationSet();
associationSet.setName(ASSOCIATION_SET_NAME);
associationSet.setAssociation(new FullQualifiedName(NAMESPACE, ASSOCIATION_NAME));
- associationSet.setEnd1(new AssociationSetEnd().setEntitySet(ENTITY_SET_NAME_ONE).setRole(ASSOCIATION_ROLE_NAME_ONE));
- associationSet.setEnd2(new AssociationSetEnd().setEntitySet(ENTITY_SET_NAME_TWO).setRole(ASSOCIATION_ROLE_NAME_TWO));
+ associationSet
+ .setEnd1(new AssociationSetEnd().setEntitySet(ENTITY_SET_NAME_ONE).setRole(ASSOCIATION_ROLE_NAME_ONE));
+ associationSet
+ .setEnd2(new AssociationSetEnd().setEntitySet(ENTITY_SET_NAME_TWO).setRole(ASSOCIATION_ROLE_NAME_TWO));
associationSets.add(associationSet);
return associationSets;
}
@@ -120,8 +122,10 @@ public class EdmSchemaMock {
List<Association> associations = new ArrayList<Association>();
Association association = new Association();
association.setName(ASSOCIATION_NAME);
- association.setEnd1(new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ASSOCIATION_ROLE_NAME_ONE).setType(new FullQualifiedName(NAMESPACE, ENTITY_NAME_ONE)));
- association.setEnd2(new AssociationEnd().setMultiplicity(EdmMultiplicity.MANY).setRole(ASSOCIATION_ROLE_NAME_TWO).setType(new FullQualifiedName(NAMESPACE, ENTITY_NAME_TWO)));
+ association.setEnd1(new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ASSOCIATION_ROLE_NAME_ONE)
+ .setType(new FullQualifiedName(NAMESPACE, ENTITY_NAME_ONE)));
+ association.setEnd2(new AssociationEnd().setMultiplicity(EdmMultiplicity.MANY).setRole(ASSOCIATION_ROLE_NAME_TWO)
+ .setType(new FullQualifiedName(NAMESPACE, ENTITY_NAME_TWO)));
associations.add(association);
return associations;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAAttributeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAAttributeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAAttributeMock.java
index 0ec7610..9d6bad1 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAAttributeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAAttributeMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java
index f21539d..a91442a 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
@@ -33,13 +33,18 @@ public class JPACustomProcessorMock {
public static final String className = "JPACustomProcessorMock";
public static final String edmName = "JPACustomProcessor";
- @FunctionImport(name = "Method1", entitySet = "MockSet", returnType = ReturnType.ENTITY_TYPE, multiplicity = Multiplicity.MANY)
- public List<JPACustomProcessorMock> method1(@Parameter(name = "Param1", facets = @Facets(nullable = true, maxLength = 2), mode = Mode.IN) final String param1, final int param2, @Parameter(name = "Param3", facets = @Facets(precision = 10, scale = 2), mode = Mode.IN) final double param3) {
+ @FunctionImport(name = "Method1", entitySet = "MockSet", returnType = ReturnType.ENTITY_TYPE,
+ multiplicity = Multiplicity.MANY)
+ public List<JPACustomProcessorMock> method1(@Parameter(name = "Param1", facets = @Facets(nullable = true,
+ maxLength = 2), mode = Mode.IN) final String param1, final int param2, @Parameter(name = "Param3",
+ facets = @Facets(precision = 10, scale = 2), mode = Mode.IN) final double param3) {
return new ArrayList<JPACustomProcessorMock>();
}
- @FunctionImport(name = "Method2", entitySet = "MockSet", returnType = ReturnType.ENTITY_TYPE, multiplicity = Multiplicity.MANY)
- public List<JPACustomProcessorMock> method2(@Parameter(facets = @Facets(maxLength = 2), name = "Param2") final String param2) {
+ @FunctionImport(name = "Method2", entitySet = "MockSet", returnType = ReturnType.ENTITY_TYPE,
+ multiplicity = Multiplicity.MANY)
+ public List<JPACustomProcessorMock> method2(
+ @Parameter(facets = @Facets(maxLength = 2), name = "Param2") final String param2) {
return new ArrayList<JPACustomProcessorMock>();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorNegativeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorNegativeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorNegativeMock.java
index b5e560a..2d0ef23 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorNegativeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorNegativeMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java
index 8dd39ac..9b25115 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java
index aed7094..397f971 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java
index 9201f50..7f6adc8 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java
index 0be8012..602d430 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java
index 2eadb78..740a2ec 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java
index 92331ae..915c562 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAMetaModelMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAMetaModelMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAMetaModelMock.java
index 8772efb..8e528b2 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAMetaModelMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAMetaModelMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAPluralAttributeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAPluralAttributeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAPluralAttributeMock.java
index 496936b..a4aa2b5 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAPluralAttributeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAPluralAttributeMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPASingularAttributeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPASingularAttributeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPASingularAttributeMock.java
index 75be01a..41124fe 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPASingularAttributeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPASingularAttributeMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.mock.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java
index 37f5491..05db5ab 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -101,7 +101,8 @@ public class JPAEdmAssociationEndTest extends JPAEdmTestModelView {
@Test
public void testBuildAssociationEnd() {
assertEquals("SOID", objJPAEdmAssociationEnd.getEdmAssociationEnd1().getType().getName());
- assertEquals(new FullQualifiedName("salesorderprocessing", "SOID"), objJPAEdmAssociationEnd.getEdmAssociationEnd1().getType());
+ assertEquals(new FullQualifiedName("salesorderprocessing", "SOID"), objJPAEdmAssociationEnd.getEdmAssociationEnd1()
+ .getType());
assertTrue(objJPAEdmAssociationEnd.isConsistent());
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java
index 47126a7..965d3d7 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -172,8 +172,10 @@ public class JPAEdmAssociationSetTest extends JPAEdmTestModelView {
Association association = new Association();
association.setName("Assoc_SalesOrderHeader_SalesOrderItem");
- association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole("SalesOrderHeader"));
- association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")).setRole("SalesOrderItem"));
+ association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole(
+ "SalesOrderHeader"));
+ association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem"))
+ .setRole("SalesOrderItem"));
associationList.add(association);
return associationList;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java
index 72e8465..f7c8f47 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -93,7 +93,8 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
@Override
public Association getEdmAssociation() {
Association association = new Association();
- association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader")));
+ association
+ .setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader")));
association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")));
return association;
@@ -323,7 +324,8 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
}
}
TestAssociationEndView objJPAEdmAssociationEndTest = new TestAssociationEndView();
- JPAEdmAssociationEnd objJPAEdmAssociationEnd = new JPAEdmAssociationEnd(objJPAEdmAssociationEndTest, objJPAEdmAssociationEndTest);
+ JPAEdmAssociationEnd objJPAEdmAssociationEnd =
+ new JPAEdmAssociationEnd(objJPAEdmAssociationEndTest, objJPAEdmAssociationEndTest);
try {
objJPAEdmAssociationEnd.getBuilder().build();
Field field = objAssociation.getClass().getDeclaredField("associationEndMap");
@@ -374,8 +376,10 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
@Override
public Association getEdmAssociation() {
Association association = new Association();
- association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader")));
- association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")));
+ association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing",
+ "SalesOrderHeader")));
+ association.setEnd2(new AssociationEnd()
+ .setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")));
return association;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java
index a291058..bdbf104 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java
index ef3b7d8..2fabe8c 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java
index 0f40e52..4e9355b 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -156,7 +156,7 @@ public class JPAEdmEntityContainerTest extends JPAEdmTestModelView {
@Override
public void build() {
- //Nothing to do?
+ // Nothing to do?
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java
index cd47154..74c203e 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java
index a2e6b19..dfbe879 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java
index f5de641..2e678cb 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -233,7 +233,8 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
ReturnType returnType = functionImport.getReturnType();
assertNotNull(returnType);
assertEquals(EdmMultiplicity.ONE, returnType.getMultiplicity());
- assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "." + JPACustomProcessorMock.edmName);
+ assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "."
+ + JPACustomProcessorMock.edmName);
}
/**
@@ -275,7 +276,8 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
ReturnType returnType = functionImport.getReturnType();
assertNotNull(returnType);
assertEquals(EdmMultiplicity.ONE, returnType.getMultiplicity());
- assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "." + JPACustomProcessorMock.edmName);
+ assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "."
+ + JPACustomProcessorMock.edmName);
}
@@ -300,7 +302,8 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
ReturnType returnType = functionImport.getReturnType();
assertNotNull(returnType);
assertEquals(EdmMultiplicity.MANY, returnType.getMultiplicity());
- assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "." + JPACustomProcessorMock.edmName);
+ assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "."
+ + JPACustomProcessorMock.edmName);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java
index 191d247..0ec45df 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -165,7 +165,8 @@ public class JPAEdmKeyTest extends JPAEdmTestModelView {
ComplexProperty complexProperty = new ComplexProperty();
complexProperty.setName(JPAEdmMockData.ComplexType.ComplexTypeA.Property.PROPERTY_C);
- complexProperty.setType(new FullQualifiedName(ODataJPAContextMock.NAMESPACE, JPAEdmMockData.ComplexType.ComplexTypeB.name));
+ complexProperty.setType(new FullQualifiedName(ODataJPAContextMock.NAMESPACE,
+ JPAEdmMockData.ComplexType.ComplexTypeB.name));
propertyList.add(complexProperty);
return propertyList;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java
index bf8b9ed..4192c2b 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java
index d1b9edb..8912bf8 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java
index e389b37..633459f 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -191,7 +191,8 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
@Override
public org.apache.olingo.odata2.api.edm.provider.ComplexType searchEdmComplexType(final String arg0) {
- org.apache.olingo.odata2.api.edm.provider.ComplexType complexType = new org.apache.olingo.odata2.api.edm.provider.ComplexType();
+ org.apache.olingo.odata2.api.edm.provider.ComplexType complexType =
+ new org.apache.olingo.odata2.api.edm.provider.ComplexType();
complexType.setName("ComplexTypeA");
return complexType;
}
@@ -218,7 +219,8 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
@Override
public org.apache.olingo.odata2.api.edm.provider.EntityType getEdmEntityType() {
- org.apache.olingo.odata2.api.edm.provider.EntityType entityType = new org.apache.olingo.odata2.api.edm.provider.EntityType();
+ org.apache.olingo.odata2.api.edm.provider.EntityType entityType =
+ new org.apache.olingo.odata2.api.edm.provider.EntityType();
entityType.setName("SalesOrderHeader");
return entityType;
@@ -227,7 +229,8 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
@Override
public Association getEdmAssociation() {
Association association = new Association();
- association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader")));
+ association
+ .setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader")));
association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")));
return association;
@@ -291,11 +294,9 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
if (JPAEdmPropertyTest.ATTRIBUTE_TYPE.equals(PersistentAttributeType.BASIC)) {
attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SOID"));
attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SONAME"));
- }
- else if (JPAEdmPropertyTest.ATTRIBUTE_TYPE.equals(PersistentAttributeType.EMBEDDED)) {
+ } else if (JPAEdmPropertyTest.ATTRIBUTE_TYPE.equals(PersistentAttributeType.EMBEDDED)) {
attributeSet.add(new JPAEdmAttribute(JPAEdmEmbeddable.class, ComplexType.ComplexTypeA.clazz.getName()));
- }
- else if (JPAEdmPropertyTest.ATTRIBUTE_TYPE.equals(PersistentAttributeType.MANY_TO_ONE)) {
+ } else if (JPAEdmPropertyTest.ATTRIBUTE_TYPE.equals(PersistentAttributeType.MANY_TO_ONE)) {
attributeSet.add(new JPAEdmPluralAttribute());
}
}
[16/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
index ec12dc8..eebc63f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -50,7 +50,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
public void readIntegerProperty() throws Exception {
String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">67</Age>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -61,7 +62,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
public void readIntegerPropertyAsLong() throws Exception {
String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">67</Age>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
Map<String, Object> typeMappings = createTypeMappings("Age", Long.class);
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false, typeMappings);
@@ -73,7 +75,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
public void readIntegerPropertyWithNullMapping() throws Exception {
String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">67</Age>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
Map<String, Object> typeMappings = null;
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false, typeMappings);
@@ -85,7 +88,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
public void readIntegerPropertyWithEmptyMapping() throws Exception {
String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">67</Age>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
Map<String, Object> typeMappings = new HashMap<String, Object>();
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false, typeMappings);
@@ -97,7 +101,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
public void readStringProperty() throws Exception {
String xml = "<EmployeeName xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">Max Mustermann</EmployeeName>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -108,7 +113,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
public void readStringPropertyEmpty() throws Exception {
final String xml = "<EmployeeName xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\" />";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
final Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -121,7 +127,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
final String xml = "<EntryDate xmlns=\"" + Edm.NAMESPACE_D_2007_08
+ "\" m:null=\"true\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\" />";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
final Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -134,7 +141,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
final String xml = "<EntryDate xmlns=\"" + Edm.NAMESPACE_D_2007_08
+ "\" m:null=\"false\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">1970-01-02T00:00:00</EntryDate>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
final Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -145,7 +153,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
public void invalidSimplePropertyName() throws Exception {
final String xml = "<Invalid xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">67</Invalid>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
new XmlPropertyConsumer().readProperty(reader, property, false);
}
@@ -155,7 +164,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
final String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08
+ "\" m:null=\"wrong\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\" />";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
new XmlPropertyConsumer().readProperty(reader, property, false);
}
@@ -165,7 +175,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
final String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08
+ "\" m:null=\"true\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\" />";
XMLStreamReader reader = createReaderForTest(xml, true);
- EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
EdmFacets facets = mock(EdmFacets.class);
when(facets.isNullable()).thenReturn(false);
when(property.getFacets()).thenReturn(facets);
@@ -186,7 +197,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</City>" +
"</Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -213,7 +225,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</Location>" +
"\n \n ";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -236,7 +249,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</City>" +
"</Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
try {
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false,
@@ -262,7 +276,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- EdmProperty locationComplexProperty = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ EdmProperty locationComplexProperty =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
EdmProperty cityProperty = (EdmProperty) ((EdmComplexType) locationComplexProperty.getType()).getProperty("City");
EdmProperty postalCodeProperty = (EdmProperty) ((EdmComplexType) cityProperty.getType()).getProperty("PostalCode");
// Change the type of the PostalCode property to one that allows different Java types.
@@ -273,7 +288,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
createTypeMappings("Location",
createTypeMappings("City",
createTypeMappings("CityName", String.class, "PostalCode", Long.class)));
- Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, locationComplexProperty, false, typeMappings);
+ Map<String, Object> resultMap =
+ new XmlPropertyConsumer().readProperty(reader, locationComplexProperty, false, typeMappings);
// verify
Map<String, Object> locationMap = (Map<String, Object>) resultMap.get("Location");
@@ -297,7 +313,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
" </d:City>" +
"</d:Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
Object prop = new XmlPropertyConsumer().readProperty(reader, property, false);
Map<String, Object> resultMap = (Map<String, Object>) prop;
@@ -321,7 +338,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</City>" +
"</Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
new XmlPropertyConsumer().readProperty(reader, property, false);
}
@@ -338,7 +356,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</City>" +
"</Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
new XmlPropertyConsumer().readProperty(reader, property, false);
}
@@ -355,7 +374,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</City>" +
"</Invalid>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
new XmlPropertyConsumer().readProperty(reader, property, false);
}
@@ -372,7 +392,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</City>" +
"</Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
new XmlPropertyConsumer().readProperty(reader, property, false);
}
@@ -390,7 +411,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
"</City>" +
"</Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -406,7 +428,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
String xml = "<Location xmlns=\"" + Edm.NAMESPACE_D_2007_08
+ "\" m:null=\"true\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\" />";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
final Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
@@ -419,7 +442,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
final String xml = "<Location xmlns=\"" + Edm.NAMESPACE_D_2007_08
+ "\" m:null=\"true\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\" />";
XMLStreamReader reader = createReaderForTest(xml, true);
- EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
EdmFacets facets = mock(EdmFacets.class);
when(facets.isNullable()).thenReturn(false);
when(property.getFacets()).thenReturn(facets);
@@ -434,7 +458,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
+ "<City><PostalCode/><CityName/></City><Country>Germany</Country>"
+ "</Location>";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
new XmlPropertyConsumer().readProperty(reader, property, false);
}
@@ -443,7 +468,8 @@ public class XmlPropertyConsumerTest extends AbstractConsumerTest {
public void complexPropertyEmpty() throws Exception {
final String xml = "<Location xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\" />";
XMLStreamReader reader = createReaderForTest(xml, true);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
final Map<String, Object> resultMap = new XmlPropertyConsumer().readProperty(reader, property, false);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
index efcab4f..b6e1f8f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -74,14 +74,15 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
@Test
public void noneSyndicationKeepInContentFalseMustNotShowInProperties() throws Exception {
- //prepare Mock
+ // prepare Mock
EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
EdmCustomizableFeedMappings employeeCustomPropertyMapping = mock(EdmCustomizableFeedMappings.class);
when(employeeCustomPropertyMapping.isFcKeepInContent()).thenReturn(Boolean.FALSE);
when(employeeCustomPropertyMapping.getFcNsPrefix()).thenReturn("customPre");
when(employeeCustomPropertyMapping.getFcNsUri()).thenReturn("http://customUri.com");
EdmTyped employeeEntryDateProperty = employeesSet.getEntityType().getProperty("EmployeeName");
- when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(employeeCustomPropertyMapping);
+ when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(
+ employeeCustomPropertyMapping);
Map<String, String> prefixMap = new HashMap<String, String>();
prefixMap.put("a", Edm.NAMESPACE_ATOM_2005);
@@ -101,14 +102,15 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
@Test
public void noneSyndicationKeepInContentTrueMustShowInProperties() throws Exception {
- //prepare Mock
+ // prepare Mock
EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
EdmCustomizableFeedMappings employeeCustomPropertyMapping = mock(EdmCustomizableFeedMappings.class);
when(employeeCustomPropertyMapping.isFcKeepInContent()).thenReturn(Boolean.TRUE);
when(employeeCustomPropertyMapping.getFcNsPrefix()).thenReturn("customPre");
when(employeeCustomPropertyMapping.getFcNsUri()).thenReturn("http://customUri.com");
EdmTyped employeeEntryDateProperty = employeesSet.getEntityType().getProperty("EmployeeName");
- when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(employeeCustomPropertyMapping);
+ when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(
+ employeeCustomPropertyMapping);
Map<String, String> prefixMap = new HashMap<String, String>();
prefixMap.put("a", Edm.NAMESPACE_ATOM_2005);
@@ -128,13 +130,14 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
@Test
public void noneSyndicationWithNullPrefix() throws Exception {
- //prepare Mock
+ // prepare Mock
EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
EdmCustomizableFeedMappings employeeCustomPropertyMapping = mock(EdmCustomizableFeedMappings.class);
when(employeeCustomPropertyMapping.isFcKeepInContent()).thenReturn(Boolean.TRUE);
when(employeeCustomPropertyMapping.getFcNsUri()).thenReturn("http://customUri.com");
EdmTyped employeeEntryDateProperty = employeesSet.getEntityType().getProperty("EmployeeName");
- when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(employeeCustomPropertyMapping);
+ when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(
+ employeeCustomPropertyMapping);
Map<String, String> prefixMap = new HashMap<String, String>();
prefixMap.put("a", Edm.NAMESPACE_ATOM_2005);
@@ -159,13 +162,14 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
@Test
public void noneSyndicationWithNullUri() throws Exception {
- //prepare Mock
+ // prepare Mock
EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
EdmCustomizableFeedMappings employeeCustomPropertyMapping = mock(EdmCustomizableFeedMappings.class);
when(employeeCustomPropertyMapping.isFcKeepInContent()).thenReturn(Boolean.TRUE);
when(employeeCustomPropertyMapping.getFcNsPrefix()).thenReturn("customPre");
EdmTyped employeeEntryDateProperty = employeesSet.getEntityType().getProperty("EmployeeName");
- when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(employeeCustomPropertyMapping);
+ when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(
+ employeeCustomPropertyMapping);
Map<String, String> prefixMap = new HashMap<String, String>();
prefixMap.put("a", Edm.NAMESPACE_ATOM_2005);
@@ -190,12 +194,13 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
@Test
public void noneSyndicationWithNullUriAndNullPrefix() throws Exception {
- //prepare Mock
+ // prepare Mock
EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
EdmCustomizableFeedMappings employeeCustomPropertyMapping = mock(EdmCustomizableFeedMappings.class);
when(employeeCustomPropertyMapping.isFcKeepInContent()).thenReturn(Boolean.TRUE);
EdmTyped employeeEntryDateProperty = employeesSet.getEntityType().getProperty("EmployeeName");
- when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(employeeCustomPropertyMapping);
+ when(((EdmProperty) employeeEntryDateProperty).getCustomizableFeedMappings()).thenReturn(
+ employeeCustomPropertyMapping);
Map<String, String> prefixMap = new HashMap<String, String>();
prefixMap.put("a", Edm.NAMESPACE_ATOM_2005);
@@ -220,14 +225,15 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
@Test
public void syndicationWithComplexProperty() throws Exception {
- //prepare Mock
+ // prepare Mock
EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
EdmCustomizableFeedMappings employeeCustomPropertyMapping = mock(EdmCustomizableFeedMappings.class);
when(employeeCustomPropertyMapping.isFcKeepInContent()).thenReturn(Boolean.TRUE);
when(employeeCustomPropertyMapping.getFcNsPrefix()).thenReturn("customPre");
when(employeeCustomPropertyMapping.getFcNsUri()).thenReturn("http://customUri.com");
EdmTyped employeeLocationProperty = employeesSet.getEntityType().getProperty("Location");
- when(((EdmProperty) employeeLocationProperty).getCustomizableFeedMappings()).thenReturn(employeeCustomPropertyMapping);
+ when(((EdmProperty) employeeLocationProperty).getCustomizableFeedMappings()).thenReturn(
+ employeeCustomPropertyMapping);
Map<String, String> prefixMap = new HashMap<String, String>();
prefixMap.put("a", Edm.NAMESPACE_ATOM_2005);
@@ -269,9 +275,12 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeAtomMediaResource() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeAtomMediaResource() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
@@ -308,10 +317,14 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeAtomMediaResourceWithMimeType() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeAtomMediaResourceWithMimeType() throws IOException, XpathException, SAXException,
+ XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
@@ -324,15 +337,19 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
/**
- * Test serialization of empty syndication title property. EmployeeName is set to NULL after the update (which is allowed because EmployeeName has default Nullable behavior which is true).
- * Write of an empty atom title tag is allowed within RFC4287 (http://tools.ietf.org/html/rfc4287#section-4.2.14).
+ * Test serialization of empty syndication title property. EmployeeName is set to NULL after the update (which is
+ * allowed because EmployeeName has default Nullable behavior which is true).
+ * Write of an empty atom title tag is allowed within RFC4287 (http://tools.ietf.org/html/rfc4287#section-4.2.14).
*/
@Test
- public void serializeEmployeeWithNullSyndicationTitleProperty() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeEmployeeWithNullSyndicationTitleProperty() throws IOException, XpathException, SAXException,
+ XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
employeeData.put("EmployeeName", null);
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry/a:title", xmlString);
@@ -347,10 +364,14 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeEmployeeAndCheckOrderOfTags() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeEmployeeAndCheckOrderOfTags() throws IOException, XpathException, SAXException,
+ XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
@@ -377,14 +398,16 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeEmployeeAndCheckOrderOfPropertyTags() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeEmployeeAndCheckOrderOfPropertyTags() throws IOException, XpathException, SAXException,
+ XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
EdmEntitySet employeeEntitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
ODataResponse response = ser.writeEntry(employeeEntitySet, employeeData, properties);
String xmlString = verifyResponse(response);
- // log.debug(xmlString);
+ // log.debug(xmlString);
assertXpathExists("/a:entry", xmlString);
assertXpathExists("/a:entry/a:content", xmlString);
@@ -398,9 +421,11 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeEmployeeAndCheckKeepInContentFalse() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeEmployeeAndCheckKeepInContentFalse() throws IOException, XpathException, SAXException,
+ XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
EdmEntitySet employeeEntitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
// set "keepInContent" to false for EntryDate
@@ -422,30 +447,36 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
assertXpathNotExists("/a:entry/m:properties/d:EntryDate", xmlString);
// verify order of tags
- List<String> expectedPropertyNamesFromEdm = new ArrayList<String>(employeeEntitySet.getEntityType().getPropertyNames());
+ List<String> expectedPropertyNamesFromEdm =
+ new ArrayList<String>(employeeEntitySet.getEntityType().getPropertyNames());
expectedPropertyNamesFromEdm.remove(String.valueOf("EntryDate"));
verifyTagOrdering(xmlString, expectedPropertyNamesFromEdm.toArray(new String[0]));
}
@Test(expected = EntityProviderException.class)
- public void serializeAtomEntryWithNullData() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeAtomEntryWithNullData() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
final EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
AtomEntityProvider ser = createAtomEntityProvider();
ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), null, properties);
}
@Test(expected = EntityProviderException.class)
- public void serializeAtomEntryWithEmptyHashMap() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeAtomEntryWithEmptyHashMap() throws IOException, XpathException, SAXException,
+ XMLStreamException, FactoryConfigurationError, ODataException {
final EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
AtomEntityProvider ser = createAtomEntityProvider();
- ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), new HashMap<String, Object>(), properties);
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"),
+ new HashMap<String, Object>(), properties);
}
@Test
- public void serializeAtomEntry() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeAtomEntry() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
final EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
@@ -458,9 +489,12 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeEntryId() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeEntryId() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
@@ -472,7 +506,9 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
@Test
public void serializeEntryTitle() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry/a:title", xmlString);
@@ -483,7 +519,9 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
@Test
public void serializeEntryUpdated() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry/a:updated", xmlString);
@@ -491,21 +529,28 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeIds() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeIds() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos"), photoData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos"), photoData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
assertXpathEvaluatesTo(BASE_URI.toASCIIString(), "/a:entry/@xml:base", xmlString);
assertXpathExists("/a:entry/a:id", xmlString);
- assertXpathEvaluatesTo(BASE_URI.toASCIIString() + "Container2.Photos(Id=1,Type='image%2Fpng')", "/a:entry/a:id/text()", xmlString);
+ assertXpathEvaluatesTo(BASE_URI.toASCIIString() + "Container2.Photos(Id=1,Type='image%2Fpng')",
+ "/a:entry/a:id/text()", xmlString);
}
@Test
- public void serializeProperties() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeProperties() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry/m:properties", xmlString);
@@ -514,24 +559,31 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeWithValueEncoding() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeWithValueEncoding() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
photoData.put("Type", "< Ö >");
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos"), photoData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos"), photoData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
assertXpathEvaluatesTo(BASE_URI.toASCIIString(), "/a:entry/@xml:base", xmlString);
assertXpathExists("/a:entry/a:id", xmlString);
- assertXpathEvaluatesTo(BASE_URI.toASCIIString() + "Container2.Photos(Id=1,Type='%3C%20%C3%96%20%3E')", "/a:entry/a:id/text()", xmlString);
+ assertXpathEvaluatesTo(BASE_URI.toASCIIString() + "Container2.Photos(Id=1,Type='%3C%20%C3%96%20%3E')",
+ "/a:entry/a:id/text()", xmlString);
assertXpathEvaluatesTo("Container2.Photos(Id=1,Type='%3C%20%C3%96%20%3E')", "/a:entry/a:link/@href", xmlString);
}
@Test
- public void serializeCategory() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeCategory() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry/a:category", xmlString);
@@ -542,9 +594,12 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeETag() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeETag() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos"), photoData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos"), photoData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
@@ -554,7 +609,8 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeETagEncoding() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeETagEncoding() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
Edm edm = MockFacade.getMockEdm();
EdmTyped roomIdProperty = edm.getEntityType("RefScenario", "Room").getProperty("Id");
EdmFacets facets = mock(EdmFacets.class);
@@ -564,7 +620,8 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
roomData.put("Id", "<\">");
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(edm.getDefaultEntityContainer().getEntitySet("Rooms"), roomData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(edm.getDefaultEntityContainer().getEntitySet("Rooms"), roomData, DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
@@ -579,9 +636,12 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeCustomMapping() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeCustomMapping() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos"), photoData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getEntityContainer("Container2").getEntitySet("Photos"), photoData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
assertXpathExists("/a:entry", xmlString);
@@ -625,9 +685,12 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
}
@Test
- public void serializeAtomMediaResourceLinks() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void serializeAtomMediaResourceLinks() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, DEFAULT_PROPERTIES);
+ ODataResponse response =
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
String rel = Edm.NAMESPACE_REL_2007_08 + "ne_Manager";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
index 7d1d957..61efdf2 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -67,8 +67,8 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
@Test
public void testFeedNamespaces() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
- //EntityProviderProperties properties = EntityProviderProperties.baseUri(BASE_URI).mediaResourceMimeType("mediatype").inlineCountType(view.getInlineCount()).build();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -79,7 +79,8 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
@Test
public void testSelfLink() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -92,7 +93,9 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
public void testCustomSelfLink() throws Exception {
String customLink = "Test";
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").selfLink(new URI(customLink)).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").selfLink(
+ new URI(customLink)).build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -104,7 +107,8 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
@Test
public void testFeedMandatoryParts() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -149,7 +153,8 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
when(view.getInlineCount()).thenReturn(InlineCount.NONE);
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -175,7 +180,9 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
@Test(expected = EntityProviderException.class)
public void testInlineCountInvalid() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").inlineCountType(InlineCount.ALLPAGES).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").inlineCountType(
+ InlineCount.ALLPAGES).build();
ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
}
@@ -184,7 +191,8 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
initializeRoomData(103);
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducerTest.java
index 4fcef66..a98110c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -82,7 +82,8 @@ public class AtomServiceDocumentProducerTest extends AbstractXmlProducerTestHelp
@Test
public void writeEmptyServiceDocumentOverRuntimeDelegate() throws Exception {
- ODataResponse response = EntityProvider.writeServiceDocument(HttpContentType.APPLICATION_ATOM_XML, edm, "http://localhost");
+ ODataResponse response =
+ EntityProvider.writeServiceDocument(HttpContentType.APPLICATION_ATOM_XML, edm, "http://localhost");
String xmlString = verifyResponse(response);
assertXpathExists("/a:service", xmlString);
@@ -108,7 +109,8 @@ public class AtomServiceDocumentProducerTest extends AbstractXmlProducerTestHelp
entitySets.add(new EntitySet().setName("Employees"));
List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
- entityContainers.add(new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets));
+ entityContainers.add(new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(
+ entitySets));
schemas.add(new Schema().setEntityContainers(entityContainers));
@@ -125,8 +127,10 @@ public class AtomServiceDocumentProducerTest extends AbstractXmlProducerTestHelp
entitySets.add(new EntitySet().setName("Employees"));
List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
- entityContainers.add(new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets));
- entityContainers.add(new EntityContainer().setDefaultEntityContainer(false).setName("Container2").setEntitySets(entitySets));
+ entityContainers.add(new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(
+ entitySets));
+ entityContainers.add(new EntityContainer().setDefaultEntityContainer(false).setName("Container2").setEntitySets(
+ entitySets));
schemas.add(new Schema().setEntityContainers(entityContainers));
@@ -138,7 +142,8 @@ public class AtomServiceDocumentProducerTest extends AbstractXmlProducerTestHelp
assertXpathExists("/a:service/a:workspace/a:collection[@href='Employees']", xmlString);
assertXpathExists("/a:service/a:workspace/a:collection[@href='Employees']/atom:title", xmlString);
- assertXpathEvaluatesTo("Employees", "/a:service/a:workspace/a:collection[@href='Container2.Employees']/atom:title", xmlString);
+ assertXpathEvaluatesTo("Employees", "/a:service/a:workspace/a:collection[@href='Container2.Employees']/atom:title",
+ xmlString);
}
@Test
@@ -147,12 +152,16 @@ public class AtomServiceDocumentProducerTest extends AbstractXmlProducerTestHelp
entitySets.add(new EntitySet().setName("Employees"));
List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
- entityContainers.add(new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets));
- entityContainers.add(new EntityContainer().setDefaultEntityContainer(false).setName("Container2").setEntitySets(entitySets));
+ entityContainers.add(new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(
+ entitySets));
+ entityContainers.add(new EntityContainer().setDefaultEntityContainer(false).setName("Container2").setEntitySets(
+ entitySets));
List<EntityContainer> entityContainers2 = new ArrayList<EntityContainer>();
- entityContainers2.add(new EntityContainer().setDefaultEntityContainer(false).setName("Container3").setEntitySets(entitySets));
- entityContainers2.add(new EntityContainer().setDefaultEntityContainer(false).setName("Container4").setEntitySets(entitySets));
+ entityContainers2.add(new EntityContainer().setDefaultEntityContainer(false).setName("Container3").setEntitySets(
+ entitySets));
+ entityContainers2.add(new EntityContainer().setDefaultEntityContainer(false).setName("Container4").setEntitySets(
+ entitySets));
schemas.add(new Schema().setEntityContainers(entityContainers));
schemas.add(new Schema().setEntityContainers(entityContainers2));
@@ -165,15 +174,18 @@ public class AtomServiceDocumentProducerTest extends AbstractXmlProducerTestHelp
assertXpathExists("/a:service/a:workspace/a:collection[@href='Employees']", xmlString);
assertXpathExists("/a:service/a:workspace/a:collection[@href='Employees']/atom:title", xmlString);
- assertXpathEvaluatesTo("Employees", "/a:service/a:workspace/a:collection[@href='Container2.Employees']/atom:title", xmlString);
+ assertXpathEvaluatesTo("Employees", "/a:service/a:workspace/a:collection[@href='Container2.Employees']/atom:title",
+ xmlString);
assertXpathExists("/a:service/a:workspace/a:collection[@href='Employees']", xmlString);
assertXpathExists("/a:service/a:workspace/a:collection[@href='Employees']/atom:title", xmlString);
- assertXpathEvaluatesTo("Employees", "/a:service/a:workspace/a:collection[@href='Container3.Employees']/atom:title", xmlString);
+ assertXpathEvaluatesTo("Employees", "/a:service/a:workspace/a:collection[@href='Container3.Employees']/atom:title",
+ xmlString);
assertXpathExists("/a:service/a:workspace/a:collection[@href='Employees']", xmlString);
assertXpathExists("/a:service/a:workspace/a:collection[@href='Employees']/atom:title", xmlString);
- assertXpathEvaluatesTo("Employees", "/a:service/a:workspace/a:collection[@href='Container4.Employees']/atom:title", xmlString);
+ assertXpathEvaluatesTo("Employees", "/a:service/a:workspace/a:collection[@href='Container4.Employees']/atom:title",
+ xmlString);
}
private String verifyResponse(final ODataResponse response) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
index a39dcd2..b10c68e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -196,7 +196,8 @@ public class JsonEntryEntityProducerTest extends BaseTest {
class EntryCallback implements OnWriteEntryContent {
@Override
- public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context) throws ODataApplicationException {
+ public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context)
+ throws ODataApplicationException {
WriteEntryCallbackResult result = new WriteEntryCallbackResult();
result.setEntryData(null);
result.setInlineProperties(DEFAULT_PROPERTIES);
@@ -207,14 +208,17 @@ public class JsonEntryEntityProducerTest extends BaseTest {
Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
callbacks.put("nr_Building", callback);
- final ODataResponse response = new JsonEntityProvider().writeEntry(entitySet, roomData,
- EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks).build());
+ final ODataResponse response =
+ new JsonEntityProvider().writeEntry(entitySet, roomData,
+ EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1)
+ .callbacks(callbacks).build());
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
- Map<String, Object> roomEntry = new Gson().fromJson(new InputStreamReader((InputStream) response.getEntity()), Map.class);
- //remove d wrapper
+ Map<String, Object> roomEntry =
+ new Gson().fromJson(new InputStreamReader((InputStream) response.getEntity()), Map.class);
+ // remove d wrapper
roomEntry = (Map<String, Object>) roomEntry.get("d");
assertEquals(2, roomEntry.size());
assertTrue(roomEntry.containsKey("nr_Building"));
@@ -237,7 +241,8 @@ public class JsonEntryEntityProducerTest extends BaseTest {
class EntryCallback implements OnWriteEntryContent {
@Override
- public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context) throws ODataApplicationException {
+ public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context)
+ throws ODataApplicationException {
WriteEntryCallbackResult result = new WriteEntryCallbackResult();
result.setEntryData(new HashMap<String, Object>());
result.setInlineProperties(DEFAULT_PROPERTIES);
@@ -248,14 +253,17 @@ public class JsonEntryEntityProducerTest extends BaseTest {
Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
callbacks.put("nr_Building", callback);
- ODataResponse response = new JsonEntityProvider().writeEntry(entitySet, roomData,
- EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks).build());
+ ODataResponse response =
+ new JsonEntityProvider().writeEntry(entitySet, roomData,
+ EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1)
+ .callbacks(callbacks).build());
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
- Map<String, Object> roomEntry = new Gson().fromJson(new InputStreamReader((InputStream) response.getEntity()), Map.class);
- //remove d wrapper
+ Map<String, Object> roomEntry =
+ new Gson().fromJson(new InputStreamReader((InputStream) response.getEntity()), Map.class);
+ // remove d wrapper
roomEntry = (Map<String, Object>) roomEntry.get("d");
assertEquals(2, roomEntry.size());
assertTrue(roomEntry.containsKey("nr_Building"));
@@ -277,7 +285,8 @@ public class JsonEntryEntityProducerTest extends BaseTest {
class EntryCallback implements OnWriteEntryContent {
@Override
- public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context) throws ODataApplicationException {
+ public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context)
+ throws ODataApplicationException {
Map<String, Object> buildingData = new HashMap<String, Object>();
buildingData.put("Id", "1");
WriteEntryCallbackResult result = new WriteEntryCallbackResult();
@@ -290,8 +299,10 @@ public class JsonEntryEntityProducerTest extends BaseTest {
Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
callbacks.put("nr_Building", callback);
- final ODataResponse response = new JsonEntityProvider().writeEntry(entitySet, roomData,
- EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks).build());
+ final ODataResponse response =
+ new JsonEntityProvider().writeEntry(entitySet, roomData,
+ EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1)
+ .callbacks(callbacks).build());
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -351,7 +362,8 @@ public class JsonEntryEntityProducerTest extends BaseTest {
callbacks.put("nr_Building", null);
new JsonEntityProvider().writeEntry(entitySet, roomData,
- EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks).build());
+ EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks)
+ .build());
}
@@ -369,7 +381,8 @@ public class JsonEntryEntityProducerTest extends BaseTest {
class FeedCallback implements OnWriteFeedContent {
@Override
- public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) throws ODataApplicationException {
+ public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
+ throws ODataApplicationException {
Map<String, Object> roomData = new HashMap<String, Object>();
roomData.put("Id", "1");
roomData.put("Version", 1);
@@ -385,8 +398,10 @@ public class JsonEntryEntityProducerTest extends BaseTest {
Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
callbacks.put("nb_Rooms", callback);
- final ODataResponse response = new JsonEntityProvider().writeEntry(entitySet, buildingData,
- EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks).build());
+ final ODataResponse response =
+ new JsonEntityProvider().writeEntry(entitySet, buildingData,
+ EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1)
+ .callbacks(callbacks).build());
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -418,7 +433,8 @@ public class JsonEntryEntityProducerTest extends BaseTest {
class FeedCallback implements OnWriteFeedContent {
@Override
- public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) throws ODataApplicationException {
+ public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
+ throws ODataApplicationException {
WriteFeedCallbackResult result = new WriteFeedCallbackResult();
result.setFeedData(null);
result.setInlineProperties(DEFAULT_PROPERTIES);
@@ -429,14 +445,17 @@ public class JsonEntryEntityProducerTest extends BaseTest {
Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
callbacks.put("nb_Rooms", callback);
- final ODataResponse response = new JsonEntityProvider().writeEntry(entitySet, buildingData,
- EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks).build());
+ final ODataResponse response =
+ new JsonEntityProvider().writeEntry(entitySet, buildingData,
+ EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1)
+ .callbacks(callbacks).build());
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
- Map<String, Object> buildingEntry = new Gson().fromJson(new InputStreamReader((InputStream) response.getEntity()), Map.class);
- //remove d wrapper
+ Map<String, Object> buildingEntry =
+ new Gson().fromJson(new InputStreamReader((InputStream) response.getEntity()), Map.class);
+ // remove d wrapper
buildingEntry = (Map<String, Object>) buildingEntry.get("d");
assertEquals(2, buildingEntry.size());
assertTrue(buildingEntry.containsKey("nb_Rooms"));
@@ -461,7 +480,8 @@ public class JsonEntryEntityProducerTest extends BaseTest {
class FeedCallback implements OnWriteFeedContent {
@Override
- public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) throws ODataApplicationException {
+ public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
+ throws ODataApplicationException {
WriteFeedCallbackResult result = new WriteFeedCallbackResult();
result.setFeedData(new ArrayList<Map<String, Object>>());
result.setInlineProperties(DEFAULT_PROPERTIES);
@@ -472,14 +492,17 @@ public class JsonEntryEntityProducerTest extends BaseTest {
Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
callbacks.put("nb_Rooms", callback);
- final ODataResponse response = new JsonEntityProvider().writeEntry(entitySet, buildingData,
- EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks).build());
+ final ODataResponse response =
+ new JsonEntityProvider().writeEntry(entitySet, buildingData,
+ EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1)
+ .callbacks(callbacks).build());
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
- Map<String, Object> buildingEntry = new Gson().fromJson(new InputStreamReader((InputStream) response.getEntity()), Map.class);
- //remove d wrapper
+ Map<String, Object> buildingEntry =
+ new Gson().fromJson(new InputStreamReader((InputStream) response.getEntity()), Map.class);
+ // remove d wrapper
buildingEntry = (Map<String, Object>) buildingEntry.get("d");
assertEquals(2, buildingEntry.size());
assertTrue(buildingEntry.containsKey("nb_Rooms"));
@@ -531,7 +554,8 @@ public class JsonEntryEntityProducerTest extends BaseTest {
callbacks.put("nb_Rooms", null);
new JsonEntityProvider().writeEntry(entitySet, buildingData,
- EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks).build());
+ EntityProviderWriteProperties.serviceRoot(URI.create(BASE_URI)).expandSelectTree(node1).callbacks(callbacks)
+ .build());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java
index e641762..29f1e95 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -68,9 +68,12 @@ public class JsonErrorProducerTest {
assertNull("EntitypProvider must not set content header", response.getContentHeader());
assertEquals(ODataServiceVersion.V10, response.getHeader(ODataHttpHeaders.DATASERVICEVERSION));
final String jsonErrorMessage = StringHelper.inputStreamToString((InputStream) response.getEntity());
- assertEquals("{\"error\":{\"code\":" + (errorCode == null ? "null" : "\"" + errorCode + "\"") + ","
+ assertEquals("{\"error\":{\"code\":"
+ + (errorCode == null ? "null" : "\"" + errorCode + "\"")
+ + ","
+ "\"message\":{\"lang\":"
- + (locale == null ? "null" : ("\"" + locale.getLanguage() + (locale.getCountry().isEmpty() ? "" : ("-" + locale.getCountry())) + "\""))
+ + (locale == null ? "null" : ("\"" + locale.getLanguage()
+ + (locale.getCountry().isEmpty() ? "" : ("-" + locale.getCountry())) + "\""))
+ ",\"value\":" + (message == null ? "null" : "\"" + message + "\"") + "}}}",
jsonErrorMessage);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java
index 13a8f64..a2195ae 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
[45/59] [abbrv] cleanup of odata testutil
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
index 4243551..d7008be 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.server;
@@ -24,13 +24,12 @@ import java.net.URI;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
import org.apache.log4j.Logger;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.testutil.fit.FitStaticServiceFactory;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
/**
*
@@ -46,7 +45,7 @@ public class TestServer {
private static final String DEFAULT_HOST = "localhost";
private static final String DEFAULT_PATH = "/test";
- private URI endpoint; //= URI.create("http://localhost:19080/test"); // no slash at the end !!!
+ private URI endpoint; // = URI.create("http://localhost:19080/test"); // no slash at the end !!!
private final String path;
private int pathSplit = 0;
@@ -82,7 +81,8 @@ public class TestServer {
for (int port = PORT_MIN; port <= PORT_MAX; port += PORT_INC) {
final CXFNonSpringJaxrsServlet odataServlet = new CXFNonSpringJaxrsServlet();
final ServletHolder odataServletHolder = new ServletHolder(odataServlet);
- odataServletHolder.setInitParameter("javax.ws.rs.Application", "org.apache.olingo.odata2.core.rest.app.ODataApplication");
+ odataServletHolder.setInitParameter("javax.ws.rs.Application",
+ "org.apache.olingo.odata2.core.rest.app.ODataApplication");
odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
if (pathSplit > 0) {
[21/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProvTest.java
index fc66a48..a79ae2c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAnnotationsImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -41,11 +41,14 @@ public class EdmAnnotationsImplProvTest extends BaseTest {
public static void getEdmEntityContainerImpl() throws Exception {
List<AnnotationAttribute> annotationAttributes = new ArrayList<AnnotationAttribute>();
- AnnotationAttribute attribute = new AnnotationAttribute().setName("attributeName").setNamespace("namespace").setPrefix("prefix").setText("Text");
+ AnnotationAttribute attribute =
+ new AnnotationAttribute().setName("attributeName").setNamespace("namespace").setPrefix("prefix")
+ .setText("Text");
annotationAttributes.add(attribute);
List<AnnotationElement> annotationElements = new ArrayList<AnnotationElement>();
- AnnotationElement element = new AnnotationElement().setName("elementName").setNamespace("namespace").setPrefix("prefix").setText("xmlData");
+ AnnotationElement element =
+ new AnnotationElement().setName("elementName").setNamespace("namespace").setPrefix("prefix").setText("xmlData");
annotationElements.add(element);
annotationsProvider = new EdmAnnotationsImplProv(annotationAttributes, annotationElements);
@@ -78,7 +81,8 @@ public class EdmAnnotationsImplProvTest extends BaseTest {
@Test
public void testAttributeNull() {
- EdmAnnotationAttribute attribute = annotationsProvider.getAnnotationAttribute("attributeNameWrong", "namespaceWrong");
+ EdmAnnotationAttribute attribute =
+ annotationsProvider.getAnnotationAttribute("attributeNameWrong", "namespaceWrong");
assertNull(attribute);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java
index 1390767..009d979 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -47,7 +47,9 @@ public class EdmAssociationEndImplProvTest extends BaseTest {
edmProvider = mock(EdmProvider.class);
EdmImplProv edmImplProv = new EdmImplProv(edmProvider);
- AssociationEnd end1 = new AssociationEnd().setRole("end1Role").setMultiplicity(EdmMultiplicity.ONE).setType(EdmSimpleTypeKind.String.getFullQualifiedName());
+ AssociationEnd end1 =
+ new AssociationEnd().setRole("end1Role").setMultiplicity(EdmMultiplicity.ONE).setType(
+ EdmSimpleTypeKind.String.getFullQualifiedName());
associationEndProv = new EdmAssociationEndImplProv(edmImplProv, end1);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
index e1211da..b1dc084 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -56,8 +56,12 @@ public class EdmAssociationImplProvTest extends BaseTest {
edmProvider = mock(EdmProvider.class);
EdmImplProv edmImplProv = new EdmImplProv(edmProvider);
- AssociationEnd end1 = new AssociationEnd().setRole("end1Role").setMultiplicity(EdmMultiplicity.ONE).setType(EdmSimpleTypeKind.String.getFullQualifiedName());
- AssociationEnd end2 = new AssociationEnd().setRole("end2Role").setMultiplicity(EdmMultiplicity.ONE).setType(EdmSimpleTypeKind.String.getFullQualifiedName());
+ AssociationEnd end1 =
+ new AssociationEnd().setRole("end1Role").setMultiplicity(EdmMultiplicity.ONE).setType(
+ EdmSimpleTypeKind.String.getFullQualifiedName());
+ AssociationEnd end2 =
+ new AssociationEnd().setRole("end2Role").setMultiplicity(EdmMultiplicity.ONE).setType(
+ EdmSimpleTypeKind.String.getFullQualifiedName());
List<PropertyRef> propRef = new ArrayList<PropertyRef>();
propRef.add(new PropertyRef().setName("prop1"));
@@ -67,7 +71,8 @@ public class EdmAssociationImplProvTest extends BaseTest {
ReferentialConstraintRole dependent = new ReferentialConstraintRole().setRole("end1Role");
ReferentialConstraintRole principal = new ReferentialConstraintRole().setRole("end2Role");
- ReferentialConstraint referentialConstraint = new ReferentialConstraint().setDependent(dependent).setPrincipal(principal);
+ ReferentialConstraint referentialConstraint =
+ new ReferentialConstraint().setDependent(dependent).setPrincipal(principal);
Association association = new Association().setName("association").setEnd1(end1).setEnd2(end2);
association.setReferentialConstraint(referentialConstraint);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProvTest.java
index f822c8e..3e1b8c7 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetEndImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -48,17 +48,12 @@ public class EdmAssociationSetEndImplProvTest extends BaseTest {
EntityContainerInfo entityContainer = new EntityContainerInfo().setName("Container");
EdmEntityContainer edmEntityContainer = new EdmEntityContainerImplProv(edmImplProv, entityContainer);
- // AssociationEnd end1 = new AssociationEnd().setRole("end1Role").setMultiplicity(EdmMultiplicity.ONE).setType(EdmSimpleTypeKind.String.getFullQualifiedName());
- // AssociationEnd end2 = new AssociationEnd().setRole("end2Role").setMultiplicity(EdmMultiplicity.ONE).setType(EdmSimpleTypeKind.String.getFullQualifiedName());
- // Association association = new Association().setName("association").setEnd1(end1).setEnd2(end2);
- // FullQualifiedName assocName = new FullQualifiedName("namespace", "association");
- // when(edmProvider.getAssociation(assocName)).thenReturn(association);
-
AssociationSetEnd associationSetEnd = new AssociationSetEnd().setRole("end1Role").setEntitySet("entitySetRole1");
EntitySet entitySet = new EntitySet().setName("entitySetRole1");
when(edmProvider.getEntitySet("Container", "entitySetRole1")).thenReturn(entitySet);
- edmAssociationSetEnd = new EdmAssociationSetEndImplProv(associationSetEnd, edmEntityContainer.getEntitySet("entitySetRole1"));
+ edmAssociationSetEnd =
+ new EdmAssociationSetEndImplProv(associationSetEnd, edmEntityContainer.getEntitySet("entitySetRole1"));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProvTest.java
index 11ebe30..dacf62c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationSetImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -57,8 +57,12 @@ public class EdmAssociationSetImplProvTest extends BaseTest {
EntityContainerInfo entityContainer = new EntityContainerInfo().setName("Container");
EdmEntityContainer edmEntityContainer = new EdmEntityContainerImplProv(edmImplProv, entityContainer);
- AssociationEnd end1 = new AssociationEnd().setRole("end1Role").setMultiplicity(EdmMultiplicity.ONE).setType(EdmSimpleTypeKind.String.getFullQualifiedName());
- AssociationEnd end2 = new AssociationEnd().setRole("end2Role").setMultiplicity(EdmMultiplicity.ONE).setType(EdmSimpleTypeKind.String.getFullQualifiedName());
+ AssociationEnd end1 =
+ new AssociationEnd().setRole("end1Role").setMultiplicity(EdmMultiplicity.ONE).setType(
+ EdmSimpleTypeKind.String.getFullQualifiedName());
+ AssociationEnd end2 =
+ new AssociationEnd().setRole("end2Role").setMultiplicity(EdmMultiplicity.ONE).setType(
+ EdmSimpleTypeKind.String.getFullQualifiedName());
Association association = new Association().setName("association").setEnd1(end1).setEnd2(end2);
FullQualifiedName assocName = new FullQualifiedName("namespace", "association");
when(edmProvider.getAssociation(assocName)).thenReturn(association);
@@ -67,7 +71,8 @@ public class EdmAssociationSetImplProvTest extends BaseTest {
when(edmProvider.getEntitySet("Container", "entitySetRole1")).thenReturn(new EntitySet().setName("entitySetRole1"));
AssociationSetEnd endSet2 = new AssociationSetEnd().setRole("end2Role");
- AssociationSet associationSet = new AssociationSet().setName("associationSetName").setAssociation(assocName).setEnd1(endSet1).setEnd2(endSet2);
+ AssociationSet associationSet =
+ new AssociationSet().setName("associationSetName").setAssociation(assocName).setEnd1(endSet1).setEnd2(endSet2);
edmAssociationSet = new EdmAssociationSetImplProv(edmImplProv, associationSet, edmEntityContainer);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java
index 4716936..38de885 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java
index e164f88..98ec966 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -129,7 +129,8 @@ public class EdmEntityContainerImplProvTest extends BaseTest {
when(edmNavigationProperty.getFromRole()).thenReturn("fromRole");
assertNotNull(edmEntityContainer.getAssociationSet(sourceEntitySet, edmNavigationProperty));
- assertEquals(edmEntityContainer.getAssociationSet(sourceEntitySet, edmNavigationProperty), edmEntityContainer.getAssociationSet(sourceEntitySet, edmNavigationProperty));
+ assertEquals(edmEntityContainer.getAssociationSet(sourceEntitySet, edmNavigationProperty), edmEntityContainer
+ .getAssociationSet(sourceEntitySet, edmNavigationProperty));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProvTest.java
index 1de3e41..202a67f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetInfoImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java
index d4061fd..c843f7d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -72,7 +72,8 @@ public class EdmEntitySetProvTest extends BaseTest {
List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
FullQualifiedName fooBarAssocName = new FullQualifiedName("namespace", "fooBarAssoc");
- navigationProperties.add(new NavigationProperty().setName("fooBarNav").setFromRole("fromFoo").setRelationship(fooBarAssocName).setToRole("toBar"));
+ navigationProperties.add(new NavigationProperty().setName("fooBarNav").setFromRole("fromFoo").setRelationship(
+ fooBarAssocName).setToRole("toBar"));
EntityType fooEntityType = new EntityType().setName("fooEntityType").setNavigationProperties(navigationProperties);
FullQualifiedName fooEntityTypeFullName = new FullQualifiedName("namespace", "fooEntityType");
@@ -93,7 +94,10 @@ public class EdmEntitySetProvTest extends BaseTest {
Association fooBarAssoc = new Association().setName("fooBarAssoc").setEnd1(fooEnd).setEnd2(barEnd);
when(edmProvider.getAssociation(fooBarAssocName)).thenReturn(fooBarAssoc);
- AssociationSet associationSet = new AssociationSet().setName("fooBarRelation").setEnd1(new AssociationSetEnd().setRole("fromFoo").setEntitySet("foo")).setEnd2(new AssociationSetEnd().setRole("toBar").setEntitySet("bar"));
+ AssociationSet associationSet =
+ new AssociationSet().setName("fooBarRelation").setEnd1(
+ new AssociationSetEnd().setRole("fromFoo").setEntitySet("foo")).setEnd2(
+ new AssociationSetEnd().setRole("toBar").setEntitySet("bar"));
FullQualifiedName assocFQName = new FullQualifiedName("namespace", "fooBarAssoc");
when(edmProvider.getAssociationSet("Container", assocFQName, "foo", "fromFoo")).thenReturn(associationSet);
@@ -128,7 +132,8 @@ public class EdmEntitySetProvTest extends BaseTest {
@Test
public void testEntitySetType() throws Exception {
assertEquals("fooEntityType", edmEntitySetFoo.getEntityType().getName());
- assertEquals(edmEntitySetFoo.getEntityType().getName(), edmProvider.getEntityType(new FullQualifiedName("namespace", "fooEntityType")).getName());
+ assertEquals(edmEntitySetFoo.getEntityType().getName(), edmProvider.getEntityType(
+ new FullQualifiedName("namespace", "fooEntityType")).getName());
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java
index ddbe971..b264296 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -61,7 +61,8 @@ public class EdmEntityTypeImplProvTest extends BaseTest {
List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
FullQualifiedName fooBarAssocName = new FullQualifiedName("namespace", "fooBarAssoc");
- navigationProperties.add(new NavigationProperty().setName("fooBarNav").setFromRole("fromFoo").setRelationship(fooBarAssocName).setToRole("toBar"));
+ navigationProperties.add(new NavigationProperty().setName("fooBarNav").setFromRole("fromFoo").setRelationship(
+ fooBarAssocName).setToRole("toBar"));
EntityType fooEntityType = new EntityType().setName("fooEntityType").setNavigationProperties(navigationProperties);
FullQualifiedName fooEntityTypeFullName = new FullQualifiedName("namespace", "fooEntityType");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
index 8963aad..aabf45b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -67,10 +67,13 @@ public class EdmFunctionImportImplProvTest extends BaseTest {
EntitySet fooEntitySet = new EntitySet().setName("fooEntitySet");
when(edmProvider.getEntitySet("Container", "fooEntitySet")).thenReturn(fooEntitySet);
- ReturnType fooReturnType = new ReturnType().setTypeName(EdmSimpleTypeKind.String.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.ONE);
+ ReturnType fooReturnType =
+ new ReturnType().setTypeName(EdmSimpleTypeKind.String.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.ONE);
List<FunctionImportParameter> parameters = new ArrayList<FunctionImportParameter>();
- FunctionImportParameter parameter = new FunctionImportParameter().setName("fooParameter1").setType(EdmSimpleTypeKind.String);
+ FunctionImportParameter parameter =
+ new FunctionImportParameter().setName("fooParameter1").setType(EdmSimpleTypeKind.String);
parameters.add(parameter);
parameter = new FunctionImportParameter().setName("fooParameter2").setType(EdmSimpleTypeKind.String);
@@ -79,13 +82,16 @@ public class EdmFunctionImportImplProvTest extends BaseTest {
parameter = new FunctionImportParameter().setName("fooParameter3").setType(EdmSimpleTypeKind.String);
parameters.add(parameter);
- FunctionImport functionImportFoo = new FunctionImport().setName("foo").setHttpMethod(HttpMethods.GET).setReturnType(fooReturnType).setEntitySet("fooEntitySet").setParameters(parameters);
+ FunctionImport functionImportFoo =
+ new FunctionImport().setName("foo").setHttpMethod(HttpMethods.GET).setReturnType(fooReturnType).setEntitySet(
+ "fooEntitySet").setParameters(parameters);
when(edmProvider.getFunctionImport("Container", "foo")).thenReturn(functionImportFoo);
edmFunctionImport = new EdmFunctionImportImplProv(edmImplProv, functionImportFoo, edmEntityContainer);
FunctionImport functionImportBar = new FunctionImport().setName("bar").setHttpMethod(HttpMethods.GET);
when(edmProvider.getFunctionImport("Container", "bar")).thenReturn(functionImportBar);
- edmFunctionImportWithoutParameters = new EdmFunctionImportImplProv(edmImplProv, functionImportBar, edmEntityContainer);
+ edmFunctionImportWithoutParameters =
+ new EdmFunctionImportImplProv(edmImplProv, functionImportBar, edmEntityContainer);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProvTest.java
index 1e24c03..5552d94 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java
index 92e1f74..62da2e7 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -47,13 +47,18 @@ public class EdmMappingTest extends BaseTest {
mappedObject = new EdmMappingTest();
- Mapping propertySimpleMapping = new Mapping().setMimeType("mimeType").setInternalName("value").setObject(mappedObject);
+ Mapping propertySimpleMapping =
+ new Mapping().setMimeType("mimeType").setInternalName("value").setObject(mappedObject);
CustomizableFeedMappings propertySimpleFeedMappings = new CustomizableFeedMappings().setFcKeepInContent(true);
- SimpleProperty propertySimple = new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String)
- .setMimeType("mimeType").setMapping(propertySimpleMapping).setCustomizableFeedMappings(propertySimpleFeedMappings);
+ SimpleProperty propertySimple =
+ new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String)
+ .setMimeType("mimeType").setMapping(propertySimpleMapping).setCustomizableFeedMappings(
+ propertySimpleFeedMappings);
propertySimpleProvider = new EdmSimplePropertyImplProv(edmImplProv, propertySimple);
- NavigationProperty navProperty = new NavigationProperty().setName("navProperty").setFromRole("fromRole").setToRole("toRole").setMapping(propertySimpleMapping);
+ NavigationProperty navProperty =
+ new NavigationProperty().setName("navProperty").setFromRole("fromRole").setToRole("toRole").setMapping(
+ propertySimpleMapping);
navPropertyProvider = new EdmNavigationPropertyImplProv(edmImplProv, navProperty);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProvTest.java
index b74c3a3..0691e97 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java
index 5f41b07..c9a12aa 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -58,13 +58,16 @@ public class EdmNavigationPropertyImplProvTest extends BaseTest {
AssociationEnd end1 = new AssociationEnd().setRole("fromRole");
FullQualifiedName entityName = new FullQualifiedName("namespace", "entityName");
- AssociationEnd end2 = new AssociationEnd().setRole("toRole").setMultiplicity(EdmMultiplicity.ONE).setType(entityName);
+ AssociationEnd end2 =
+ new AssociationEnd().setRole("toRole").setMultiplicity(EdmMultiplicity.ONE).setType(entityName);
association.setEnd1(end1).setEnd2(end2);
EntityType entityType = new EntityType().setName("entityName");
when(edmProvider.getEntityType(entityName)).thenReturn(entityType);
- NavigationProperty navProperty = new NavigationProperty().setName("navProperty").setFromRole("fromRole").setToRole("toRole").setRelationship(relationship);
+ NavigationProperty navProperty =
+ new NavigationProperty().setName("navProperty").setFromRole("fromRole").setToRole("toRole").setRelationship(
+ relationship);
navPropertyProvider = new EdmNavigationPropertyImplProv(edmImplProv, navProperty);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
index e02fac0..79ef3a6 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -61,16 +61,20 @@ public class EdmPropertyImplProvTest extends BaseTest {
Mapping propertySimpleMapping = new Mapping().setMimeType("mimeType2").setInternalName("value");
CustomizableFeedMappings propertySimpleFeedMappings = new CustomizableFeedMappings().setFcKeepInContent(true);
- SimpleProperty propertySimple = new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String)
- .setMimeType("mimeType").setMapping(propertySimpleMapping).setCustomizableFeedMappings(propertySimpleFeedMappings);
+ SimpleProperty propertySimple =
+ new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String)
+ .setMimeType("mimeType").setMapping(propertySimpleMapping).setCustomizableFeedMappings(
+ propertySimpleFeedMappings);
propertySimpleProvider = new EdmSimplePropertyImplProv(edmImplProv, propertySimple);
Facets facets = new Facets().setNullable(false);
- SimpleProperty propertySimpleWithFacets = new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String).setFacets(facets);
+ SimpleProperty propertySimpleWithFacets =
+ new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String).setFacets(facets);
propertySimpleWithFacetsProvider = new EdmSimplePropertyImplProv(edmImplProv, propertySimpleWithFacets);
Facets facets2 = new Facets().setNullable(true);
- SimpleProperty propertySimpleWithFacets2 = new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String).setFacets(facets2);
+ SimpleProperty propertySimpleWithFacets2 =
+ new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String).setFacets(facets2);
propertySimpleWithFacetsProvider2 = new EdmSimplePropertyImplProv(edmImplProv, propertySimpleWithFacets2);
ComplexType complexType = new ComplexType().setName("complexType");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProvTest.java
index d9f1245..696e7a1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProvTest.java
index b2eb1eb..4ede3c7 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java
index 4c3e42d..d11da1a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -102,7 +102,8 @@ public class EdmServiceMetadataImplProvTest extends BaseTest {
entitySets.add(entitySet);
List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
- EntityContainer container = new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets);
+ EntityContainer container =
+ new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets);
entityContainers.add(container);
List<Schema> schemas = new ArrayList<Schema>();
@@ -131,7 +132,8 @@ public class EdmServiceMetadataImplProvTest extends BaseTest {
entitySets.add(entitySet);
List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
- EntityContainer container = new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets);
+ EntityContainer container =
+ new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets);
entityContainers.add(container);
List<Schema> schemas = new ArrayList<Schema>();
@@ -157,10 +159,12 @@ public class EdmServiceMetadataImplProvTest extends BaseTest {
entitySets.add(entitySet);
List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
- EntityContainer container = new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets);
+ EntityContainer container =
+ new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets);
entityContainers.add(container);
- EntityContainer container2 = new EntityContainer().setDefaultEntityContainer(false).setName("Container2").setEntitySets(entitySets);
+ EntityContainer container2 =
+ new EntityContainer().setDefaultEntityContainer(false).setName("Container2").setEntitySets(entitySets);
entityContainers.add(container2);
List<Schema> schemas = new ArrayList<Schema>();
@@ -193,7 +197,8 @@ public class EdmServiceMetadataImplProvTest extends BaseTest {
entitySets.add(entitySet);
List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
- EntityContainer container = new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets);
+ EntityContainer container =
+ new EntityContainer().setDefaultEntityContainer(true).setName("Container").setEntitySets(entitySets);
entityContainers.add(container);
List<Schema> schemas = new ArrayList<Schema>();
@@ -233,18 +238,31 @@ public class EdmServiceMetadataImplProvTest extends BaseTest {
@Test
public void testEntityTypeStructure() throws Exception {
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType[@Name and @m:HasStream]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType[@Name and @BaseType and @m:HasStream]", metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType[@Name and @BaseType and @m:HasStream]",
+ metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Key", metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Key/a:PropertyRef[@Name]", metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @Nullable and @m:FC_TargetPath]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:NavigationProperty[@Name and @Relationship and @FromRole and @ToRole]", metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @Nullable and" +
+ " @m:FC_TargetPath]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:NavigationProperty[@Name and " +
+ "@Relationship and @FromRole and @ToRole]",
+ metadata);
}
@Test
public void testAnnotations() throws Exception {
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @Nullable and @annoPrefix:annoName]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @m:FC_TargetPath and @annoPrefix:annoName]", metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @Nullable and " +
+ "@annoPrefix:annoName]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @m:FC_TargetPath and " +
+ "@annoPrefix:annoName]",
+ metadata);
}
@Test
@@ -256,21 +274,39 @@ public class EdmServiceMetadataImplProvTest extends BaseTest {
@Test
public void testEntityContainerStructure() throws Exception {
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer[@Name]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer/a:EntitySet[@Name and @EntityType]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer/a:AssociationSet[@Name and @Association]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer//a:AssociationSet/a:End[@EntitySet and @Role]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer/a:FunctionImport[@Name and @ReturnType and @EntitySet and @m:HttpMethod]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer/a:FunctionImport/a:Parameter[@Name and @Type]", metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer/a:EntitySet[@Name and @EntityType]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer/a:AssociationSet[@Name and @Association]", metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer//a:AssociationSet/a:End[@EntitySet and @Role]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer/a:FunctionImport[@Name and @ReturnType and " +
+ "@EntitySet and @m:HttpMethod]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityContainer/a:FunctionImport/a:Parameter[@Name and @Type]",
+ metadata);
}
@Test
public void testAssociationStructure() throws Exception {
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association[@Name]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:End[@Type and @Multiplicity and @Role]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:ReferentialConstraint/a:Principal[@Role]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:ReferentialConstraint/a:Principal[@Role]/a:PropertyRef[@Name]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:ReferentialConstraint/a:Dependent[@Role]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:ReferentialConstraint/a:Dependent[@Role]/a:PropertyRef[@Name]", metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:End[@Type and @Multiplicity and @Role]",
+ metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:ReferentialConstraint/a:Principal[@Role]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:ReferentialConstraint/a:" +
+ "Principal[@Role]/a:PropertyRef[@Name]",
+ metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:ReferentialConstraint/a:Dependent[@Role]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:Association/a:ReferentialConstraint/a:Dependent" +
+ "[@Role]/a:PropertyRef[@Name]",
+ metadata);
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmxProviderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmxProviderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmxProviderTest.java
index 32bfb43..1fc1419 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmxProviderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmxProviderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -87,8 +87,10 @@ public class EdmxProviderTest {
FullQualifiedName fqNameAssociation = new FullQualifiedName("RefScenario", "ManagerEmployees");
EdmImplProv edmImpl = (EdmImplProv) edm;
- AssociationSet associationSet = edmImpl.getEdmProvider().getAssociationSet("Container1", fqNameAssociation, "Managers", "r_Manager");
- AssociationSet testAssociationSet = testProvider.getAssociationSet("Container1", fqNameAssociation, "Managers", "r_Manager");
+ AssociationSet associationSet =
+ edmImpl.getEdmProvider().getAssociationSet("Container1", fqNameAssociation, "Managers", "r_Manager");
+ AssociationSet testAssociationSet =
+ testProvider.getAssociationSet("Container1", fqNameAssociation, "Managers", "r_Manager");
assertEquals(testAssociationSet.getName(), associationSet.getName());
assertEquals(testAssociationSet.getEnd1().getEntitySet(), associationSet.getEnd1().getEntitySet());
assertEquals(testAssociationSet.getEnd2().getEntitySet(), associationSet.getEnd2().getEntitySet());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
index 3da63fc..2fd5afa 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -65,7 +65,8 @@ public abstract class AbstractProviderTest extends AbstractXmlProducerTestHelper
throw new RuntimeException(e);
}
}
- protected static final EntityProviderWriteProperties DEFAULT_PROPERTIES = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
+ protected static final EntityProviderWriteProperties DEFAULT_PROPERTIES = EntityProviderWriteProperties.serviceRoot(
+ BASE_URI).build();
protected Map<String, Object> employeeData;
@@ -131,7 +132,11 @@ public abstract class AbstractProviderTest extends AbstractXmlProducerTestHelper
photoData.put("Id", Integer.valueOf(1));
photoData.put("Name", "Mona Lisa");
photoData.put("Type", "image/png");
- photoData.put("ImageUrl", "http://www.mopo.de/image/view/2012/6/4/16548086,13385561,medRes,maxh,234,maxw,234,Parodia_Mona_Lisa_Lego_Hamburger_Morgenpost.jpg");
+ photoData
+ .put(
+ "ImageUrl",
+ "http://www.mopo.de/image/view/2012/6/4/16548086,13385561,medRes,maxh,234,maxw,234," +
+ "Parodia_Mona_Lisa_Lego_Hamburger_Morgenpost.jpg");
Map<String, Object> imageData = new HashMap<String, Object>();
imageData.put("Image", new byte[] { 1, 2, 3, 4 });
imageData.put("getImageType", "image/png");
@@ -184,7 +189,8 @@ public abstract class AbstractProviderTest extends AbstractXmlProducerTestHelper
return ctx;
}
- protected EntityProviderInterface createEntityProvider() throws ODataException, EdmException, EntityProviderException {
+ protected EntityProviderInterface createEntityProvider() throws ODataException, EdmException,
+ EntityProviderException {
return new ProviderFacadeImpl();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractXmlProducerTestHelper.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractXmlProducerTestHelper.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractXmlProducerTestHelper.java
index 8e1c358..351193a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractXmlProducerTestHelper.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractXmlProducerTestHelper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -36,16 +36,16 @@ public abstract class AbstractXmlProducerTestHelper extends BaseTest {
public AbstractXmlProducerTestHelper(final StreamWriterImplType type) {
switch (type) {
case WOODSTOCKIMPL:
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); //NOSONAR
- System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); //NOSONAR
+ System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); // NOSONAR
+ System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); // NOSONAR
break;
case SUNINTERNALIMPL:
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.sun.xml.internal.stream.XMLInputFactoryImpl"); //NOSONAR
- System.setProperty("javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"); //NOSONAR
+ System.setProperty("javax.xml.stream.XMLInputFactory", "com.sun.xml.internal.stream.XMLInputFactoryImpl"); // NOSONAR
+ System.setProperty("javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"); // NOSONAR
break;
default:
- System.setProperty("javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"); //NOSONAR
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.sun.xml.internal.stream.XMLInputFactoryImpl"); //NOSONAR
+ System.setProperty("javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"); // NOSONAR
+ System.setProperty("javax.xml.stream.XMLInputFactory", "com.sun.xml.internal.stream.XMLInputFactoryImpl"); // NOSONAR
break;
}
}
[51/59] [abbrv] cleanup jpa core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java
index d49c885..6c8c5eb 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -60,7 +60,9 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
public void setUp() {
objJPAEdmReferentialConstraintRoleTest = new JPAEdmReferentialConstraintRoleTest();
- objJPAEdmReferentialConstraintRole = new JPAEdmReferentialConstraintRole(RoleType.PRINCIPAL, objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest);
+ objJPAEdmReferentialConstraintRole =
+ new JPAEdmReferentialConstraintRole(RoleType.PRINCIPAL, objJPAEdmReferentialConstraintRoleTest,
+ objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest);
try {
objJPAEdmReferentialConstraintRole.getBuilder().build();
@@ -97,7 +99,9 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
@Test
public void testGetRoleTypeDependent() {
objJPAEdmReferentialConstraintRoleTest = new JPAEdmReferentialConstraintRoleTest();
- objJPAEdmReferentialConstraintRole = new JPAEdmReferentialConstraintRole(RoleType.DEPENDENT, objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest);
+ objJPAEdmReferentialConstraintRole =
+ new JPAEdmReferentialConstraintRole(RoleType.DEPENDENT, objJPAEdmReferentialConstraintRoleTest,
+ objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest);
try {
objJPAEdmReferentialConstraintRole.getBuilder().build();
@@ -146,8 +150,10 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
public Association getEdmAssociation() {
Association association = new Association();
association.setName("Assoc_SalesOrderHeader_SalesOrderItem");
- association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole("SalesOrderHeader"));
- association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")).setRole("SalesOrderItem"));
+ association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole(
+ "SalesOrderHeader"));
+ association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem"))
+ .setRole("SalesOrderItem"));
return association;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java
index 2bad041..84b7ad4 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -52,7 +52,9 @@ public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
@Before
public void setUp() {
objJPAEdmReferentialConstraintTest = new JPAEdmReferentialConstraintTest();
- objJPAEdmReferentialConstraint = new JPAEdmReferentialConstraint(objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest);
+ objJPAEdmReferentialConstraint =
+ new JPAEdmReferentialConstraint(objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest,
+ objJPAEdmReferentialConstraintTest);
try {
objJPAEdmReferentialConstraint.getBuilder().build();
} catch (ODataJPAModelException e) {
@@ -83,7 +85,9 @@ public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
@Test
public void testIsExistsTrue() {
objJPAEdmReferentialConstraintTest = new JPAEdmReferentialConstraintTest();
- objJPAEdmReferentialConstraint = new JPAEdmReferentialConstraint(objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest);
+ objJPAEdmReferentialConstraint =
+ new JPAEdmReferentialConstraint(objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest,
+ objJPAEdmReferentialConstraintTest);
try {
objJPAEdmReferentialConstraint.getBuilder().build();
objJPAEdmReferentialConstraint.getBuilder().build();
@@ -104,8 +108,10 @@ public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
public Association getEdmAssociation() {
Association association = new Association();
association.setName("Assoc_SalesOrderHeader_SalesOrderItem");
- association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole("SalesOrderHeader"));
- association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")).setRole("SalesOrderItem"));
+ association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole(
+ "SalesOrderHeader"));
+ association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem"))
+ .setRole("SalesOrderItem"));
return association;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java
index 5fec2e7..9d6848a 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -39,7 +39,7 @@ public class JPAEdmSchemaTest extends JPAEdmTestModelView {
public void setUp() {
objJPAEdmSchemaTest = new JPAEdmSchemaTest();
objJPAEdmSchema = new JPAEdmSchema(objJPAEdmSchemaTest);
- //building schema is not required as downstream structure already tested
+ // building schema is not required as downstream structure already tested
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java
index e5c8d39..297ba7a 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -59,7 +59,10 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView;
import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView;
import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
-public class JPAEdmTestModelView implements JPAEdmAssociationEndView, JPAEdmAssociationSetView, JPAEdmAssociationView, JPAEdmBaseView, JPAEdmComplexPropertyView, JPAEdmComplexTypeView, JPAEdmEntityContainerView, JPAEdmEntitySetView, JPAEdmEntityTypeView, JPAEdmKeyView, JPAEdmModelView, JPAEdmNavigationPropertyView, JPAEdmPropertyView, JPAEdmReferentialConstraintView, JPAEdmSchemaView {
+public class JPAEdmTestModelView implements JPAEdmAssociationEndView, JPAEdmAssociationSetView, JPAEdmAssociationView,
+ JPAEdmBaseView, JPAEdmComplexPropertyView, JPAEdmComplexTypeView, JPAEdmEntityContainerView, JPAEdmEntitySetView,
+ JPAEdmEntityTypeView, JPAEdmKeyView, JPAEdmModelView, JPAEdmNavigationPropertyView, JPAEdmPropertyView,
+ JPAEdmReferentialConstraintView, JPAEdmSchemaView {
protected JPAEdmMappingModelAccess mappingModelAccess;
@@ -314,7 +317,8 @@ public class JPAEdmTestModelView implements JPAEdmAssociationEndView, JPAEdmAsso
}
@Override
- public void expandEdmComplexType(final ComplexType complexType, final List<Property> expandedPropertyList, final String embeddablePropertyName) {
+ public void expandEdmComplexType(final ComplexType complexType, final List<Property> expandedPropertyList,
+ final String embeddablePropertyName) {
}
@@ -347,7 +351,8 @@ public class JPAEdmTestModelView implements JPAEdmAssociationEndView, JPAEdmAsso
}
@Override
- public void addJPAEdmAssociationView(final JPAEdmAssociationView associationView, final JPAEdmAssociationEndView associationEndView) {
+ public void addJPAEdmAssociationView(final JPAEdmAssociationView associationView,
+ final JPAEdmAssociationEndView associationEndView) {
// TODO Auto-generated method stub
}
[03/59] [abbrv] Clean up of odata api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/package-info.java
index 0f77215..ca1fd44 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/package-info.java
@@ -1,25 +1,25 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Processor Features<p>
*
- * Optional feature interfaces. Can be implemented by custom data processors.
+ * Optional feature interfaces. Can be implemented by custom data processors.
*/
package org.apache.olingo.odata2.api.processor.feature;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/package-info.java
index 8936285..e5afc1a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/package-info.java
@@ -1,41 +1,45 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Data Processor<p>
*
- * A data processor implements all create, read, update and delete (CRUD) methods of an OData service. A processor as
- * part of a OData service implementation is created by the service factory and then called during request handling.
- * In dependency of the http context (http method, requestheaders ...) and the parsed uri semantic the OData Library
+ * A data processor implements all create, read, update and delete (CRUD) methods of an OData service. A processor as
+ * part of a OData service implementation is created by the service factory and then called during request handling.
+ * In dependency of the http context (http method, requestheaders ...) and the parsed uri semantic the OData Library
* will call an appropriate processor method. Within this method a service can perform operations on data. In a final
- * step the data result can be transformed using a {@link org.apache.olingo.odata2.api.ep.EntityProvider} (for Json, Atom and XML) and is returned as
+ * step the data result can be transformed using a {@link org.apache.olingo.odata2.api.ep.EntityProvider} (for Json,
+ * Atom and XML) and is returned as
* a {@link org.apache.olingo.odata2.api.processor.ODataResponse}.
* <p>
- * A processor gets access to context information either via method parameters or a {@link org.apache.olingo.odata2.api.processor.ODataContext} which is attached
+ * A processor gets access to context information either via method parameters or a
+ * {@link org.apache.olingo.odata2.api.processor.ODataContext} which is attached
* to the processor object.
* <p>
- * A processor can support optional features {@link org.apache.olingo.odata2.api.processor.feature} and implement
- * parts {@link org.apache.olingo.odata2.api.processor.part} which is more or less a grouping for different OData CRUD operations.
- * <p>
- * {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor} is a convenience abstract class that implements all interface parts and has default implementations
- * for handling OData service document and metadata. Usually the {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor} is used together with a
+ * A processor can support optional features {@link org.apache.olingo.odata2.api.processor.feature} and implement
+ * parts {@link org.apache.olingo.odata2.api.processor.part} which is more or less a grouping for different OData CRUD
+ * operations.
+ * <p> {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor} is a convenience abstract class that
+ * implements all interface parts and has default implementations
+ * for handling OData service document and metadata. Usually the
+ * {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor} is used together with a
* <code>ODataSingleService</code> default implementation.
- *
+ *
*/
package org.apache.olingo.odata2.api.processor;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java
index 46b8893..1683aa5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -29,15 +29,15 @@ import org.apache.olingo.odata2.api.processor.ODataRequest;
import org.apache.olingo.odata2.api.processor.ODataResponse;
/**
- * Execute a OData batch request.
+ * Execute a OData batch request.
+ *
+ *
*
- *
- *
*/
public interface BatchProcessor extends ODataProcessor {
/**
- * Executes a OData batch request and provide Batch Response as {@link ODataResponse}
+ * Executes a OData batch request and provide Batch Response as {@link ODataResponse}
* @param handler batch handler
* @param contentType the content type of the request
* @param content Batch Request body
@@ -47,13 +47,15 @@ public interface BatchProcessor extends ODataProcessor {
ODataResponse executeBatch(BatchHandler handler, String contentType, InputStream content) throws ODataException;
/**
- * Executes a Change Set and provide BatchResponsePart as {@link BatchResponsePart} that contains the responses to change requests.
- * The method has to define a rollback semantic that may be applied when a request within a Change Set fails (all-or-nothing requirement).
- * If a request within a Change Set fails, instead of Change Set Response should be returned the error response
+ * Executes a Change Set and provide BatchResponsePart as {@link BatchResponsePart} that contains the responses to
+ * change requests.
+ * The method has to define a rollback semantic that may be applied when a request within a Change Set fails
+ * (all-or-nothing requirement).
+ * If a request within a Change Set fails, instead of Change Set Response should be returned the error response
* @param handler batch handler
* @param requests list of single change requests
* @return a {@link BatchResponsePart} object
- * @throws ODataException
+ * @throws ODataException
*/
BatchResponsePart executeChangeSet(BatchHandler handler, List<ODataRequest> requests) throws ODataException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java
index 2d962bd..aae885c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -27,9 +27,9 @@ import org.apache.olingo.odata2.api.uri.info.GetComplexPropertyUriInfo;
import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
- * Execute a OData complex property request.
+ * Execute a OData complex property request.
+ *
*
- *
*/
public interface EntityComplexPropertyProcessor extends ODataProcessor {
/**
@@ -47,10 +47,11 @@ public interface EntityComplexPropertyProcessor extends ODataProcessor {
* @param content the content of the request, containing the updated property data
* @param requestContentType the content type of the request body
* @param merge if <code>true</code>, properties not present in the data are left unchanged;
- * if <code>false</code>, they are reset
+ * if <code>false</code>, they are reset
* @param contentType the content type of the response
* @return a {@link ODataResponse} object
* @throws ODataException
*/
- ODataResponse updateEntityComplexProperty(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType, boolean merge, String contentType) throws ODataException;
+ ODataResponse updateEntityComplexProperty(PutMergePatchUriInfo uriInfo, InputStream content,
+ String requestContentType, boolean merge, String contentType) throws ODataException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
index bdbc249..4664c78 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -29,9 +29,9 @@ import org.apache.olingo.odata2.api.uri.info.GetEntityLinkUriInfo;
import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
- * Execute an OData entity link request.
+ * Execute an OData entity link request.
+ *
*
- *
*/
public interface EntityLinkProcessor extends ODataProcessor {
/**
@@ -61,7 +61,8 @@ public interface EntityLinkProcessor extends ODataProcessor {
* @return an {@link ODataResponse} object
* @throws ODataException
*/
- ODataResponse updateEntityLink(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType, String contentType) throws ODataException;
+ ODataResponse updateEntityLink(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType,
+ String contentType) throws ODataException;
/**
* Deletes the link to the target entity of a navigation property.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
index d81c924..bf7c618 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -28,9 +28,9 @@ import org.apache.olingo.odata2.api.uri.info.GetEntitySetLinksUriInfo;
import org.apache.olingo.odata2.api.uri.info.PostUriInfo;
/**
- * Execute a OData entity links request.
+ * Execute a OData entity links request.
+ *
*
- *
*/
public interface EntityLinksProcessor extends ODataProcessor {
/**
@@ -60,5 +60,6 @@ public interface EntityLinksProcessor extends ODataProcessor {
* @return an OData response object
* @throws ODataException
*/
- ODataResponse createEntityLink(PostUriInfo uriInfo, InputStream content, String requestContentType, String contentType) throws ODataException;
+ ODataResponse createEntityLink(PostUriInfo uriInfo, InputStream content, String requestContentType,
+ String contentType) throws ODataException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
index a71d3a9..960d55f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
* Execute an OData entity media request
- *
+ *
*/
public interface EntityMediaProcessor extends ODataProcessor {
@@ -51,7 +51,8 @@ public interface EntityMediaProcessor extends ODataProcessor {
* @return an {@link ODataResponse} object
* @throws ODataException
*/
- ODataResponse updateEntityMedia(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType, String contentType) throws ODataException;
+ ODataResponse updateEntityMedia(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType,
+ String contentType) throws ODataException;
/**
* Deletes the media resource of an entity.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
index fc36917..180988e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -29,9 +29,9 @@ import org.apache.olingo.odata2.api.uri.info.GetEntityUriInfo;
import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
- * Execute a OData entity request.
+ * Execute a OData entity request.
+ *
*
- *
*/
public interface EntityProcessor extends ODataProcessor {
@@ -57,16 +57,17 @@ public interface EntityProcessor extends ODataProcessor {
* @param content the content of the request, containing the updated entity data
* @param requestContentType the content type of the request body
* @param merge if <code>true</code>, properties not present in the data are left unchanged;
- * if <code>false</code>, they are reset
+ * if <code>false</code>, they are reset
* @param contentType the content type of the response
* @return an {@link ODataResponse} object
* @throws ODataException
*/
- ODataResponse updateEntity(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType, boolean merge, String contentType) throws ODataException;
+ ODataResponse updateEntity(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType,
+ boolean merge, String contentType) throws ODataException;
/**
* Deletes an entity.
- * @param uriInfo a {@link DeleteUriInfo} object with information from the URI parser
+ * @param uriInfo a {@link DeleteUriInfo} object with information from the URI parser
* @param contentType the content type of the response
* @return an {@link ODataResponse} object
* @throws ODataException
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
index bbe8366..167c2f5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -28,10 +28,10 @@ import org.apache.olingo.odata2.api.uri.info.GetEntitySetUriInfo;
import org.apache.olingo.odata2.api.uri.info.PostUriInfo;
/**
- * Execute a OData entity set request.
+ * Execute a OData entity set request.
+ *
+ *
*
- *
- *
*/
public interface EntitySetProcessor extends ODataProcessor {
@@ -62,5 +62,6 @@ public interface EntitySetProcessor extends ODataProcessor {
* @return an {@link ODataResponse} object
* @throws ODataException
*/
- ODataResponse createEntity(PostUriInfo uriInfo, InputStream content, String requestContentType, String contentType) throws ODataException;
+ ODataResponse createEntity(PostUriInfo uriInfo, InputStream content, String requestContentType, String contentType)
+ throws ODataException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
index 9c04db6..31f1268 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -27,9 +27,9 @@ import org.apache.olingo.odata2.api.uri.info.GetSimplePropertyUriInfo;
import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
- * Execute a OData entity simple property request.
+ * Execute a OData entity simple property request.
+ *
*
- *
*/
public interface EntitySimplePropertyProcessor extends ODataProcessor {
@@ -50,5 +50,6 @@ public interface EntitySimplePropertyProcessor extends ODataProcessor {
* @return a {@link ODataResponse} object
* @throws ODataException
*/
- ODataResponse updateEntitySimpleProperty(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType, String contentType) throws ODataException;
+ ODataResponse updateEntitySimpleProperty(PutMergePatchUriInfo uriInfo, InputStream content,
+ String requestContentType, String contentType) throws ODataException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
index 276a3cb..b2540e5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -28,9 +28,9 @@ import org.apache.olingo.odata2.api.uri.info.GetSimplePropertyUriInfo;
import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
- * Execute a OData entity simple property value request.
+ * Execute a OData entity simple property value request.
+ *
*
- *
*/
public interface EntitySimplePropertyValueProcessor extends ODataProcessor {
@@ -41,19 +41,21 @@ public interface EntitySimplePropertyValueProcessor extends ODataProcessor {
* @return an {@link ODataResponse} object
* @throws ODataException
*/
- ODataResponse readEntitySimplePropertyValue(GetSimplePropertyUriInfo uriInfo, String contentType) throws ODataException;
+ ODataResponse readEntitySimplePropertyValue(GetSimplePropertyUriInfo uriInfo, String contentType)
+ throws ODataException;
/**
* Updates a simple property of an entity with an unformatted value.
* @param uriInfo information about the request URI
* @param content the content of the request, containing the new value
* @param requestContentType the content type of the request body
- * (important for a binary property)
+ * (important for a binary property)
* @param contentType the content type of the response
* @return an {@link ODataResponse} object
* @throws ODataException
*/
- ODataResponse updateEntitySimplePropertyValue(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType, String contentType) throws ODataException;
+ ODataResponse updateEntitySimplePropertyValue(PutMergePatchUriInfo uriInfo, InputStream content,
+ String requestContentType, String contentType) throws ODataException;
/**
* Deletes the value of a simple property of an entity.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
index e18a5f1..871aa07 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,8 +24,8 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
import org.apache.olingo.odata2.api.uri.info.GetFunctionImportUriInfo;
/**
- * Execute an OData function import request.
- *
+ * Execute an OData function import request.
+ *
*/
public interface FunctionImportProcessor extends ODataProcessor {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
index 16f6f25..451dce0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.info.GetFunctionImportUriInfo;
/**
* Execute an OData function import value request.
- *
+ *
*/
public interface FunctionImportValueProcessor extends ODataProcessor {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
index 729d247..bb8f7a7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,14 +24,14 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
/**
- * Execute a OData metadata request.
+ * Execute a OData metadata request.
+ *
*
- *
*/
public interface MetadataProcessor extends ODataProcessor {
/**
- * @param contentType
+ * @param contentType
* @return a {@link ODataResponse} object
* @throws ODataException
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
index 51a8e07..3f1303c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,14 +24,14 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
/**
- * Execute a OData service document request.
+ * Execute a OData service document request.
+ *
*
- *
*/
public interface ServiceDocumentProcessor extends ODataProcessor {
/**
- * @param contentType
+ * @param contentType
* @return a {@link ODataResponse} object
* @throws ODataException
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java
index 3bb7284..70a69db 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
index 88c87cd..e385c62 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -38,18 +38,18 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.api.uri.UriParser;
/**
- * Provides access to core implementation classes for interfaces. This class is used
- * by internal abstract API implementations and it is not intended to be used by others.
+ * Provides access to core implementation classes for interfaces. This class is used
+ * by internal abstract API implementations and it is not intended to be used by others.
*
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public abstract class RuntimeDelegate {
private static final String IMPLEMENTATION = "org.apache.olingo.odata2.core.rt.RuntimeDelegateImpl";
/**
- * Create a runtime delegate instance from the core library. The core
+ * Create a runtime delegate instance from the core library. The core
* library (org.apache.olingo.odata2.core.jar) needs to be included into the classpath
* of the using application.
* @return an implementation object
@@ -62,7 +62,7 @@ public abstract class RuntimeDelegate {
/*
* We explicitly do not use the singleton pattern to keep the server state free
- * and avoid class loading issues also during hot deployment.
+ * and avoid class loading issues also during hot deployment.
*/
final Object object = clazz.newInstance();
delegate = (RuntimeDelegateInstance) object;
@@ -91,9 +91,11 @@ public abstract class RuntimeDelegate {
protected abstract EntityProviderInterface createEntityProvider();
- protected abstract ODataService createODataSingleProcessorService(EdmProvider provider, ODataSingleProcessor processor);
+ protected abstract ODataService createODataSingleProcessorService(EdmProvider provider,
+ ODataSingleProcessor processor);
- protected abstract EdmProvider createEdmProvider(InputStream metadataXml, boolean validate) throws EntityProviderException;
+ protected abstract EdmProvider createEdmProvider(InputStream metadataXml, boolean validate)
+ throws EntityProviderException;
protected abstract BatchResponsePartBuilder createBatchResponsePartBuilder();
@@ -151,7 +153,7 @@ public abstract class RuntimeDelegate {
}
/**
- * Creates and returns a http entity provider.
+ * Creates and returns a http entity provider.
* @return an implementation object
*/
public static EntityProviderInterface createEntityProvider() {
@@ -159,22 +161,24 @@ public abstract class RuntimeDelegate {
}
/**
- * Creates and returns a single processor service.
+ * Creates and returns a single processor service.
* @param provider a provider implementation for the metadata of the OData service
* @param processor a single data processor implementation of the OData service
* @return a implementation object
*/
- public static ODataService createODataSingleProcessorService(final EdmProvider provider, final ODataSingleProcessor processor) {
+ public static ODataService createODataSingleProcessorService(final EdmProvider provider,
+ final ODataSingleProcessor processor) {
return RuntimeDelegate.getInstance().createODataSingleProcessorService(provider, processor);
}
/**
- * Creates and returns an edm provider.
+ * Creates and returns an edm provider.
* @param metadataXml a metadata xml input stream (means the metadata document)
* @param validate true if semantic checks for metadata input stream shall be done
* @return an instance of EdmProvider
*/
- public static EdmProvider createEdmProvider(final InputStream metadataXml, final boolean validate) throws EntityProviderException {
+ public static EdmProvider createEdmProvider(final InputStream metadataXml, final boolean validate)
+ throws EntityProviderException {
return RuntimeDelegate.getInstance().createEdmProvider(metadataXml, validate);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/package-info.java
index 1186769..02d6db7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/package-info.java
@@ -1,25 +1,25 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
- * Runtime Support<p>
+ * Runtime Support<p>
*
- * Provides a mechanism for loading of implementation classes for interfaces.
+ * Provides a mechanism for loading of implementation classes for interfaces.
*/
package org.apache.olingo.odata2.api.rt;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
index 0414a37..3048fd6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.servicedocument;
/**
* An Accept element
* <p>Accept element indicates the types of representation accepted by the Collection
- *
+ *
*/
public interface Accept {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
index 755969e..84940d2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,8 +22,8 @@ import java.util.List;
/**
* A AtomInfo
- * <p>AtomInfo represents the structure of Service Document according RFC 5023 (for ATOM format)
- *
+ * <p>AtomInfo represents the structure of Service Document according RFC 5023 (for ATOM format)
+ *
*/
public interface AtomInfo {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
index 3e812b6..6efdbd4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,8 +23,9 @@ import java.util.List;
/**
* A Categories element
* <p>Categories element provides a list of the categories that can be applied to the members of a Collection
- * <p>If the "href" attribute is provided, the Categories element MUST be empty and MUST NOT have the "fixed" or "scheme" attributes
- *
+ * <p>If the "href" attribute is provided, the Categories element MUST be empty and MUST NOT have the "fixed" or
+ * "scheme" attributes
+ *
*/
public interface Categories {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
index 02da322..c444117 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.api.servicedocument;
/**
* A Category element
- * <p>Category element
- *
+ * <p>Category element
+ *
*/
public interface Category {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
index d2728eb..0c7c9a9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,7 +23,7 @@ import java.util.List;
/**
* A Collection
* <p>Collection element describes a Collection
- *
+ *
*/
public interface Collection {
/**
@@ -48,14 +48,14 @@ public interface Collection {
public CommonAttributes getCommonAttributes();
/**
- * Get the media range that specifies a type of representation
+ * Get the media range that specifies a type of representation
* that can be POSTed to a Collection
* @return a list of {@link Accept}
*/
public List<Accept> getAcceptElements();
/**
- *
+ *
*
* @return a list of {@link Categories}
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
index 9c0fb44..64ccb4f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,11 +22,11 @@ import java.util.List;
/**
* A CommonAttributes
- *
+ *
*/
public interface CommonAttributes {
/**
- * Get the a base URI
+ * Get the a base URI
*
* @return base as String
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
index 9aad659..26fb465 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,11 +21,11 @@ package org.apache.olingo.odata2.api.servicedocument;
/**
* A ExtensionAttribute
* <p>ExtensionAttribute is an attribute of an extension element
- *
+ *
*/
public interface ExtensionAttribute {
/**
- * Get the namespace
+ * Get the namespace
*
* @return namespace as String
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
index ea65cc5..fc2a4a0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,13 @@ import java.util.List;
/**
* A ExtensionElement
- * <p>ExtensionElement is an element that is defined in any namespace except
+ * <p>ExtensionElement is an element that is defined in any namespace except
* the namespace "app"
- *
+ *
*/
public interface ExtensionElement {
/**
- * Get the namespace
+ * Get the namespace
*
* @return namespace as String
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
index d8fc60e..20b7ed6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
@@ -1,29 +1,29 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.servicedocument;
/**
-* Fixed
-* <p>Fixed indicates whether the list of categories is a fixed or an open set
-* Fixed can either be yes or no
-*
-*/
+ * Fixed
+ * <p>Fixed indicates whether the list of categories is a fixed or an open set
+ * Fixed can either be yes or no
+ *
+ */
public enum Fixed {
YES, NO;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
index f5748ca..6f4c4b5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.ep.EntityProviderException;
/**
* A Service document
* <p>Service document lists all EntitySets
- *
+ *
*/
public interface ServiceDocument {
/**
@@ -37,7 +37,7 @@ public interface ServiceDocument {
public List<EdmEntitySetInfo> getEntitySetsInfo() throws EntityProviderException;
/**
- * Get additional information if the service document is in atom format
+ * Get additional information if the service document is in atom format
*
* @return {@link AtomInfo} or null
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
index 74015fe..aa0ba26 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
index 79c1068..001da46 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
index 03a51f8..bab441f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.servicedocument;
/**
* A Title element
* <p>Title element gives a human-readable title
- *
+ *
*/
public interface Title {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
index d422df5..67447cb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,8 +22,8 @@ import java.util.List;
/**
* A Workspace element
- * <p>Workspaces are server-defined groups of Collections.
- *
+ * <p>Workspaces are server-defined groups of Collections.
+ *
*/
public interface Workspace {
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
index a4ea7c3..aa99a50 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmProperty;
/**
* Expression tree node with information about selected properties and to be expanded links.
* @org.apache.olingo.odata2.DoNotImplement
- *
+ *
*/
public interface ExpandSelectTreeNode {
@@ -46,8 +46,8 @@ public interface ExpandSelectTreeNode {
/**
* Gets the links that have to be included or expanded.
* @return a Map from EdmNavigationProperty Name to its related {@link ExpandSelectTreeNode};
- * if that node is <code>null</code>, a deferred link has been requested,
- * otherwise the link must be expanded with information found in that node
+ * if that node is <code>null</code>, a deferred link has been requested,
+ * otherwise the link must be expanded with information found in that node
*/
public Map<String, ExpandSelectTreeNode> getLinks();
}
[33/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProv.java
index 0d29c1b..81ae907 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNamedImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProv.java
index 7d603e7..0e5f474 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -66,7 +66,8 @@ public class EdmNavigationPropertyImplProv extends EdmTypedImplProv implements E
@Override
public EdmAnnotations getAnnotations() throws EdmException {
- return new EdmAnnotationsImplProv(navigationProperty.getAnnotationAttributes(), navigationProperty.getAnnotationElements());
+ return new EdmAnnotationsImplProv(navigationProperty.getAnnotationAttributes(), navigationProperty
+ .getAnnotationElements());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java
index 32cf7c4..f92febc 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -34,7 +34,8 @@ public class EdmParameterImplProv extends EdmElementImplProv implements EdmParam
FunctionImportParameter parameter;
public EdmParameterImplProv(final EdmImplProv edm, final FunctionImportParameter parameter) throws EdmException {
- super(edm, parameter.getName(), parameter.getType().getFullQualifiedName(), parameter.getFacets(), parameter.getMapping());
+ super(edm, parameter.getName(), parameter.getType().getFullQualifiedName(), parameter.getFacets(), parameter
+ .getMapping());
this.parameter = parameter;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProv.java
index b2545be..8dcf075 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -30,7 +30,8 @@ public abstract class EdmPropertyImplProv extends EdmElementImplProv implements
private Property property;
- public EdmPropertyImplProv(final EdmImplProv edm, final FullQualifiedName propertyName, final Property property) throws EdmException {
+ public EdmPropertyImplProv(final EdmImplProv edm, final FullQualifiedName propertyName, final Property property)
+ throws EdmException {
super(edm, property.getName(), propertyName, property.getFacets(), property.getMapping());
this.property = property;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProv.java
index 756629f..a6a8286 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintImplProv.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProv.java
index dde3055..d4def53 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmReferentialConstraintRoleImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java
index bf67ecc..16262fc 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmSimplePropertyImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmSimplePropertyImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmSimplePropertyImplProv.java
index 47d4841..8c5da45 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmSimplePropertyImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmSimplePropertyImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java
index dc43476..08cb5af 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -49,7 +49,8 @@ public abstract class EdmStructuralTypeImplProv extends EdmNamedImplProv impleme
private Map<String, Property> properties;
private List<String> edmPropertyNames;
- public EdmStructuralTypeImplProv(final EdmImplProv edm, final ComplexType structuralType, final EdmTypeKind edmTypeKind, final String namespace) throws EdmException {
+ public EdmStructuralTypeImplProv(final EdmImplProv edm, final ComplexType structuralType,
+ final EdmTypeKind edmTypeKind, final String namespace) throws EdmException {
super(edm, structuralType.getName());
this.structuralType = structuralType;
this.namespace = namespace;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java
index 5459a49..9cdf138 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -36,7 +36,8 @@ public class EdmTypedImplProv extends EdmNamedImplProv implements EdmTyped {
private FullQualifiedName typeName;
private EdmMultiplicity multiplicity;
- public EdmTypedImplProv(final EdmImplProv edm, final String name, final FullQualifiedName typeName, final EdmMultiplicity multiplicity) throws EdmException {
+ public EdmTypedImplProv(final EdmImplProv edm, final String name, final FullQualifiedName typeName,
+ final EdmMultiplicity multiplicity) throws EdmException {
super(edm, name);
this.typeName = typeName;
this.multiplicity = multiplicity;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmxProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmxProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmxProvider.java
index 0894959..8cf58f1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmxProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmxProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
@@ -132,14 +132,17 @@ public class EdmxProvider extends EdmProvider {
}
@Override
- public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
+ public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
+ final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
for (Schema schema : dataServices.getSchemas()) {
for (EntityContainer container : schema.getEntityContainers()) {
if (container.getName().equals(entityContainer)) {
for (AssociationSet associationSet : container.getAssociationSets()) {
if (associationSet.getAssociation().equals(association)
- && ((associationSet.getEnd1().getEntitySet().equals(sourceEntitySetName) && associationSet.getEnd1().getRole().equals(sourceEntitySetRole))
- || (associationSet.getEnd2().getEntitySet().equals(sourceEntitySetName) && associationSet.getEnd2().getRole().equals(sourceEntitySetRole)))) {
+ && ((associationSet.getEnd1().getEntitySet().equals(sourceEntitySetName) && associationSet.getEnd1()
+ .getRole().equals(sourceEntitySetRole))
+ || (associationSet.getEnd2().getEntitySet().equals(sourceEntitySetName) && associationSet.getEnd2()
+ .getRole().equals(sourceEntitySetRole)))) {
return associationSet;
}
}
@@ -179,7 +182,8 @@ public class EdmxProvider extends EdmProvider {
try {
streamReader = factory.createXMLStreamReader(in);
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return streamReader;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
index 07b3c30..a8b24fb 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -83,8 +83,9 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
}
public AtomEntityProvider(final ODataFormat odataFormat) throws EntityProviderException {
- if(odataFormat != ODataFormat.ATOM && odataFormat != ODataFormat.XML) {
- throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT.addContent("Got unsupported ODataFormat '" + odataFormat + "'."));
+ if (odataFormat != ODataFormat.ATOM && odataFormat != ODataFormat.XML) {
+ throw new EntityProviderException(EntityProviderException.ILLEGAL_ARGUMENT
+ .addContent("Got unsupported ODataFormat '" + odataFormat + "'."));
}
}
@@ -92,15 +93,17 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
* <p>Serializes an error message according to the OData standard.</p>
* <p>In case an error occurs, it is logged.
* An exception is not thrown because this method is used in exception handling.</p>
- * @param status the {@link HttpStatusCodes} associated with this error
- * @param errorCode a String that serves as a substatus to the HTTP response code
- * @param message a human-readable message describing the error
- * @param locale the {@link Locale} that should be used to format the error message
- * @param innerError the inner error for this message. If it is null or an empty String no inner error tag is shown inside the response xml
- * @return an {@link ODataResponse} containing the serialized error message
+ * @param status the {@link HttpStatusCodes} associated with this error
+ * @param errorCode a String that serves as a substatus to the HTTP response code
+ * @param message a human-readable message describing the error
+ * @param locale the {@link Locale} that should be used to format the error message
+ * @param innerError the inner error for this message. If it is null or an empty String no inner error tag is shown
+ * inside the response xml
+ * @return an {@link ODataResponse} containing the serialized error message
*/
@Override
- public ODataResponse writeErrorDocument(final HttpStatusCodes status, final String errorCode, final String message, final Locale locale, final String innerError) {
+ public ODataResponse writeErrorDocument(final HttpStatusCodes status, final String errorCode, final String message,
+ final Locale locale, final String innerError) {
CircleStreamBuffer csb = new CircleStreamBuffer();
try {
@@ -148,12 +151,14 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
csb.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeEntry(final EdmEntitySet entitySet, final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeEntry(final EdmEntitySet entitySet, final Map<String, Object> data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
CircleStreamBuffer csb = new CircleStreamBuffer();
try {
@@ -177,7 +182,8 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
csb.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -187,7 +193,8 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
return writeSingleTypedElement(propertyInfo, value);
}
- private ODataResponse writeSingleTypedElement(final EntityPropertyInfo propertyInfo, final Object value) throws EntityProviderException {
+ private ODataResponse writeSingleTypedElement(final EntityPropertyInfo propertyInfo, final Object value)
+ throws EntityProviderException {
CircleStreamBuffer csb = new CircleStreamBuffer();
try {
@@ -207,12 +214,14 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
csb.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeFeed(final EdmEntitySet entitySet, final List<Map<String, Object>> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeFeed(final EdmEntitySet entitySet, final List<Map<String, Object>> data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
CircleStreamBuffer csb = new CircleStreamBuffer();
try {
@@ -234,12 +243,14 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (XMLStreamException e) {
csb.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeLink(final EdmEntitySet entitySet, final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeLink(final EdmEntitySet entitySet, final Map<String, Object> data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
CircleStreamBuffer csb = new CircleStreamBuffer();
try {
@@ -260,13 +271,15 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
csb.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeLinks(final EdmEntitySet entitySet, final List<Map<String, Object>> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeLinks(final EdmEntitySet entitySet, final List<Map<String, Object>> data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
CircleStreamBuffer csb = new CircleStreamBuffer();
try {
@@ -287,11 +300,13 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
csb.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
- private ODataResponse writeCollection(final EntityPropertyInfo propertyInfo, final List<?> data) throws EntityProviderException {
+ private ODataResponse writeCollection(final EntityPropertyInfo propertyInfo, final List<?> data)
+ throws EntityProviderException {
CircleStreamBuffer csb = new CircleStreamBuffer();
try {
@@ -310,12 +325,14 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
csb.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeFunctionImport(final EdmFunctionImport functionImport, final Object data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeFunctionImport(final EdmFunctionImport functionImport, final Object data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
try {
final EdmType type = functionImport.getReturnType().getType();
final boolean isCollection = functionImport.getReturnType().getMultiplicity() == EdmMultiplicity.MANY;
@@ -333,24 +350,28 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
return writeSingleTypedElement(info, data);
}
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataFeed readFeed(final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataFeed readFeed(final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
XmlEntityConsumer xec = new XmlEntityConsumer();
return xec.readFeed(entitySet, content, properties);
}
@Override
- public ODataEntry readEntry(final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataEntry readEntry(final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
XmlEntityConsumer xec = new XmlEntityConsumer();
return xec.readEntry(entitySet, content, properties);
}
@Override
- public Map<String, Object> readProperty(final EdmProperty edmProperty, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public Map<String, Object> readProperty(final EdmProperty edmProperty, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
XmlEntityConsumer xec = new XmlEntityConsumer();
return xec.readProperty(edmProperty, content, properties);
}
@@ -362,7 +383,8 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
}
@Override
- public List<String> readLinks(final EdmEntitySet entitySet, final InputStream content) throws EntityProviderException {
+ public List<String> readLinks(final EdmEntitySet entitySet, final InputStream content)
+ throws EntityProviderException {
XmlEntityConsumer xec = new XmlEntityConsumer();
return xec.readLinks(entitySet, content);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
index 409e92a..a32b916 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -57,7 +57,7 @@ import org.apache.olingo.odata2.core.ep.util.CircleStreamBuffer;
/**
* Provider for all basic (content type independent) entity provider methods.
*
- *
+ *
*/
public class BasicEntityProvider {
@@ -82,7 +82,8 @@ public class BasicEntityProvider {
buffer.flush();
return buffer.toByteArray();
} catch (IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -93,7 +94,8 @@ public class BasicEntityProvider {
* @throws EntityProviderException
*/
public String readText(final InputStream content) throws EntityProviderException {
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(content, Charset.forName(DEFAULT_CHARSET)));
+ BufferedReader bufferedReader =
+ new BufferedReader(new InputStreamReader(content, Charset.forName(DEFAULT_CHARSET)));
StringBuilder stringBuilder = new StringBuilder();
try {
String line = null;
@@ -102,7 +104,8 @@ public class BasicEntityProvider {
}
bufferedReader.close();
} catch (IOException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
return stringBuilder.toString();
}
@@ -111,16 +114,18 @@ public class BasicEntityProvider {
* Reads an unformatted value of an EDM property as binary or as content type <code>text/plain</code>.
* @param edmProperty the EDM property
* @param content the content input stream
- * @param typeMapping
+ * @param typeMapping
* @return the value as the proper system data type
* @throws EntityProviderException
*/
- public Object readPropertyValue(final EdmProperty edmProperty, final InputStream content, final Class<?> typeMapping) throws EntityProviderException {
+ public Object readPropertyValue(final EdmProperty edmProperty, final InputStream content, final Class<?> typeMapping)
+ throws EntityProviderException {
EdmSimpleType type;
try {
type = (EdmSimpleType) edmProperty.getType();
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
if (type == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance()) {
@@ -128,12 +133,14 @@ public class BasicEntityProvider {
} else {
try {
if (typeMapping == null) {
- return type.valueOfString(readText(content), EdmLiteralKind.DEFAULT, edmProperty.getFacets(), type.getDefaultType());
+ return type.valueOfString(readText(content), EdmLiteralKind.DEFAULT, edmProperty.getFacets(), type
+ .getDefaultType());
} else {
return type.valueOfString(readText(content), EdmLiteralKind.DEFAULT, edmProperty.getFacets(), typeMapping);
}
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
}
@@ -145,7 +152,8 @@ public class BasicEntityProvider {
* @return resulting {@link ODataResponse} with written content
* @throws EntityProviderException
*/
- public ODataResponse writePropertyValue(final EdmProperty edmProperty, final Object value) throws EntityProviderException {
+ public ODataResponse writePropertyValue(final EdmProperty edmProperty, final Object value)
+ throws EntityProviderException {
try {
final EdmSimpleType type = (EdmSimpleType) edmProperty.getType();
@@ -173,7 +181,8 @@ public class BasicEntityProvider {
}
} catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -190,11 +199,12 @@ public class BasicEntityProvider {
try {
stream = new ByteArrayInputStream(value.getBytes(DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
builder.entity(stream);
}
-
+
return builder.build();
}
@@ -218,13 +228,15 @@ public class BasicEntityProvider {
}
/**
- * Writes the metadata in XML format. Predefined namespaces is of type Map{@literal <}prefix,namespace{@literal >} and may be null or an empty Map.
+ * Writes the metadata in XML format. Predefined namespaces is of type Map{@literal <}prefix,namespace{@literal >} and
+ * may be null or an empty Map.
* @param schemas
* @param predefinedNamespaces
* @return resulting {@link ODataResponse} with written metadata content
* @throws EntityProviderException
*/
- public ODataResponse writeMetadata(final List<Schema> schemas, final Map<String, String> predefinedNamespaces) throws EntityProviderException {
+ public ODataResponse writeMetadata(final List<Schema> schemas, final Map<String, String> predefinedNamespaces)
+ throws EntityProviderException {
ODataResponseBuilder builder = ODataResponse.newBuilder();
String dataServiceVersion = ODataServiceVersion.V10;
if (schemas != null) {
@@ -238,11 +250,14 @@ public class BasicEntityProvider {
XMLStreamWriter xmlStreamWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(writer);
XmlMetadataProducer.writeMetadata(metadata, xmlStreamWriter, predefinedNamespaces);
} catch (UnsupportedEncodingException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
} catch (FactoryConfigurationError e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
builder.entity(csb.getInputStream());
builder.header(ODataHttpHeaders.DATASERVICEVERSION, dataServiceVersion);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java
index f72db16..3ae1958 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -39,15 +39,19 @@ import org.apache.olingo.odata2.api.servicedocument.ServiceDocument;
/**
* Interface for all none basic (content type <b>dependent</b>) provider methods.
*
- *
+ *
*/
public interface ContentTypeBasedEntityProvider {
- ODataFeed readFeed(EdmEntitySet entitySet, InputStream content, EntityProviderReadProperties properties) throws EntityProviderException;
+ ODataFeed readFeed(EdmEntitySet entitySet, InputStream content, EntityProviderReadProperties properties)
+ throws EntityProviderException;
- ODataEntry readEntry(EdmEntitySet entitySet, InputStream content, EntityProviderReadProperties properties) throws EntityProviderException;
+ ODataEntry readEntry(EdmEntitySet entitySet, InputStream content, EntityProviderReadProperties properties)
+ throws EntityProviderException;
- Map<String, Object> readProperty(EdmProperty edmProperty, InputStream content, EntityProviderReadProperties properties) throws EntityProviderException;
+ Map<String, Object>
+ readProperty(EdmProperty edmProperty, InputStream content, EntityProviderReadProperties properties)
+ throws EntityProviderException;
String readLink(EdmEntitySet entitySet, InputStream content) throws EntityProviderException;
@@ -55,19 +59,25 @@ public interface ContentTypeBasedEntityProvider {
ODataResponse writeServiceDocument(Edm edm, String serviceRoot) throws EntityProviderException;
- ODataResponse writeFeed(EdmEntitySet entitySet, List<Map<String, Object>> data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeFeed(EdmEntitySet entitySet, List<Map<String, Object>> data,
+ EntityProviderWriteProperties properties) throws EntityProviderException;
- ODataResponse writeEntry(EdmEntitySet entitySet, Map<String, Object> data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeEntry(EdmEntitySet entitySet, Map<String, Object> data, EntityProviderWriteProperties properties)
+ throws EntityProviderException;
ODataResponse writeProperty(EdmProperty edmProperty, Object value) throws EntityProviderException;
- ODataResponse writeLink(EdmEntitySet entitySet, Map<String, Object> data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeLink(EdmEntitySet entitySet, Map<String, Object> data, EntityProviderWriteProperties properties)
+ throws EntityProviderException;
- ODataResponse writeLinks(EdmEntitySet entitySet, List<Map<String, Object>> data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeLinks(EdmEntitySet entitySet, List<Map<String, Object>> data,
+ EntityProviderWriteProperties properties) throws EntityProviderException;
- ODataResponse writeFunctionImport(EdmFunctionImport functionImport, Object data, EntityProviderWriteProperties properties) throws EntityProviderException;
+ ODataResponse writeFunctionImport(EdmFunctionImport functionImport, Object data,
+ EntityProviderWriteProperties properties) throws EntityProviderException;
- ODataResponse writeErrorDocument(HttpStatusCodes status, String errorCode, String message, Locale locale, String innerError);
+ ODataResponse writeErrorDocument(HttpStatusCodes status, String errorCode, String message, Locale locale,
+ String innerError);
ServiceDocument readServiceDocument(InputStream serviceDocument) throws EntityProviderException;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
index 7abdf5d..1937c7f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -71,16 +71,17 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
* <p>Serializes an error message according to the OData standard.</p>
* <p>In case an error occurs, it is logged.
* An exception is not thrown because this method is used in exception handling.</p>
- * @param status the {@link HttpStatusCodes status code} associated with this error
- * @param errorCode a String that serves as a substatus to the HTTP response code
- * @param message a human-readable message describing the error
- * @param locale the {@link Locale} that should be used to format the error message
- * @param innerError the inner error for this message; if it is null or an empty String
- * no inner error tag is shown inside the response structure
- * @return an {@link ODataResponse} containing the serialized error message
+ * @param status the {@link HttpStatusCodes status code} associated with this error
+ * @param errorCode a String that serves as a substatus to the HTTP response code
+ * @param message a human-readable message describing the error
+ * @param locale the {@link Locale} that should be used to format the error message
+ * @param innerError the inner error for this message; if it is null or an empty String
+ * no inner error tag is shown inside the response structure
+ * @return an {@link ODataResponse} containing the serialized error message
*/
@Override
- public ODataResponse writeErrorDocument(final HttpStatusCodes status, final String errorCode, final String message, final Locale locale, final String innerError) {
+ public ODataResponse writeErrorDocument(final HttpStatusCodes status, final String errorCode, final String message,
+ final Locale locale, final String innerError) {
CircleStreamBuffer buffer = new CircleStreamBuffer();
try {
@@ -126,7 +127,8 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
}
@Override
- public ODataResponse writeEntry(final EdmEntitySet entitySet, final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeEntry(final EdmEntitySet entitySet, final Map<String, Object> data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
final EntityInfoAggregator entityInfo = EntityInfoAggregator.create(entitySet, properties.getExpandSelectTree());
CircleStreamBuffer buffer = new CircleStreamBuffer();
@@ -146,7 +148,8 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
buffer.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@@ -155,7 +158,8 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
return writeSingleTypedElement(EntityInfoAggregator.create(edmProperty), value);
}
- private ODataResponse writeSingleTypedElement(final EntityPropertyInfo propertyInfo, final Object value) throws EntityProviderException {
+ private ODataResponse writeSingleTypedElement(final EntityPropertyInfo propertyInfo, final Object value)
+ throws EntityProviderException {
CircleStreamBuffer buffer = new CircleStreamBuffer();
try {
@@ -173,12 +177,14 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
buffer.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeFeed(final EdmEntitySet entitySet, final List<Map<String, Object>> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeFeed(final EdmEntitySet entitySet, final List<Map<String, Object>> data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
final EntityInfoAggregator entityInfo = EntityInfoAggregator.create(entitySet, properties.getExpandSelectTree());
CircleStreamBuffer buffer = new CircleStreamBuffer();
@@ -194,12 +200,14 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
buffer.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeLink(final EdmEntitySet entitySet, final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeLink(final EdmEntitySet entitySet, final Map<String, Object> data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
final EntityInfoAggregator entityInfo = EntityInfoAggregator.create(entitySet, properties.getExpandSelectTree());
CircleStreamBuffer buffer = new CircleStreamBuffer();
@@ -217,12 +225,14 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
buffer.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeLinks(final EdmEntitySet entitySet, final List<Map<String, Object>> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeLinks(final EdmEntitySet entitySet, final List<Map<String, Object>> data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
final EntityInfoAggregator entityInfo = EntityInfoAggregator.create(entitySet, properties.getExpandSelectTree());
CircleStreamBuffer buffer = new CircleStreamBuffer();
@@ -242,11 +252,13 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
buffer.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
- private ODataResponse writeCollection(final EntityPropertyInfo propertyInfo, final List<?> data) throws EntityProviderException {
+ private ODataResponse writeCollection(final EntityPropertyInfo propertyInfo, final List<?> data)
+ throws EntityProviderException {
CircleStreamBuffer buffer = new CircleStreamBuffer();
try {
@@ -261,12 +273,14 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
throw e;
} catch (Exception e) {
buffer.close();
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataResponse writeFunctionImport(final EdmFunctionImport functionImport, final Object data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeFunctionImport(final EdmFunctionImport functionImport, final Object data,
+ final EntityProviderWriteProperties properties) throws EntityProviderException {
try {
if (functionImport.getReturnType().getType().getKind() == EdmTypeKind.ENTITY) {
@SuppressWarnings("unchecked")
@@ -281,22 +295,26 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
return writeSingleTypedElement(info, data);
}
} catch (final EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()), e);
}
}
@Override
- public ODataFeed readFeed(final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataFeed readFeed(final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
return new JsonEntityConsumer().readFeed(entitySet, content, properties);
}
@Override
- public ODataEntry readEntry(final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataEntry readEntry(final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
return new JsonEntityConsumer().readEntry(entitySet, content, properties);
}
@Override
- public Map<String, Object> readProperty(final EdmProperty edmProperty, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public Map<String, Object> readProperty(final EdmProperty edmProperty, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
return new JsonEntityConsumer().readProperty(edmProperty, content, properties);
}
@@ -306,7 +324,8 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
}
@Override
- public List<String> readLinks(final EdmEntitySet entitySet, final InputStream content) throws EntityProviderException {
+ public List<String> readLinks(final EdmEntitySet entitySet, final InputStream content)
+ throws EntityProviderException {
return new JsonEntityConsumer().readLinks(entitySet, content);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
index 58e47e5..9793115 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -75,7 +75,8 @@ public class ProviderFacadeImpl implements EntityProviderInterface {
case JSON:
return new JsonEntityProvider();
default:
- throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_CONTENT_TYPE.addContent(contentType));
+ throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_CONTENT_TYPE
+ .addContent(contentType));
}
} catch (final ODataNotAcceptableException e) {
throw new EntityProviderException(EntityProviderException.COMMON, e);
@@ -85,19 +86,22 @@ public class ProviderFacadeImpl implements EntityProviderInterface {
@Override
public ODataResponse writeErrorDocument(final ODataErrorContext context) {
try {
- return create(context.getContentType()).writeErrorDocument(context.getHttpStatus(), context.getErrorCode(), context.getMessage(), context.getLocale(), context.getInnerError());
+ return create(context.getContentType()).writeErrorDocument(context.getHttpStatus(), context.getErrorCode(),
+ context.getMessage(), context.getLocale(), context.getInnerError());
} catch (EntityProviderException e) {
throw new ODataRuntimeException(e);
}
}
@Override
- public ODataResponse writeServiceDocument(final String contentType, final Edm edm, final String serviceRoot) throws EntityProviderException {
+ public ODataResponse writeServiceDocument(final String contentType, final Edm edm, final String serviceRoot)
+ throws EntityProviderException {
return create(contentType).writeServiceDocument(edm, serviceRoot);
}
@Override
- public ODataResponse writePropertyValue(final EdmProperty edmProperty, final Object value) throws EntityProviderException {
+ public ODataResponse writePropertyValue(final EdmProperty edmProperty, final Object value)
+ throws EntityProviderException {
return create().writePropertyValue(edmProperty, value);
}
@@ -112,62 +116,76 @@ public class ProviderFacadeImpl implements EntityProviderInterface {
}
@Override
- public ODataResponse writeFeed(final String contentType, final EdmEntitySet entitySet, final List<Map<String, Object>> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeFeed(final String contentType, final EdmEntitySet entitySet,
+ final List<Map<String, Object>> data, final EntityProviderWriteProperties properties)
+ throws EntityProviderException {
return create(contentType).writeFeed(entitySet, data, properties);
}
@Override
- public ODataResponse writeEntry(final String contentType, final EdmEntitySet entitySet, final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeEntry(final String contentType, final EdmEntitySet entitySet,
+ final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
return create(contentType).writeEntry(entitySet, data, properties);
}
@Override
- public ODataResponse writeProperty(final String contentType, final EdmProperty edmProperty, final Object value) throws EntityProviderException {
+ public ODataResponse writeProperty(final String contentType, final EdmProperty edmProperty, final Object value)
+ throws EntityProviderException {
return create(contentType).writeProperty(edmProperty, value);
}
@Override
- public ODataResponse writeLink(final String contentType, final EdmEntitySet entitySet, final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeLink(final String contentType, final EdmEntitySet entitySet,
+ final Map<String, Object> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
return create(contentType).writeLink(entitySet, data, properties);
}
@Override
- public ODataResponse writeLinks(final String contentType, final EdmEntitySet entitySet, final List<Map<String, Object>> data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeLinks(final String contentType, final EdmEntitySet entitySet,
+ final List<Map<String, Object>> data, final EntityProviderWriteProperties properties)
+ throws EntityProviderException {
return create(contentType).writeLinks(entitySet, data, properties);
}
@Override
- public ODataResponse writeFunctionImport(final String contentType, final EdmFunctionImport functionImport, final Object data, final EntityProviderWriteProperties properties) throws EntityProviderException {
+ public ODataResponse writeFunctionImport(final String contentType, final EdmFunctionImport functionImport,
+ final Object data, final EntityProviderWriteProperties properties) throws EntityProviderException {
return create(contentType).writeFunctionImport(functionImport, data, properties);
}
@Override
- public ODataFeed readFeed(final String contentType, final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataFeed readFeed(final String contentType, final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
return create(contentType).readFeed(entitySet, content, properties);
}
@Override
- public ODataEntry readEntry(final String contentType, final EdmEntitySet entitySet, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public ODataEntry readEntry(final String contentType, final EdmEntitySet entitySet, final InputStream content,
+ final EntityProviderReadProperties properties) throws EntityProviderException {
return create(contentType).readEntry(entitySet, content, properties);
}
@Override
- public Map<String, Object> readProperty(final String contentType, final EdmProperty edmProperty, final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
+ public Map<String, Object> readProperty(final String contentType, final EdmProperty edmProperty,
+ final InputStream content, final EntityProviderReadProperties properties) throws EntityProviderException {
return create(contentType).readProperty(edmProperty, content, properties);
}
@Override
- public Object readPropertyValue(final EdmProperty edmProperty, final InputStream content, final Class<?> typeMapping) throws EntityProviderException {
+ public Object readPropertyValue(final EdmProperty edmProperty, final InputStream content, final Class<?> typeMapping)
+ throws EntityProviderException {
return create().readPropertyValue(edmProperty, content, typeMapping);
}
@Override
- public List<String> readLinks(final String contentType, final EdmEntitySet entitySet, final InputStream content) throws EntityProviderException {
+ public List<String> readLinks(final String contentType, final EdmEntitySet entitySet, final InputStream content)
+ throws EntityProviderException {
return create(contentType).readLinks(entitySet, content);
}
@Override
- public String readLink(final String contentType, final EdmEntitySet entitySet, final InputStream content) throws EntityProviderException {
+ public String readLink(final String contentType, final EdmEntitySet entitySet, final InputStream content)
+ throws EntityProviderException {
return create(contentType).readLink(entitySet, content);
}
@@ -177,7 +195,8 @@ public class ProviderFacadeImpl implements EntityProviderInterface {
}
@Override
- public ODataResponse writeMetadata(final List<Schema> schemas, final Map<String, String> predefinedNamespaces) throws EntityProviderException {
+ public ODataResponse writeMetadata(final List<Schema> schemas, final Map<String, String> predefinedNamespaces)
+ throws EntityProviderException {
return create().writeMetadata(schemas, predefinedNamespaces);
}
@@ -188,12 +207,14 @@ public class ProviderFacadeImpl implements EntityProviderInterface {
}
@Override
- public ServiceDocument readServiceDocument(final InputStream serviceDocument, final String contentType) throws EntityProviderException {
+ public ServiceDocument readServiceDocument(final InputStream serviceDocument, final String contentType)
+ throws EntityProviderException {
return create(contentType).readServiceDocument(serviceDocument);
}
@Override
- public List<BatchRequestPart> parseBatchRequest(final String contentType, final InputStream content, final EntityProviderBatchProperties properties) throws BatchException {
+ public List<BatchRequestPart> parseBatchRequest(final String contentType, final InputStream content,
+ final EntityProviderBatchProperties properties) throws BatchException {
List<BatchRequestPart> batchParts = new BatchRequestParser(contentType, properties).parse(content);
return batchParts;
}
@@ -211,7 +232,8 @@ public class ProviderFacadeImpl implements EntityProviderInterface {
}
@Override
- public List<BatchSingleResponse> parseBatchResponse(final String contentType, final InputStream content) throws BatchException {
+ public List<BatchSingleResponse> parseBatchResponse(final String contentType, final InputStream content)
+ throws BatchException {
List<BatchSingleResponse> responses = new BatchResponseParser(contentType).parse(content);
return responses;
}
[12/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
index 018dfc2..7fdab60 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -39,369 +39,390 @@ import org.apache.olingo.odata2.core.edm.Uint7;
import org.junit.Test;
/**
- *
+ *
* Differences to ABAP Parser
- * - for $orderBy it the sortorder (asc/desc) not case insensitive anymore, so ASC/DESC is not allowed
+ * - for $orderBy it the sortorder (asc/desc) not case insensitive anymore, so ASC/DESC is not allowed
*
*/
public class TestAbapCompatibility extends TestBase {
@Test
- public void abapTestParameterPromotion() //copy of ABAP method test_parameter_promotion
+ public void abapTestParameterPromotion() // copy of ABAP method test_parameter_promotion
{
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>binary( ).
- //lcl_helper=>veri_type( iv_expression = `X'1234567890ABCDEF'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>binary( ).
+ // lcl_helper=>veri_type( iv_expression = `X'1234567890ABCDEF'` io_expected_type = lo_simple_type ).
GetPTF("X'1234567890ABCDEF'").aEdmType(EdmBinary.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- //lcl_helper=>veri_type( iv_expression = `true` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `true` io_expected_type = lo_simple_type ).
GetPTF("true").aEdmType(EdmBoolean.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
- //lcl_helper=>veri_type( iv_expression = `1` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
+ // lcl_helper=>veri_type( iv_expression = `1` io_expected_type = lo_simple_type ).
GetPTF("1").aEdmType(Bit.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
- //lcl_helper=>veri_type( iv_expression = `0` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
+ // lcl_helper=>veri_type( iv_expression = `0` io_expected_type = lo_simple_type ).
GetPTF("0").aEdmType(Bit.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'UInt7' ).
- ///lcl_helper=>veri_type( iv_expression = `123` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'UInt7' ).
+ // /lcl_helper=>veri_type( iv_expression = `123` io_expected_type = lo_simple_type ).
GetPTF("123").aEdmType(Uint7.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>byte( ).
- //lcl_helper=>veri_type( iv_expression = `130` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>byte( ).
+ // lcl_helper=>veri_type( iv_expression = `130` io_expected_type = lo_simple_type ).
GetPTF("130").aEdmType(EdmByte.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetime( ).
- //lcl_helper=>veri_type( iv_expression = `datetime'2011-07-31T23:30:59'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetime( ).
+ // lcl_helper=>veri_type( iv_expression = `datetime'2011-07-31T23:30:59'` io_expected_type = lo_simple_type ).
GetPTF("datetime'2011-07-31T23:30:59'").aEdmType(EdmDateTime.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetimeoffset( ).
- //lcl_helper=>veri_type( iv_expression = `datetimeoffset'2002-10-10T12:00:00-05:00'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetimeoffset( ).
+ // lcl_helper=>veri_type( iv_expression = `datetimeoffset'2002-10-10T12:00:00-05:00'` io_expected_type =
+ // lo_simple_type ).
GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aEdmType(EdmDateTimeOffset.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>decimal( ).
- //lcl_helper=>veri_type( iv_expression = `1.1M` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>decimal( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1M` io_expected_type = lo_simple_type ).
GetPTF("1.1M").aEdmType(EdmDecimal.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- //lcl_helper=>veri_type( iv_expression = `1.1D` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1D` io_expected_type = lo_simple_type ).
GetPTF("1.1D").aEdmType(EdmDouble.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- //lcl_helper=>veri_type( iv_expression = `1.1E+02D` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1E+02D` io_expected_type = lo_simple_type ).
GetPTF("1.1E+02D").aEdmType(EdmDouble.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>guid( ).
- //lcl_helper=>veri_type( iv_expression = `guid'12345678-1234-1234-1234-123456789012'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>guid( ).
+ // lcl_helper=>veri_type( iv_expression = `guid'12345678-1234-1234-1234-123456789012'` io_expected_type =
+ // lo_simple_type ).
GetPTF("guid'12345678-1234-1234-1234-123456789012'").aEdmType(EdmGuid.getInstance());
- //-->FLOAT not available on OData library for JAVA
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>float( ).
- //lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
- //GetPTF("1.1F").aEdmType(EdmFloat.getInstance());
+ // -->FLOAT not available on OData library for JAVA
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>float( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
+ // GetPTF("1.1F").aEdmType(EdmFloat.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int16( ).
- //lcl_helper=>veri_type( iv_expression = `12345` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int16( ).
+ // lcl_helper=>veri_type( iv_expression = `12345` io_expected_type = lo_simple_type ).
GetPTF("12345").aEdmType(EdmInt16.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `1234512345` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `1234512345` io_expected_type = lo_simple_type ).
GetPTF("1234512345").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int64( ).
- //lcl_helper=>veri_type( iv_expression = `12345L` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int64( ).
+ // lcl_helper=>veri_type( iv_expression = `12345L` io_expected_type = lo_simple_type ).
GetPTF("12345L").aEdmType(EdmInt64.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>sbyte( ).
- //lcl_helper=>veri_type( iv_expression = `-12` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>sbyte( ).
+ // lcl_helper=>veri_type( iv_expression = `-12` io_expected_type = lo_simple_type ).
GetPTF("-12").aEdmType(EdmSByte.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>single( ).
- //lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>single( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
GetPTF("1.1F").aEdmType(EdmSingle.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>string( ).
- //lcl_helper=>veri_type( iv_expression = `'TEST'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>string( ).
+ // lcl_helper=>veri_type( iv_expression = `'TEST'` io_expected_type = lo_simple_type ).
GetPTF("'TEST'").aEdmType(EdmString.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
- //lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
GetPTF("time'PT19H02M01S'").aEdmType(EdmTime.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
- //lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01DT23H14M33S'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01DT23H14M33S'` io_expected_type = lo_simple_type ).
GetPTF("time'PT23H14M33S'").aEdmType(EdmTime.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- //lcl_helper=>veri_type( iv_expression = `1.1D add 1` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1D add 1` io_expected_type = lo_simple_type ).
GetPTF("1.1D add 1").aEdmType(EdmDouble.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- //lcl_helper=>veri_type( iv_expression = `1 add 1.1D` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1 add 1.1D` io_expected_type = lo_simple_type ).
GetPTF("1 add 1.1D").aEdmType(EdmDouble.getInstance());
- //"lcl_helper=>veri_type( iv_expression = `null` io_expected_type = /IWCOR/cl_DS_edm_simple_type=>null( ) ).
+ // "lcl_helper=>veri_type( iv_expression = `null` io_expected_type = /IWCOR/cl_DS_edm_simple_type=>null( ) ).
GetPTF("null").aEdmType(EdmNull.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- //lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' eq time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' eq time'P1998Y02M01D'` io_expected_type =
+ // lo_simple_type ).
GetPTF("time'PT19H02M01S' eq time'PT19H02M01S'").aEdmType(EdmBoolean.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- //lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' lt time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' lt time'P1998Y02M01D'` io_expected_type =
+ // lo_simple_type ).
GetPTF("time'PT19H02M01S' lt time'PT19H02M01S'").aEdmType(EdmBoolean.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
// lcl_helper=>veri_type( iv_expression = `hour(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type ).
GetPTF("hour(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `minute(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type
+ // ).
GetPTF("minute(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `second(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type
+ // ).
GetPTF("second(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `hour(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `hour(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
GetPTF("hour(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `minute(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
GetPTF("minute(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `second(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
GetPTF("second(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `hour(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `hour(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
+ // lo_simple_type ).
GetPTF("hour(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `minute(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
+ // lo_simple_type ).
GetPTF("minute(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `second(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
+ // lo_simple_type ).
GetPTF("second(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
}
@Test
- public void abapTestOrderByParser() //copy of ABAP method test_orderby_parser
+ public void abapTestOrderByParser() // copy of ABAP method test_orderby_parser
{
- //lcl_helper=>veri_orderby( iv_expression = 'a' iv_expected = '{oc({o(a asc)})}' ). "default return lower asc
+ // lcl_helper=>veri_orderby( iv_expression = 'a' iv_expected = '{oc({o(a asc)})}' ). "default return lower asc
GetPTO("a").aSerialized("{oc({o(a, asc)})}");
- //lcl_helper=>veri_orderby( iv_expression = 'a,b' iv_expected = '{oc({o(a asc)},{o(b asc)})}' ).
+ // lcl_helper=>veri_orderby( iv_expression = 'a,b' iv_expected = '{oc({o(a asc)},{o(b asc)})}' ).
GetPTO("a,b").aSerialized("{oc({o(a, asc)},{o(b, asc)})}");
- //lcl_helper=>veri_orderby( iv_expression = 'a,b,c' iv_expected = '{oc({o(a asc)},{o(b asc)},{o(c asc)})}' ).
+ // lcl_helper=>veri_orderby( iv_expression = 'a,b,c' iv_expected = '{oc({o(a asc)},{o(b asc)},{o(c asc)})}' ).
GetPTO("a,b,c").aSerialized("{oc({o(a, asc)},{o(b, asc)},{o(c, asc)})}");
- //see comment of class
- ////lcl_helper=>veri_orderby( iv_expression = 'a ASC' iv_expected = '{oc({o(a asc)})}' ).
- //GetPTO("a ASC").aSerialized("{oc({o(a, asc)})}");
+ // see comment of class
+ // //lcl_helper=>veri_orderby( iv_expression = 'a ASC' iv_expected = '{oc({o(a asc)})}' ).
+ // GetPTO("a ASC").aSerialized("{oc({o(a, asc)})}");
- //lcl_helper=>veri_orderby( iv_expression = 'a asc' iv_expected = '{oc({o(a asc)})}' ).
+ // lcl_helper=>veri_orderby( iv_expression = 'a asc' iv_expected = '{oc({o(a asc)})}' ).
GetPTO("a asc").aSerialized("{oc({o(a, asc)})}");
- //lcl_helper=>veri_orderby( iv_expression = 'a DESC' iv_expected = '{oc({o(a desc)})}' ).
- //-->GetPTO("a DESC").aSerialized("{oc({o(a, desc)})}");
+ // lcl_helper=>veri_orderby( iv_expression = 'a DESC' iv_expected = '{oc({o(a desc)})}' ).
+ // -->GetPTO("a DESC").aSerialized("{oc({o(a, desc)})}");
- //see comment of class (case sensitive)
- ////lcl_helper=>veri_orderby( iv_expression = 'a DESC,b DESC'
- //// iv_expected = '{oc({o(a desc)},{o(b desc)})}' ).
- //GetPTO("a DESC,b DESC").aSerialized("{oc({o(a, desc)},{o(b, desc)})}");
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = 'a DESC,b DESC'
+ // // iv_expected = '{oc({o(a desc)},{o(b desc)})}' ).
+ // GetPTO("a DESC,b DESC").aSerialized("{oc({o(a, desc)},{o(b, desc)})}");
- //see comment of class (case sensitive)
- ////lcl_helper=>veri_orderby( iv_expression = 'a ASC, b DESC'
- //// iv_expected = '{oc({o(a asc)},{o(b desc)})}' ).
- //GetPTO("a ASC, b DESC").aSerialized("{oc({o(a, asc)},{o(b, desc)})}");
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = 'a ASC, b DESC'
+ // // iv_expected = '{oc({o(a asc)},{o(b desc)})}' ).
+ // GetPTO("a ASC, b DESC").aSerialized("{oc({o(a, asc)},{o(b, desc)})}");
- //see comment of class (case sensitive)
- ////lcl_helper=>veri_orderby( iv_expression = '2 mul 6 eq 12 DESC'
- //// iv_expected = '{oc({o({{2 mul 6} eq 12} desc)})}' ).
- //GetPTO("2 mul 6 eq 12 DESC").aSerialized("{oc({o({{2 mul 6} eq 12}, desc)})}");
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = '2 mul 6 eq 12 DESC'
+ // // iv_expected = '{oc({o({{2 mul 6} eq 12} desc)})}' ).
+ // GetPTO("2 mul 6 eq 12 DESC").aSerialized("{oc({o({{2 mul 6} eq 12}, desc)})}");
- //lcl_helper=>veri_orderby( iv_expression = `concat( 'Start_' , starttime ) desc`
- // iv_expected = `{oc({o({concat(Start_,starttime)} desc)})}` ).
+ // lcl_helper=>veri_orderby( iv_expression = `concat( 'Start_' , starttime ) desc`
+ // iv_expected = `{oc({o({concat(Start_,starttime)} desc)})}` ).
GetPTO("concat( 'Start_' , starttime ) desc").aSerialized("{oc({o({concat('Start_',starttime)}, desc)})}");
}
@Test
- public void abapTestFilterParser() { //copy of ABAP method test_filter_parser
- //lcl_helper=>veri_expression( iv_expression = 'W/X' iv_expected = '{W/X}' ).
+ public void abapTestFilterParser() { // copy of ABAP method test_filter_parser
+ // lcl_helper=>veri_expression( iv_expression = 'W/X' iv_expected = '{W/X}' ).
GetPTF("W/X").aSerialized("{W/X}");
- //lcl_helper=>veri_expression( iv_expression = 'W/X eq TEST' iv_expected = '{{W/X} eq TEST}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'W/X eq TEST' iv_expected = '{{W/X} eq TEST}' ).
GetPTF("W/X eq TEST").aSerialized("{{W/X} eq TEST}");
- //lcl_helper=>veri_expression( iv_expression = 'ABC eq W/X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'ABC eq W/X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
GetPTF("ABC eq W/X eq TEST").aSerialized("{{ABC eq {W/X}} eq TEST}");
- //lcl_helper=>veri_expression( iv_expression = 'ABC eq W / X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'ABC eq W / X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
GetPTF("ABC eq W / X eq TEST").aSerialized("{{ABC eq {W/X}} eq TEST}");
- //lcl_helper=>veri_expression( iv_expression = 'W/X/Y/Z' iv_expected = '{{{W/X}/Y}/Z}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'W/X/Y/Z' iv_expected = '{{{W/X}/Y}/Z}' ).
GetPTF("W/X/Y/Z").aSerialized("{{{W/X}/Y}/Z}");
- //lcl_helper=>veri_expression( iv_expression = 'X' iv_expected = 'X' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X' iv_expected = 'X' ).
GetPTF("X").aSerialized("X");
- //lcl_helper=>veri_expression( iv_expression = '-X' iv_expected = '{- X}' ).
+ // lcl_helper=>veri_expression( iv_expression = '-X' iv_expected = '{- X}' ).
GetPTF("-X").aSerialized("{- X}");
- //lcl_helper=>veri_expression( iv_expression = 'not X' iv_expected = '{not X}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'not X' iv_expected = '{not X}' ).
GetPTF("not X").aSerialized("{not X}");
- //lcl_helper=>veri_expression( iv_expression = 'X mul Y' iv_expected = '{X mul Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X mul Y' iv_expected = '{X mul Y}' ).
GetPTF("X mul Y").aSerialized("{X mul Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X div Y' iv_expected = '{X div Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X div Y' iv_expected = '{X div Y}' ).
GetPTF("X div Y").aSerialized("{X div Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X mod Y' iv_expected = '{X mod Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X mod Y' iv_expected = '{X mod Y}' ).
GetPTF("X mod Y").aSerialized("{X mod Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X add Y' iv_expected = '{X add Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X add Y' iv_expected = '{X add Y}' ).
GetPTF("X add Y").aSerialized("{X add Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X sub Y' iv_expected = '{X sub Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X sub Y' iv_expected = '{X sub Y}' ).
GetPTF("X sub Y").aSerialized("{X sub Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X lt Y' iv_expected = '{X lt Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X lt Y' iv_expected = '{X lt Y}' ).
GetPTF("X lt Y").aSerialized("{X lt Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X gt Y' iv_expected = '{X gt Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X gt Y' iv_expected = '{X gt Y}' ).
GetPTF("X gt Y").aSerialized("{X gt Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X le Y' iv_expected = '{X le Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X le Y' iv_expected = '{X le Y}' ).
GetPTF("X le Y").aSerialized("{X le Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X ge Y' iv_expected = '{X ge Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X ge Y' iv_expected = '{X ge Y}' ).
GetPTF("X ge Y").aSerialized("{X ge Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X eq Y' iv_expected = '{X eq Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X eq Y' iv_expected = '{X eq Y}' ).
GetPTF("X eq Y").aSerialized("{X eq Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X ne Y' iv_expected = '{X ne Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X ne Y' iv_expected = '{X ne Y}' ).
GetPTF("X ne Y").aSerialized("{X ne Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X and Y' iv_expected = '{X and Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X and Y' iv_expected = '{X and Y}' ).
GetPTF("X and Y").aSerialized("{X and Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X or Y' iv_expected = '{X or Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X or Y' iv_expected = '{X or Y}' ).
GetPTF("X or Y").aSerialized("{X or Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X mul Y eq Z' iv_expected = '{{X mul Y} eq Z}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X mul Y eq Z' iv_expected = '{{X mul Y} eq Z}' ).
GetPTF("X mul Y eq Z").aSerialized("{{X mul Y} eq Z}");
- //lcl_helper=>veri_expression( iv_expression = 'X eq Y mul Z' iv_expected = '{X eq {Y mul Z}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X eq Y mul Z' iv_expected = '{X eq {Y mul Z}}' ).
GetPTF("X eq Y mul Z").aSerialized("{X eq {Y mul Z}}");
- //lcl_helper=>veri_expression( iv_expression = '(X)' iv_expected = 'X' ).
+ // lcl_helper=>veri_expression( iv_expression = '(X)' iv_expected = 'X' ).
GetPTF("(X)").aSerialized("X");
- //lcl_helper=>veri_expression( iv_expression = '(X or Y)' iv_expected = '{X or Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = '(X or Y)' iv_expected = '{X or Y}' ).
GetPTF("(X or Y)").aSerialized("{X or Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X mul (Y eq Z)' iv_expected = '{X mul {Y eq Z}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X mul (Y eq Z)' iv_expected = '{X mul {Y eq Z}}' ).
GetPTF("X mul (Y eq Z)").aSerialized("{X mul {Y eq Z}}");
- //lcl_helper=>veri_expression( iv_expression = '(X eq Y) mul Z' iv_expected = '{{X eq Y} mul Z}' ).
+ // lcl_helper=>veri_expression( iv_expression = '(X eq Y) mul Z' iv_expected = '{{X eq Y} mul Z}' ).
GetPTF("(X eq Y) mul Z").aSerialized("{{X eq Y} mul Z}");
- //lcl_helper=>veri_expression( iv_expression = 'indexof(X,Y)' iv_expected = '{indexof(X,Y)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'indexof(X,Y)' iv_expected = '{indexof(X,Y)}' ).
GetPTF("indexof(X,Y)").aSerialized("{indexof(X,Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'concat(X, Y)' iv_expected = '{concat(X,Y)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'concat(X, Y)' iv_expected = '{concat(X,Y)}' ).
GetPTF("concat(X, Y)").aSerialized("{concat(X,Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'concat(X,Y,Z, 1,2,3)' iv_expected = '{concat(X,Y,Z,1,2,3)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'concat(X,Y,Z, 1,2,3)' iv_expected = '{concat(X,Y,Z,1,2,3)}' ).
GetPTF("concat(X,Y,Z, 1,2,3)").aSerialized("{concat(X,Y,Z,1,2,3)}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq b eq c eq d' iv_expected = '{{{a eq b} eq c} eq d}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b eq c eq d' iv_expected = '{{{a eq b} eq c} eq d}' ).
GetPTF("a eq b eq c eq d").aSerialized("{{{a eq b} eq c} eq d}");
- //lcl_helper=>veri_expression( iv_expression = 'a mul b eq c mul d' iv_expected = '{{a mul b} eq {c mul d}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a mul b eq c mul d' iv_expected = '{{a mul b} eq {c mul d}}' ).
GetPTF("a mul b eq c mul d").aSerialized("{{a mul b} eq {c mul d}}");
- //lcl_helper=>veri_expression( iv_expression = 'a mul concat(X,Y,Z) eq c mul d' iv_expected = '{{a mul {concat(X,Y,Z)}} eq {c mul d}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a mul concat(X,Y,Z) eq c mul d' iv_expected = '{{a mul
+ // {concat(X,Y,Z)}} eq {c mul d}}' ).
GetPTF("a mul concat(X,Y,Z) eq c mul d").aSerialized("{{a mul {concat(X,Y,Z)}} eq {c mul d}}");
- //lcl_helper=>veri_expression( iv_expression = 'a mul (concat(X,Y,Z) eq c) mul d' iv_expected = '{{a mul {{concat(X,Y,Z)} eq c}} mul d}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a mul (concat(X,Y,Z) eq c) mul d' iv_expected = '{{a mul
+ // {{concat(X,Y,Z)} eq c}} mul d}' ).
GetPTF("a mul (concat(X,Y,Z) eq c) mul d").aSerialized("{{a mul {{concat(X,Y,Z)} eq c}} mul d}");
- //lcl_helper=>veri_expression( iv_expression = '- not X' iv_expected = '{- {not X}}' ).
+ // lcl_helper=>veri_expression( iv_expression = '- not X' iv_expected = '{- {not X}}' ).
GetPTF("- not X").aSerialized("{- {not X}}");
- //=>veri_expression( iv_expression = 'concat(-X,Y)' iv_expected = '{concat({- X},Y)}' ).
+ // =>veri_expression( iv_expression = 'concat(-X,Y)' iv_expected = '{concat({- X},Y)}' ).
GetPTF("concat(-X,Y)").aSerialized("{concat({- X},Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'concat(not X,Y)' iv_expected = '{concat({not X},Y)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'concat(not X,Y)' iv_expected = '{concat({not X},Y)}' ).
GetPTF("concat(not X,Y)").aSerialized("{concat({not X},Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'concat(- not X,Y)' iv_expected = '{concat({- {not X}},Y)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'concat(- not X,Y)' iv_expected = '{concat({- {not X}},Y)}' ).
GetPTF("concat(- not X,Y)").aSerialized("{concat({- {not X}},Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'not concat(-X,Y)' iv_expected = '{not {concat({- X},Y)}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'not concat(-X,Y)' iv_expected = '{not {concat({- X},Y)}}' ).
GetPTF("not concat(-X,Y)").aSerialized("{not {concat({- X},Y)}}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq not concat(-X,Y)' iv_expected = '{a eq {not {concat({- X},Y)}}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq not concat(-X,Y)' iv_expected = '{a eq {not {concat({-
+ // X},Y)}}}' ).
GetPTF("a eq not concat(-X,Y)").aSerialized("{a eq {not {concat({- X},Y)}}}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq b or c eq d and e eq f' iv_expected = '{{a eq b} or {{c eq d} and {e eq f}}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b or c eq d and e eq f' iv_expected = '{{a eq b} or {{c eq d}
+ // and {e eq f}}}' ).
GetPTF("a eq b or c eq d and e eq f").aSerialized("{{a eq b} or {{c eq d} and {e eq f}}}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq b and c eq d or e eq f' iv_expected = '{{{a eq b} and {c eq d}} or {e eq f}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b and c eq d or e eq f' iv_expected = '{{{a eq b} and {c eq
+ // d}} or {e eq f}}' ).
GetPTF("a eq b and c eq d or e eq f").aSerialized("{{{a eq b} and {c eq d}} or {e eq f}}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq 1.1E+02D' iv_expected = '{a eq 1.1E+02}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq 1.1E+02D' iv_expected = '{a eq 1.1E+02}' ).
GetPTF("a eq 1.1E+02D").aSerialized("{a eq 1.1E+02D}");
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `concat('a' 'b')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid_parameter
- //iv_expected_msg = 'Invalid parameter for function ''concat''' ).
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `concat('a' 'b')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid_parameter
+ // iv_expected_msg = 'Invalid parameter for function ''concat''' ).
GetPTF("concat('a' 'b')").aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `concat('125')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_few_parameter
- //iv_expected_msg = 'Too few parameters for function ''concat''' ).
- GetPTF("concat('125')").aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat('125')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
-
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `indexof('a','b','c')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_many_parameter
- //iv_expected_msg = 'Too many parameters for function ''indexof''' ).
- GetPTF("indexof('a','b','c')").aExMsgText("No applicable method found for \"indexof\" at position 1 in \"indexof('a','b','c')\" with the specified arguments. Method \"indexof\" requires exact 2 argument(s).");
-
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `replace('aBa','B','CCC')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
- //iv_expected_msg = `Invalid function 'replace' detected` ).
- //-->see test method abapMethodRleplaceNotAllowed()
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `concat('125')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_few_parameter
+ // iv_expected_msg = 'Too few parameters for function ''concat''' ).
+ GetPTF("concat('125')")
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"concat('125')\" with the " +
+ "specified arguments. Method \"concat\" requires 2 or more arguments.");
+
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `indexof('a','b','c')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_many_parameter
+ // iv_expected_msg = 'Too many parameters for function ''indexof''' ).
+ GetPTF("indexof('a','b','c')")
+ .aExMsgText(
+ "No applicable method found for \"indexof\" at position 1 in \"indexof('a','b','c')\" with " +
+ "the specified arguments. Method \"indexof\" requires exact 2 argument(s).");
+
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `replace('aBa','B','CCC')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
+ // iv_expected_msg = `Invalid function 'replace' detected` ).
+ // -->see test method abapMethodRleplaceNotAllowed()
}
@Test
- public void abapMethodRleplaceNotAllowed() //copy of ABAP method test_filter_parser
+ public void abapMethodRleplaceNotAllowed() // copy of ABAP method test_filter_parser
{
- //Filter method is NOT allowed
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `replace('aBa','B','CCC')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
- //iv_expected_msg = `Invalid function 'replace' detected` ).
-
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=replace('aBa','B','CCC')
- //-->Unknown function 'replace' at position 0.
- GetPTF("replace('aBa','B','CCC')").aExMsgText("Unknown function \"replace\" at position 1 in \"replace('aBa','B','CCC')\".");
+ // Filter method is NOT allowed
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `replace('aBa','B','CCC')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
+ // iv_expected_msg = `Invalid function 'replace' detected` ).
+
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=replace('aBa','B','CCC')
+ // -->Unknown function 'replace' at position 0.
+ GetPTF("replace('aBa','B','CCC')").aExMsgText(
+ "Unknown function \"replace\" at position 1 in \"replace('aBa','B','CCC')\".");
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
index c3d4ce9..5a636fe 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
index b4a27a0..7605409 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
index bb335f7..fda21b3 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -84,7 +84,8 @@ public class TestParser extends TestBase {
GetPTO("sven desc, test desc").aSerialized("{oc({o(sven, desc)},{o(test, desc)})}");
GetPTO("'sven', 77").order(1).aSortOrder(SortOrder.asc);
- GetPTO("'sven', 77 desc").root().order(0).aSortOrder(SortOrder.asc).aExpr().aEdmType(EdmString.getInstance()).root().order(1).aSortOrder(SortOrder.desc).aExpr().aEdmType(Uint7.getInstance());
+ GetPTO("'sven', 77 desc").root().order(0).aSortOrder(SortOrder.asc).aExpr().aEdmType(EdmString.getInstance())
+ .root().order(1).aSortOrder(SortOrder.desc).aExpr().aEdmType(Uint7.getInstance());
}
@@ -129,13 +130,18 @@ public class TestParser extends TestBase {
@Test
public void testProperties() {
// GetPTF("sven").aSerialized("sven").aKind(ExpressionKind.PROPERTY);
- GetPTF("sven1 add sven2").aSerialized("{sven1 add sven2}").aKind(ExpressionKind.BINARY).root().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("sven1").root().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("sven2");
+ GetPTF("sven1 add sven2").aSerialized("{sven1 add sven2}").aKind(ExpressionKind.BINARY).root().left().aKind(
+ ExpressionKind.PROPERTY).aUriLiteral("sven1").root().right().aKind(ExpressionKind.PROPERTY)
+ .aUriLiteral("sven2");
}
@Test
public void testDeepProperties() {
GetPTF("a/b").aSerialized("{a/b}").aKind(ExpressionKind.MEMBER);
- GetPTF("a/b/c").aSerialized("{{a/b}/c}").root().aKind(ExpressionKind.MEMBER).root().left().aKind(ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("a").root().left().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("b").root().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("c");
+ GetPTF("a/b/c").aSerialized("{{a/b}/c}").root().aKind(ExpressionKind.MEMBER).root().left().aKind(
+ ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("a").root().left()
+ .right().aKind(ExpressionKind.PROPERTY).aUriLiteral("b").root().right().aKind(ExpressionKind.PROPERTY)
+ .aUriLiteral("c");
}
@Test
@@ -157,14 +163,21 @@ public class TestParser extends TestBase {
GetPTF(edmEtAllTypes, "'text' eq String").root().aKind(ExpressionKind.BINARY);
- GetPTF(edmEtAllTypes, "Complex/String").root().left().aEdmProperty(complex).aEdmType(complexType).root().right().aEdmProperty(complexString).aEdmType(complexStringType).root().aKind(ExpressionKind.MEMBER).aEdmType(complexStringType);
+ GetPTF(edmEtAllTypes, "Complex/String").root().left().aEdmProperty(complex).aEdmType(complexType).root().right()
+ .aEdmProperty(complexString).aEdmType(complexStringType).root().aKind(ExpressionKind.MEMBER).aEdmType(
+ complexStringType);
- GetPTF(edmEtAllTypes, "Complex/Address/City").root().aKind(ExpressionKind.MEMBER).root().left().aKind(ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(complexType).root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(complexAddressType).root().left().aEdmType(complexAddressType).root().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType).root().aEdmType(complexAddressCityType);
+ GetPTF(edmEtAllTypes, "Complex/Address/City").root().aKind(ExpressionKind.MEMBER).root().left().aKind(
+ ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(
+ complexType).root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(
+ complexAddressType).root().left().aEdmType(complexAddressType).root().right().aKind(ExpressionKind.PROPERTY)
+ .aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType).root().aEdmType(complexAddressCityType);
EdmProperty boolean_ = (EdmProperty) edmEtAllTypes.getProperty("Boolean");
EdmSimpleType boolean_Type = (EdmSimpleType) boolean_.getType();
- GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY).aEdmType(boolean_Type).right().aEdmProperty(boolean_).aEdmType(boolean_Type);
+ GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY).aEdmType(boolean_Type).right().aEdmProperty(
+ boolean_).aEdmType(boolean_Type);
} catch (EdmException e) {
fail("Error in testPropertiesWithEdm:" + e.getLocalizedMessage());
@@ -195,7 +208,8 @@ public class TestParser extends TestBase {
GetPTF("1d add 2d").aSerialized("{1d add 2d}");
GetPTF("1d div 2d").aSerialized("{1d div 2d}");
- GetPTF("1d add 2d").aSerialized("{1d add 2d}").aKind(ExpressionKind.BINARY).root().left().aKind(ExpressionKind.LITERAL).root().right().aKind(ExpressionKind.LITERAL);
+ GetPTF("1d add 2d").aSerialized("{1d add 2d}").aKind(ExpressionKind.BINARY).root().left().aKind(
+ ExpressionKind.LITERAL).root().right().aKind(ExpressionKind.LITERAL);
}
@@ -344,11 +358,15 @@ public class TestParser extends TestBase {
GetPTF("123").aUriLiteral("123").aKind(ExpressionKind.LITERAL).aEdmType(Uint7Inst);
- GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeInst);
- GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeInst);
+ GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL)
+ .aEdmType(datetimeInst);
+ GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL)
+ .aEdmType(datetimeInst);
- GetPTF("datetimeoffset'2009-12-26T21:23:38Z'").aUriLiteral("datetimeoffset'2009-12-26T21:23:38Z'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
- GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aUriLiteral("datetimeoffset'2002-10-10T12:00:00-05:00'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
+ GetPTF("datetimeoffset'2009-12-26T21:23:38Z'").aUriLiteral("datetimeoffset'2009-12-26T21:23:38Z'").aKind(
+ ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
+ GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aUriLiteral("datetimeoffset'2002-10-10T12:00:00-05:00'").aKind(
+ ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
GetPTF("4.5m").aUriLiteral("4.5m").aKind(ExpressionKind.LITERAL).aEdmType(decimalInst);
GetPTF("4.5M").aUriLiteral("4.5M").aKind(ExpressionKind.LITERAL).aEdmType(decimalInst);
@@ -356,7 +374,8 @@ public class TestParser extends TestBase {
GetPTF("4.5d").aUriLiteral("4.5d").aKind(ExpressionKind.LITERAL).aEdmType(doubleInst);
GetPTF("4.5D").aUriLiteral("4.5D").aKind(ExpressionKind.LITERAL).aEdmType(doubleInst);
- GetPTF("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'").aUriLiteral("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'").aKind(ExpressionKind.LITERAL).aEdmType(guidInst);
+ GetPTF("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'").aUriLiteral("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'")
+ .aKind(ExpressionKind.LITERAL).aEdmType(guidInst);
GetPTF("-32768").aUriLiteral("-32768").aKind(ExpressionKind.LITERAL).aEdmType(int16Inst);
GetPTF("3276").aUriLiteral("3276").aKind(ExpressionKind.LITERAL).aEdmType(int16Inst);
[46/59] [abbrv] git commit: cleanup of odata testutil
Posted by ch...@apache.org.
cleanup of odata testutil
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/afcc636a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/afcc636a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/afcc636a
Branch: refs/heads/master
Commit: afcc636a83be53895b27937468d285906fee258d
Parents: de63728
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 15:01:53 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 15:01:53 2013 +0200
----------------------------------------------------------------------
.../testutil/TestUtilRuntimeException.java | 30 ++---
.../odata2/testutil/fit/AbstractFitTest.java | 31 +++--
.../olingo/odata2/testutil/fit/BaseTest.java | 30 ++---
.../odata2/testutil/fit/FitErrorCallback.java | 31 +++--
.../testutil/fit/FitStaticServiceFactory.java | 29 ++---
.../testutil/fit/Log4JConfigurationTest.java | 26 ++--
.../odata2/testutil/helper/ClassHelper.java | 29 ++---
.../odata2/testutil/helper/HttpMerge.java | 26 ++--
.../helper/HttpSomethingUnsupported.java | 26 ++--
.../helper/ODataMessageTextVerifier.java | 37 +++---
.../odata2/testutil/helper/ProcessLocker.java | 33 +++--
.../odata2/testutil/helper/StringHelper.java | 30 ++---
.../odata2/testutil/helper/XMLUnitHelper.java | 31 ++---
.../olingo/odata2/testutil/mock/EdmMock.java | 71 ++++++-----
.../odata2/testutil/mock/EdmTestProvider.java | 121 ++++++++++++-------
.../olingo/odata2/testutil/mock/MockFacade.java | 31 +++--
.../SampleClassForInvalidMessageReferences.java | 35 +++---
.../olingo/odata2/testutil/mock/TecEdmInfo.java | 28 ++---
.../mock/TechnicalScenarioEdmProvider.java | 55 +++++----
.../testutil/server/ServerRuntimeException.java | 26 ++--
.../odata2/testutil/server/TestServer.java | 38 +++---
21 files changed, 428 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
index b3b2f7a..ec8f3f5 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
@@ -1,27 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil;
/**
* This class is a helper to throw RuntimeExceptions in test util methods
- *
- *
+ *
+ *
*/
public class TestUtilRuntimeException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
index 74fda3d..1a2362b 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.fit;
@@ -22,14 +22,13 @@ import java.net.URI;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.junit.After;
-import org.junit.Before;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
import org.apache.olingo.odata2.testutil.server.ServerRuntimeException;
import org.apache.olingo.odata2.testutil.server.TestServer;
+import org.junit.After;
+import org.junit.Before;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
index 26520db..b1deda1 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.fit;
@@ -34,7 +34,7 @@ import org.junit.runner.Description;
* Provides basic support for JUnit tests<br>
* - log & tracing
*
- *
+ *
*/
public abstract class BaseTest {
@@ -79,7 +79,7 @@ public abstract class BaseTest {
/**
* Disable logging.
- * <br />
+ * <br />
* Disabled logging will be automatically re-enabled after test execution (see {@link #reEnableLogging()}).
*/
protected void disableLogging() {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
index 5a63e58..fb8ff25 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
@@ -1,32 +1,31 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.fit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.ep.EntityProvider;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
import org.apache.olingo.odata2.api.processor.ODataErrorCallback;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
import org.apache.olingo.odata2.api.processor.ODataResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
index ea1d7a4..b484661 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.fit;
@@ -48,7 +48,8 @@ public class FitStaticServiceFactory extends ODataServiceFactory {
return super.getCallback(callbackInterface);
}
- private static Map<String, ODataService> PORT_2_SERVICE = Collections.synchronizedMap(new HashMap<String, ODataService>());
+ private static Map<String, ODataService> PORT_2_SERVICE = Collections
+ .synchronizedMap(new HashMap<String, ODataService>());
public static void bindService(final TestServer server, final ODataService service) {
PORT_2_SERVICE.put(createId(server), service);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java
index f7c7449..9f17766 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.fit;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
index 8100b72..78ee9b7 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.helper;
@@ -69,7 +69,8 @@ public class ClassHelper {
* @param ctorParameterClasses
* @param ctorParameters
*/
- public static <T> List<T> getClassInstances(final List<Class<T>> exClasses, final Class<?>[] ctorParameterClasses, final Object[] ctorParameters) {
+ public static <T> List<T> getClassInstances(final List<Class<T>> exClasses, final Class<?>[] ctorParameterClasses,
+ final Object[] ctorParameters) {
final List<T> toTestExceptions = new ArrayList<T>();
for (final Class<T> clazz : exClasses) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java
index 9a563b1..918a083 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.helper;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java
index 0bdfa66..8b4b20c 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.helper;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
index 1c0816a..2f510bc 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.helper;
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
* test whether all fields of type {@link MessageReference} of
* the tested (Exception) class are provided in the <b>i18n.properties</b> file.
*
- *
+ *
*/
public class ODataMessageTextVerifier {
@@ -103,15 +103,18 @@ public class ODataMessageTextVerifier {
try {
msgRef = (MessageReference) field.get(null);
} catch (final IllegalArgumentException e) {
- failCollector("MsgRef Error--> Error: MsgRef " + field.getName() + " of class \"" + testClass.getSimpleName() + "\"");
+ failCollector("MsgRef Error--> Error: MsgRef " + field.getName() + " of class \"" + testClass.getSimpleName()
+ + "\"");
break;
} catch (final IllegalAccessException e) {
- failCollector("MsgRef Error--> Not public: MsgRef " + field.getName() + " of class \"" + testClass.getSimpleName() + "\"");
+ failCollector("MsgRef Error--> Not public: MsgRef " + field.getName() + " of class \""
+ + testClass.getSimpleName() + "\"");
break;
}
if (msgRef == null) {
- failCollector("MsgRef Error--> Not assigned: MsgRef " + field.getName() + " of class \"" + testClass.getSimpleName() + "\"");
+ failCollector("MsgRef Error--> Not assigned: MsgRef " + field.getName() + " of class \""
+ + testClass.getSimpleName() + "\"");
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
index c4a2a9f..4f5fbc3 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.helper;
@@ -24,22 +24,21 @@ import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
+import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
-
/**
* Interprocess synchronization to enable parallel test executions.
*
- *
+ *
*/
public class ProcessLocker {
@SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(ProcessLocker.class);
- //Acquire
+ // Acquire
public static void crossProcessLockAcquire(final Class<?> c, final long waitMS) {
RandomAccessFile randomAccessFile = null;
if ((fileLock == null) && (c != null) && (waitMS > 0)) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
index bf2e24e..ef3b59c 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.helper;
@@ -28,7 +28,6 @@ import java.nio.charset.Charset;
import java.util.Random;
import org.apache.http.HttpEntity;
-
import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
/**
@@ -86,7 +85,8 @@ public class StringHelper {
* @return content as stream
* @throws UnsupportedEncodingException if charset is not supported
*/
- public static InputStream encapsulate(final String content, final String charset) throws UnsupportedEncodingException {
+ public static InputStream encapsulate(final String content, final String charset)
+ throws UnsupportedEncodingException {
return new ByteArrayInputStream(content.getBytes(charset));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
index fa2520d..3992bc1 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.helper;
@@ -26,7 +26,7 @@ import org.junit.Assert;
/**
* Helper for XML unit tests.
- *
+ *
*/
public class XMLUnitHelper {
@@ -44,7 +44,8 @@ public class XMLUnitHelper {
if (m.find()) {
final int currentTagPos = m.start();
- Assert.assertTrue("Tag with name '" + tagName + "' is not in correct order. Expected order is '" + Arrays.toString(toCheckTags) + "'.",
+ Assert.assertTrue("Tag with name '" + tagName + "' is not in correct order. Expected order is '"
+ + Arrays.toString(toCheckTags) + "'.",
lastTagPos < currentTagPos);
lastTagPos = currentTagPos;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
index 9ffe44a..66a5708 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.mock;
@@ -23,8 +23,6 @@ import static org.mockito.Mockito.when;
import java.util.Arrays;
-import org.mockito.Mockito;
-
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.edm.EdmComplexType;
@@ -50,10 +48,11 @@ import org.apache.olingo.odata2.api.edm.EdmTypeKind;
import org.apache.olingo.odata2.api.edm.EdmTyped;
import org.apache.olingo.odata2.api.edm.provider.CustomizableFeedMappings;
import org.apache.olingo.odata2.api.exception.ODataException;
+import org.mockito.Mockito;
/**
* Mocked Entity Data Model, more or less aligned to the Reference Scenario.
- *
+ *
*/
class EdmMock {
@@ -61,11 +60,14 @@ class EdmMock {
EdmEntityContainer defaultContainer = mock(EdmEntityContainer.class);
when(defaultContainer.isDefaultEntityContainer()).thenReturn(true);
- final EdmEntitySet employeeEntitySet = createEntitySetMock(defaultContainer, "Employees", EdmSimpleTypeKind.String, "EmployeeId");
+ final EdmEntitySet employeeEntitySet =
+ createEntitySetMock(defaultContainer, "Employees", EdmSimpleTypeKind.String, "EmployeeId");
final EdmEntitySet teamEntitySet = createEntitySetMock(defaultContainer, "Teams", EdmSimpleTypeKind.String, "Id");
final EdmEntitySet roomEntitySet = createEntitySetMock(defaultContainer, "Rooms", EdmSimpleTypeKind.String, "Id");
- final EdmEntitySet managerEntitySet = createEntitySetMock(defaultContainer, "Managers", EdmSimpleTypeKind.String, "EmployeeId");
- final EdmEntitySet buildingEntitySet = createEntitySetMock(defaultContainer, "Buildings", EdmSimpleTypeKind.String, "Id");
+ final EdmEntitySet managerEntitySet =
+ createEntitySetMock(defaultContainer, "Managers", EdmSimpleTypeKind.String, "EmployeeId");
+ final EdmEntitySet buildingEntitySet =
+ createEntitySetMock(defaultContainer, "Buildings", EdmSimpleTypeKind.String, "Id");
EdmEntityType employeeType = employeeEntitySet.getEntityType();
when(employeeType.hasStream()).thenReturn(true);
@@ -166,17 +168,22 @@ class EdmMock {
when(buildingType.getNavigationPropertyNames()).thenReturn(Arrays.asList("nb_Rooms"));
createNavigationProperty("nb_Rooms", EdmMultiplicity.MANY, buildingEntitySet, roomEntitySet);
- EdmFunctionImport employeeSearchFunctionImport = createFunctionImportMock(defaultContainer, "EmployeeSearch", employeeType, EdmMultiplicity.MANY);
+ EdmFunctionImport employeeSearchFunctionImport =
+ createFunctionImportMock(defaultContainer, "EmployeeSearch", employeeType, EdmMultiplicity.MANY);
when(employeeSearchFunctionImport.getEntitySet()).thenReturn(employeeEntitySet);
EdmParameter employeeSearchParameter = mock(EdmParameter.class);
when(employeeSearchParameter.getType()).thenReturn(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
when(employeeSearchFunctionImport.getParameterNames()).thenReturn(Arrays.asList("q"));
when(employeeSearchFunctionImport.getParameter("q")).thenReturn(employeeSearchParameter);
createFunctionImportMock(defaultContainer, "AllLocations", locationComplexType, EdmMultiplicity.MANY);
- createFunctionImportMock(defaultContainer, "AllUsedRoomIds", EdmSimpleTypeKind.String.getEdmSimpleTypeInstance(), EdmMultiplicity.MANY);
- createFunctionImportMock(defaultContainer, "MaximalAge", EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance(), EdmMultiplicity.ONE);
+ createFunctionImportMock(defaultContainer, "AllUsedRoomIds", EdmSimpleTypeKind.String.getEdmSimpleTypeInstance(),
+ EdmMultiplicity.MANY);
+ createFunctionImportMock(defaultContainer, "MaximalAge", EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance(),
+ EdmMultiplicity.ONE);
createFunctionImportMock(defaultContainer, "MostCommonLocation", locationComplexType, EdmMultiplicity.ONE);
- EdmFunctionImport managerPhotoFunctionImport = createFunctionImportMock(defaultContainer, "ManagerPhoto", EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance(), EdmMultiplicity.ONE);
+ EdmFunctionImport managerPhotoFunctionImport =
+ createFunctionImportMock(defaultContainer, "ManagerPhoto", EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance(),
+ EdmMultiplicity.ONE);
EdmParameter managerPhotoParameter = mock(EdmParameter.class);
when(managerPhotoParameter.getType()).thenReturn(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
EdmFacets managerPhotoParameterFacets = mock(EdmFacets.class);
@@ -184,7 +191,8 @@ class EdmMock {
when(managerPhotoParameter.getFacets()).thenReturn(managerPhotoParameterFacets);
when(managerPhotoFunctionImport.getParameterNames()).thenReturn(Arrays.asList("Id"));
when(managerPhotoFunctionImport.getParameter("Id")).thenReturn(managerPhotoParameter);
- EdmFunctionImport oldestEmployeeFunctionImport = createFunctionImportMock(defaultContainer, "OldestEmployee", employeeType, EdmMultiplicity.ONE);
+ EdmFunctionImport oldestEmployeeFunctionImport =
+ createFunctionImportMock(defaultContainer, "OldestEmployee", employeeType, EdmMultiplicity.ONE);
when(oldestEmployeeFunctionImport.getEntitySet()).thenReturn(employeeEntitySet);
EdmEntityContainer specificContainer = mock(EdmEntityContainer.class);
@@ -266,7 +274,8 @@ class EdmMock {
return edm;
}
- private static EdmNavigationProperty createNavigationProperty(final String name, final EdmMultiplicity multiplicity, final EdmEntitySet entitySet, final EdmEntitySet targetEntitySet) throws EdmException {
+ private static EdmNavigationProperty createNavigationProperty(final String name, final EdmMultiplicity multiplicity,
+ final EdmEntitySet entitySet, final EdmEntitySet targetEntitySet) throws EdmException {
EdmType navigationType = mock(EdmType.class);
when(navigationType.getKind()).thenReturn(EdmTypeKind.ENTITY);
@@ -281,7 +290,8 @@ class EdmMock {
return navigationProperty;
}
- private static EdmProperty createProperty(final String name, final EdmSimpleTypeKind kind, final EdmStructuralType entityType) throws EdmException {
+ private static EdmProperty createProperty(final String name, final EdmSimpleTypeKind kind,
+ final EdmStructuralType entityType) throws EdmException {
EdmProperty property = mock(EdmProperty.class);
when(property.getType()).thenReturn(kind.getEdmSimpleTypeInstance());
when(property.getName()).thenReturn(name);
@@ -289,7 +299,8 @@ class EdmMock {
return property;
}
- private static EdmEntitySet createEntitySetMock(final EdmEntityContainer container, final String name, final EdmSimpleTypeKind kind, final String keyPropertyId) throws EdmException {
+ private static EdmEntitySet createEntitySetMock(final EdmEntityContainer container, final String name,
+ final EdmSimpleTypeKind kind, final String keyPropertyId) throws EdmException {
final EdmEntityType entityType = createEntityTypeMock(name.substring(0, name.length() - 1), kind, keyPropertyId);
EdmEntitySet entitySet = mock(EdmEntitySet.class);
@@ -303,7 +314,8 @@ class EdmMock {
return entitySet;
}
- private static EdmEntityType createEntityTypeMock(final String name, final EdmSimpleTypeKind kind, final String keyPropertyId) throws EdmException {
+ private static EdmEntityType createEntityTypeMock(final String name, final EdmSimpleTypeKind kind,
+ final String keyPropertyId) throws EdmException {
EdmEntityType entityType = mock(EdmEntityType.class);
when(entityType.getName()).thenReturn(name);
when(entityType.getNamespace()).thenReturn("RefScenario");
@@ -322,7 +334,8 @@ class EdmMock {
return entityType;
}
- private static EdmFunctionImport createFunctionImportMock(final EdmEntityContainer container, final String name, final EdmType type, final EdmMultiplicity multiplicity) throws EdmException {
+ private static EdmFunctionImport createFunctionImportMock(final EdmEntityContainer container, final String name,
+ final EdmType type, final EdmMultiplicity multiplicity) throws EdmException {
EdmTyped returnType = mock(EdmTyped.class);
when(returnType.getType()).thenReturn(type);
when(returnType.getMultiplicity()).thenReturn(multiplicity);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
index 72a1296..cb9392b 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.mock;
@@ -161,14 +161,18 @@ public class EdmTestProvider extends EdmProvider {
final List<AnnotationElement> childElements = new ArrayList<AnnotationElement>();
childElements.add(new AnnotationElement().setName("schemaElementTest2").setText("text2").setNamespace(NAMESPACE_1));
- childElements.add(new AnnotationElement().setName("schemaElementTest3").setText("text3").setPrefix("prefix").setNamespace("namespace"));
+ childElements.add(new AnnotationElement().setName("schemaElementTest3").setText("text3").setPrefix("prefix")
+ .setNamespace("namespace"));
final List<AnnotationAttribute> elementAttributes = new ArrayList<AnnotationAttribute>();
elementAttributes.add(new AnnotationAttribute().setName("rel").setText("self"));
- elementAttributes.add(new AnnotationAttribute().setName("href").setText("http://foo").setPrefix("pre").setNamespace("namespaceForAnno"));
- childElements.add(new AnnotationElement().setName("schemaElementTest4").setText("text4").setAttributes(elementAttributes));
+ elementAttributes.add(new AnnotationAttribute().setName("href").setText("http://foo").setPrefix("pre")
+ .setNamespace("namespaceForAnno"));
+ childElements.add(new AnnotationElement().setName("schemaElementTest4").setText("text4").setAttributes(
+ elementAttributes));
final List<AnnotationElement> schemaElements = new ArrayList<AnnotationElement>();
- schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setText("text1").setChildElements(childElements));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setText("text1").setChildElements(
+ childElements));
schema.setAnnotationElements(schemaElements);
schemas.add(schema);
@@ -194,24 +198,30 @@ public class EdmTestProvider extends EdmProvider {
if (ENTITY_TYPE_1_1.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
final ArrayList<AnnotationAttribute> annoList = new ArrayList<AnnotationAttribute>();
- annoList.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespace").setPrefix("annoPrefix").setText("annoText"));
- annoList.add(new AnnotationAttribute().setName("annoName2").setNamespace("http://annoNamespace").setPrefix("annoPrefix").setText("annoText2"));
+ annoList.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespace").setPrefix(
+ "annoPrefix").setText("annoText"));
+ annoList.add(new AnnotationAttribute().setName("annoName2").setNamespace("http://annoNamespace").setPrefix(
+ "annoPrefix").setText("annoText2"));
properties.add(new SimpleProperty().setName("EmployeeId").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false))
.setMapping(new Mapping().setInternalName("getId")).setAnnotationAttributes(annoList));
final ArrayList<AnnotationAttribute> annoList2 = new ArrayList<AnnotationAttribute>();
- annoList2.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespace").setPrefix("annoPrefix").setText("annoText"));
+ annoList2.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespace").setPrefix(
+ "annoPrefix").setText("annoText"));
final List<AnnotationElement> annoElementsForSimpleProp = new ArrayList<AnnotationElement>();
annoElementsForSimpleProp.add(new AnnotationElement().setName("propertyAnnoElement").setText("text"));
annoElementsForSimpleProp.add(new AnnotationElement().setName("propertyAnnoElement2"));
- final SimpleProperty simpleProp = new SimpleProperty().setName("EmployeeName").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)).setAnnotationAttributes(annoList2).setAnnotationElements(annoElementsForSimpleProp);
+ final SimpleProperty simpleProp =
+ new SimpleProperty().setName("EmployeeName").setType(EdmSimpleTypeKind.String)
+ .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)).setAnnotationAttributes(annoList2)
+ .setAnnotationElements(annoElementsForSimpleProp);
properties.add(simpleProp);
final ArrayList<AnnotationAttribute> annoList3 = new ArrayList<AnnotationAttribute>();
- annoList3.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespaceNew").setPrefix("annoPrefix").setText("annoTextNew"));
+ annoList3.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespaceNew").setPrefix(
+ "annoPrefix").setText("annoTextNew"));
properties.add(new SimpleProperty().setName("ManagerId").setType(EdmSimpleTypeKind.String)
.setMapping(new Mapping().setInternalName("getManager.getId")).setAnnotationAttributes(annoList3));
properties.add(new SimpleProperty().setName("RoomId").setType(EdmSimpleTypeKind.String)
@@ -223,7 +233,8 @@ public class EdmTestProvider extends EdmProvider {
properties.add(new SimpleProperty().setName("Age").setType(EdmSimpleTypeKind.Int16));
properties.add(new SimpleProperty().setName("EntryDate").setType(EdmSimpleTypeKind.DateTime)
.setFacets(new Facets().setNullable(true))
- .setCustomizableFeedMappings(new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_UPDATED)));
+ .setCustomizableFeedMappings(
+ new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_UPDATED)));
properties.add(new SimpleProperty().setName("ImageUrl").setType(EdmSimpleTypeKind.String)
.setMapping(new Mapping().setInternalName("getImageUri")));
final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
@@ -245,7 +256,8 @@ public class EdmTestProvider extends EdmProvider {
properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false).setDefaultValue("1")));
properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
+ .setCustomizableFeedMappings(
+ new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
return new EntityType().setName(ENTITY_TYPE_1_BASE.getName())
.setAbstract(true)
.setProperties(properties)
@@ -312,11 +324,13 @@ public class EdmTestProvider extends EdmProvider {
properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.Int32)
.setFacets(new Facets().setNullable(false).setConcurrencyMode(EdmConcurrencyMode.Fixed)));
properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
+ .setCustomizableFeedMappings(
+ new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
properties.add(new SimpleProperty().setName("Type").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false)));
properties.add(new SimpleProperty().setName("ImageUrl").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI))
+ .setCustomizableFeedMappings(
+ new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI))
.setMapping(new Mapping().setInternalName("getImageUri")));
properties.add(new SimpleProperty().setName("Image").setType(EdmSimpleTypeKind.Binary)
.setMapping(new Mapping().setMimeType("getType")));
@@ -367,16 +381,22 @@ public class EdmTestProvider extends EdmProvider {
if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
if (ASSOCIATION_1_1.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_1.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_4).setRole(ROLE_1_4).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_4).setRole(ROLE_1_4).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_2.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_2.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_2).setRole(ROLE_1_2).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_2).setRole(ROLE_1_2).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_3.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_3.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_4.getName().equals(edmFQName.getName())) {
final List<PropertyRef> propertyRefsPrincipal = new ArrayList<PropertyRef>();
propertyRefsPrincipal.add(new PropertyRef().setName("Id"));
@@ -385,10 +405,16 @@ public class EdmTestProvider extends EdmProvider {
propertyRefsDependent.add(new PropertyRef().setName("Id"));
propertyRefsDependent.add(new PropertyRef().setName("Id2"));
return new Association().setName(ASSOCIATION_1_4.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_5).setRole(ROLE_1_5).setMultiplicity(EdmMultiplicity.ONE))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.MANY))
- .setReferentialConstraint(new ReferentialConstraint().setPrincipal(new ReferentialConstraintRole().setRole("BuildingToRoom").setPropertyRefs(propertyRefsPrincipal))
- .setDependent(new ReferentialConstraintRole().setRole("RoomToBuilding").setPropertyRefs(propertyRefsDependent)));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_5).setRole(ROLE_1_5).setMultiplicity(EdmMultiplicity.ONE))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.MANY))
+ .setReferentialConstraint(
+ new ReferentialConstraint().setPrincipal(
+ new ReferentialConstraintRole().setRole("BuildingToRoom").setPropertyRefs(propertyRefsPrincipal))
+ .setDependent(
+ new ReferentialConstraintRole().setRole("RoomToBuilding")
+ .setPropertyRefs(propertyRefsDependent)));
}
}
return null;
@@ -449,12 +475,16 @@ public class EdmTestProvider extends EdmProvider {
} else if (FUNCTION_IMPORT_3.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.String.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.MANY))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.String.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.MANY))
.setHttpMethod("GET");
} else if (FUNCTION_IMPORT_4.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.Int16.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.ONE))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.Int16.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.ONE))
.setHttpMethod("GET");
} else if (FUNCTION_IMPORT_5.equals(name)) {
@@ -467,13 +497,17 @@ public class EdmTestProvider extends EdmProvider {
parameters.add(new FunctionImportParameter().setName("Id").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false)));
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.Binary.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.ONE))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.Binary.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.ONE))
.setHttpMethod("GET")
.setParameters(parameters);
} else if (FUNCTION_IMPORT_7.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(new FullQualifiedName(NAMESPACE_1, "Employee")).setMultiplicity(EdmMultiplicity.ZERO_TO_ONE))
+ .setReturnType(
+ new ReturnType().setTypeName(new FullQualifiedName(NAMESPACE_1, "Employee")).setMultiplicity(
+ EdmMultiplicity.ZERO_TO_ONE))
.setEntitySet(ENTITY_SET_1_1)
.setHttpMethod("GET");
@@ -484,7 +518,8 @@ public class EdmTestProvider extends EdmProvider {
}
@Override
- public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
+ public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
+ final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
if (ENTITY_CONTAINER_1.equals(entityContainer)) {
if (ASSOCIATION_1_1.equals(association)) {
return new AssociationSet().setName(ASSOCIATION_1_1.getName())
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
index 10085c0..6d53526 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
@@ -1,35 +1,34 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.mock;
import java.util.ArrayList;
import java.util.List;
-import org.mockito.Mockito;
-
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.uri.PathSegment;
+import org.mockito.Mockito;
/**
* Mocked Entity Data Model, more or less aligned to the Reference Scenario.
- *
+ *
*/
public class MockFacade {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
index 420c7b1..da185b6 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.mock;
@@ -36,7 +36,10 @@ public class SampleClassForInvalidMessageReferences extends ODataMessageExceptio
super(messageReference, errorCode);
}
- public static final MessageReference EXIST = createMessageReference(SampleClassForInvalidMessageReferences.class, "EXIST");
- public static final MessageReference DOES_NOT_EXIST = createMessageReference(SampleClassForInvalidMessageReferences.class, "DOES_NOT_EXIST");
- public static final MessageReference EXITS_BUT_EMPTY = createMessageReference(SampleClassForInvalidMessageReferences.class, "EXITS_BUT_EMPTY");
+ public static final MessageReference EXIST = createMessageReference(SampleClassForInvalidMessageReferences.class,
+ "EXIST");
+ public static final MessageReference DOES_NOT_EXIST = createMessageReference(
+ SampleClassForInvalidMessageReferences.class, "DOES_NOT_EXIST");
+ public static final MessageReference EXITS_BUT_EMPTY = createMessageReference(
+ SampleClassForInvalidMessageReferences.class, "EXITS_BUT_EMPTY");
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
index 92733af..4592ee3 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.mock;
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmException;
/**
* Helper for the entity data model used as technical reference scenario.
- *
+ *
*/
public class TecEdmInfo {
private final Edm edm;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
index 703a068..f32f1d9 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.mock;
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
/**
* Provider for the entity data model used as technical reference scenario
- *
+ *
*/
public class TechnicalScenarioEdmProvider extends EdmProvider {
@@ -113,9 +113,11 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
- navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_1).setToRole(ROLE_2).setRelationship(ASSOCIATION_ET1_ET2));
+ navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_1).setToRole(ROLE_2)
+ .setRelationship(ASSOCIATION_ET1_ET2));
- return new EntityType().setName(ET_KEY_IS_STRING.getName()).setProperties(properties).setNavigationProperties(navigationProperties).setKey(createKey("KeyString"));
+ return new EntityType().setName(ET_KEY_IS_STRING.getName()).setProperties(properties).setNavigationProperties(
+ navigationProperties).setKey(createKey("KeyString"));
} else if (ET_KEY_IS_INTEGER.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
properties.add(new SimpleProperty().setName("KeyInteger")
@@ -123,9 +125,11 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
.setFacets(new Facets().setNullable(false)));
final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
- navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_2).setToRole(ROLE_1).setRelationship(ASSOCIATION_ET1_ET2));
+ navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_2).setToRole(ROLE_1)
+ .setRelationship(ASSOCIATION_ET1_ET2));
- return new EntityType().setName(ET_KEY_IS_INTEGER.getName()).setProperties(properties).setNavigationProperties(navigationProperties).setKey(createKey("KeyInteger"));
+ return new EntityType().setName(ET_KEY_IS_INTEGER.getName()).setProperties(properties).setNavigationProperties(
+ navigationProperties).setKey(createKey("KeyInteger"));
} else if (ET_COMPLEX_KEY.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
@@ -136,7 +140,8 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
.setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false)));
- return new EntityType().setName(ET_COMPLEX_KEY.getName()).setProperties(properties).setKey(createKey("KeyInteger", "KeyString"));
+ return new EntityType().setName(ET_COMPLEX_KEY.getName()).setProperties(properties).setKey(
+ createKey("KeyInteger", "KeyString"));
} else if (ET_ALL_TYPES.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
properties.add(new SimpleProperty().setName("Boolean").setType(EdmSimpleTypeKind.Boolean));
@@ -221,8 +226,10 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
public Association getAssociation(final FullQualifiedName edmFQName) throws ODataMessageException {
if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
if (ASSOCIATION_ET1_ET2.getName().equals(edmFQName.getName())) {
- final AssociationEnd end1 = new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ROLE_1).setType(ET_KEY_IS_STRING);
- final AssociationEnd end2 = new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ROLE_2).setType(ET_KEY_IS_INTEGER);
+ final AssociationEnd end1 =
+ new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ROLE_1).setType(ET_KEY_IS_STRING);
+ final AssociationEnd end2 =
+ new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ROLE_2).setType(ET_KEY_IS_INTEGER);
return new Association().setName("Association").setEnd1(end1).setEnd2(end2);
}
}
@@ -259,12 +266,14 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
}
@Override
- public FunctionImport getFunctionImport(final String entityContainer, final String name) throws ODataMessageException {
+ public FunctionImport getFunctionImport(final String entityContainer, final String name)
+ throws ODataMessageException {
return null;
}
@Override
- public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataMessageException {
+ public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
+ final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataMessageException {
if (ENTITY_CONTAINER_1.equals(entityContainer)) {
if (ASSOCIATION_ET1_ET2.equals(association)) {
final AssociationSetEnd end1 = new AssociationSetEnd().setRole(ROLE_1).setEntitySet(ES_KEY_IS_STRING);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
index aa43be4..63073a6 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.server;
[07/59] [abbrv] Clean up of odata api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java
index e902200..2b7c5ee 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
/**
* Objects of this class represent a simple property.
- *
+ *
*/
public class SimpleProperty extends Property {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java
index a73da12..0fdaca6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/package-info.java
index 8809bec..4f9614f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/package-info.java
@@ -1,287 +1,290 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Entity Data Model Provider API
- * <p>Classes in this package are used to provide an EDM to the library as well as to the application. To do this the class {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider} has to be implemented.</p>
- * <p>Inside the OData library we are using a lazy loading concept which means the EdmProvider is only called for an element if it is needed. See some sample coding for an EdmProvider below</p>
+ * <p>Classes in this package are used to provide an EDM to the library as well as to the application. To do this the
+ * class {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider} has to be implemented.</p>
+ * <p>Inside the OData library we are using a lazy loading concept which means the EdmProvider is only called for an
+ * element if it is needed. See some sample coding for an EdmProvider below</p>
* <p>public class Provider extends EdmProvider {
- <p>public static final String NAMESPACE_1 = "RefScenario";
- <br/>public static final String NAMESPACE_2 = "RefScenario2";
- <br/>private static final FullQualifiedName ENTITY_TYPE_1_1 = new FullQualifiedName(NAMESPACE_1, "Employee");
- <br/>private static final FullQualifiedName ENTITY_TYPE_1_BASE = new FullQualifiedName(NAMESPACE_1, "Base");
- <br/>private static final FullQualifiedName ENTITY_TYPE_1_4 = new FullQualifiedName(NAMESPACE_1, "Manager");
- <br/>private static final FullQualifiedName ENTITY_TYPE_2_1 = new FullQualifiedName(NAMESPACE_2, "Photo");
- <br/>private static final FullQualifiedName COMPLEX_TYPE_1 = new FullQualifiedName(NAMESPACE_1, "c_Location");
- <br/>private static final FullQualifiedName COMPLEX_TYPE_2 = new FullQualifiedName(NAMESPACE_1, "c_City");
- <br/>private static final FullQualifiedName ASSOCIATION_1_1 = new FullQualifiedName(NAMESPACE_1, "ManagerEmployees");
- <br/>private static final String ROLE_1_1 = "r_Employees";
- <br/>private static final String ROLE_1_4 = "r_Manager";
- <br/>private static final String ENTITY_CONTAINER_1 = "Container1";
- <br/>private static final String ENTITY_CONTAINER_2 = "Container2";
- <br/>private static final String ENTITY_SET_1_1 = "Employees";
- <br/>private static final String ENTITY_SET_1_4 = "Managers";
- <br/>private static final String ENTITY_SET_2_1 = "Photos";
- <br/>private static final String FUNCTION_IMPORT_1 = "EmployeeSearch";
- <br/>private static final String FUNCTION_IMPORT_2 = "AllLocations";
- </p>
- <p>public List<Schema> getSchemas() throws ODataException {
- <p>List<Schema> schemas = new ArrayList<Schema>();
- <br/>Schema schema = new Schema();
- <br/>schema.setNamespace(NAMESPACE_1);
-
- <br/>List<EntityType> entityTypes = new ArrayList<EntityType>();
- <br/>entityTypes.add(getEntityType(ENTITY_TYPE_1_1));
- <br/>entityTypes.add(getEntityType(ENTITY_TYPE_1_4));
- <br/>entityTypes.add(getEntityType(ENTITY_TYPE_1_BASE));
- <br/>schema.setEntityTypes(entityTypes);
-
- <br/>List<ComplexType> complexTypes = new ArrayList<ComplexType>();
- <br/>complexTypes.add(getComplexType(COMPLEX_TYPE_1));
- <br/>complexTypes.add(getComplexType(COMPLEX_TYPE_2));
- <br/>schema.setComplexTypes(complexTypes);
-
- <br/>List<Association> associations = new ArrayList<Association>();
- <br/>associations.add(getAssociation(ASSOCIATION_1_1));
- <br/>schema.setAssociations(associations);
-
- <br/>EntityContainer entityContainer = new EntityContainer();
- <br/>entityContainer.setName(ENTITY_CONTAINER_1).setDefaultEntityContainer(true);
-
- <br/>List<EntitySet> entitySets = new ArrayList<EntitySet>();
- <br/>entitySets.add(getEntitySet(ENTITY_CONTAINER_1, ENTITY_SET_1_1));
- <br/>entitySets.add(getEntitySet(ENTITY_CONTAINER_1, ENTITY_SET_1_4));
- <br/>entityContainer.setEntitySets(entitySets);
-
- <br/>List<AssociationSet> associationSets = new ArrayList<AssociationSet>();
- <br/>associationSets.add(getAssociationSet(ENTITY_CONTAINER_1, ASSOCIATION_1_1, ENTITY_SET_1_4, ROLE_1_4));
- <br/>entityContainer.setAssociationSets(associationSets);
-
- <br/>List<FunctionImport> functionImports = new ArrayList<FunctionImport>();
- <br/>functionImports.add(getFunctionImport(ENTITY_CONTAINER_1, FUNCTION_IMPORT_1));
- <br/>functionImports.add(getFunctionImport(ENTITY_CONTAINER_1, FUNCTION_IMPORT_2));
- <br/>entityContainer.setFunctionImports(functionImports);
-
- <br/>schema.setEntityContainers(Arrays.asList(entityContainer));
-
- <br/>schemas.add(schema);
- </p>
- <p>schema = new Schema();
- <br/>schema.setNamespace(NAMESPACE_2);
-
- <br/>schema.setEntityTypes(Arrays.asList(getEntityType(ENTITY_TYPE_2_1)));
-
- <br/>entityContainer = new EntityContainer();
- <br/>entityContainer.setName(ENTITY_CONTAINER_2);
- <br/>entityContainer.setEntitySets(Arrays.asList(getEntitySet(ENTITY_CONTAINER_2, ENTITY_SET_2_1)));
- <br/>schema.setEntityContainers(Arrays.asList(entityContainer));
-
- <br/>schemas.add(schema);
-</p>
- <p>return schemas;</p>
- }
-
- <p>public EntityType getEntityType(FullQualifiedName edmFQName) throws ODataException {
- <p>if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
- <br/>if (ENTITY_TYPE_1_1.getName().equals(edmFQName.getName())) {
- <br/>List<Property> properties = new ArrayList<Property>();
- <br/>properties.add(new SimpleProperty().setName("EmployeeId").setType(EdmSimpleTypeKind.String)
- .setFacets(new Facets().setNullable(false))
- .setMapping(new Mapping().setInternalName("getId")));
- <br/>properties.add(new SimpleProperty().setName("EmployeeName").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
- <br/>properties.add(new SimpleProperty().setName("ManagerId").setType(EdmSimpleTypeKind.String)
- .setMapping(new Mapping().setInternalName("getManager.getId")));
- <br/>properties.add(new SimpleProperty().setName("RoomId").setType(EdmSimpleTypeKind.String)
- .setMapping(new Mapping().setInternalName("getRoom.getId")));
- <br/>properties.add(new SimpleProperty().setName("TeamId").setType(EdmSimpleTypeKind.String)
- .setFacets(new Facets().setMaxLength(2))
- .setMapping(new Mapping().setInternalName("getTeam.getId")));
- <br/>properties.add(new ComplexProperty().setName("Location").setType(COMPLEX_TYPE_1)
- .setFacets(new Facets().setNullable(false)));
- <br/>properties.add(new SimpleProperty().setName("Age").setType(EdmSimpleTypeKind.Int16));
- <br/>properties.add(new SimpleProperty().setName("EntryDate").setType(EdmSimpleTypeKind.DateTime)
- .setFacets(new Facets().setNullable(true))
- .setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcTargetPath(EdmTargetPath.SYNDICATION_UPDATED)));
- <br/>properties.add(new SimpleProperty().setName("ImageUrl").setType(EdmSimpleTypeKind.String)
- .setMapping(new Mapping().setInternalName("getImageUri")));
- <br/>List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
- <br/>navigationProperties.add(new NavigationProperty().setName("ne_Manager")
- .setRelationship(ASSOCIATION_1_1).setFromRole(ROLE_1_1).setToRole(ROLE_1_4));
-
- <br/>return new EntityType().setName(ENTITY_TYPE_1_1.getName())
- .setProperties(properties)
- .setHasStream(true)
- .setKey(getKey("EmployeeId"))
- .setNavigationProperties(navigationProperties)
- .setMapping(new Mapping().setMimeType("getImageType"));
-
- <p>} else if (ENTITY_TYPE_1_BASE.getName().equals(edmFQName.getName())) {
- <br/>List<Property> properties = new ArrayList<Property>();
- <br/>properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.String)
- .setFacets(new Facets().setNullable(false).setDefaultValue("1")));
- <br/>properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
-
- <br/>return new EntityType().setName(ENTITY_TYPE_1_BASE.getName())
- .setAbstract(true)
- .setProperties(properties)
- .setKey(getKey("Id"));
-
- <p>} else if (ENTITY_TYPE_1_4.getName().equals(edmFQName.getName())) {
- <br/>List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
- <br/>navigationProperties.add(new NavigationProperty().setName("nm_Employees")
- .setRelationship(ASSOCIATION_1_1).setFromRole(ROLE_1_4).setToRole(ROLE_1_1));
-
- <br/>return new EntityType().setName(ENTITY_TYPE_1_4.getName())
- .setBaseType(ENTITY_TYPE_1_1)
- .setHasStream(true)
- .setNavigationProperties(navigationProperties)
- .setMapping(new Mapping().setMimeType("getImageType"));
-
- <p>} else if (NAMESPACE_2.equals(edmFQName.getNamespace())) {
- <br/>if (ENTITY_TYPE_2_1.getName().equals(edmFQName.getName())) {
- <br/>List<Property> properties = new ArrayList<Property>();
- <br/>properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.Int32)
- .setFacets(new Facets().setNullable(false).setConcurrencyMode(EdmConcurrencyMode.Fixed)));
- <br/>properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
- <br/>properties.add(new SimpleProperty().setName("Type").setType(EdmSimpleTypeKind.String)
- .setFacets(new Facets().setNullable(false)));
- <br/>properties.add(new SimpleProperty().setName("ImageUrl").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI))
- .setMapping(new Mapping().setInternalName("getImageUri")));
- <br/>properties.add(new SimpleProperty().setName("Image").setType(EdmSimpleTypeKind.Binary)
- .setMapping(new Mapping().setMimeType("getImageType")));
- <br/>properties.add(new SimpleProperty().setName("BinaryData").setType(EdmSimpleTypeKind.Binary)
- .setFacets(new Facets().setNullable(true))
- .setMimeType("image/jpeg"));
- <br/>properties.add(new SimpleProperty().setName("Содержание").setType(EdmSimpleTypeKind.String)
- .setFacets(new Facets().setNullable(true))
- .setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcKeepInContent(false)
- .setFcNsPrefix("ру") // CYRILLIC SMALL LETTER ER + CYRILLIC SMALL LETTER U
- .setFcNsUri("http://localhost")
- .setFcTargetPath("Содержание"))
- .setMapping(new Mapping().setInternalName("getContent")));
-
- <br/>return new EntityType().setName(ENTITY_TYPE_2_1.getName())
- .setProperties(properties)
- .setHasStream(true)
- .setKey(getKey("Id", "Type"))
- .setMapping(new Mapping().setMimeType("getType"));
- }
- }
- }
- <p>return null;
- }
-
- <p>public ComplexType getComplexType(FullQualifiedName edmFQName) throws ODataException {
- <br/>if (NAMESPACE_1.equals(edmFQName.getNamespace()))
- <br/>if (COMPLEX_TYPE_1.getName().equals(edmFQName.getName())) {
- <br/>List<Property> properties = new ArrayList<Property>();
- <br/>properties.add(new ComplexProperty().setName("City").setType(COMPLEX_TYPE_2));
- <br/>properties.add(new SimpleProperty().setName("Country").setType(EdmSimpleTypeKind.String));
- <br/>return new ComplexType().setName(COMPLEX_TYPE_1.getName()).setProperties(properties);
-
- } <br/>else if (COMPLEX_TYPE_2.getName().equals(edmFQName.getName())) {
- <br/>List<Property> properties = new ArrayList<Property>();
- <br/>properties.add(new SimpleProperty().setName("PostalCode").setType(EdmSimpleTypeKind.String));
- <br/>properties.add(new SimpleProperty().setName("CityName").setType(EdmSimpleTypeKind.String));
- <br/>return new ComplexType().setName(COMPLEX_TYPE_2.getName()).setProperties(properties);
- }
-
- <br/>return null;
- }
-
- <p>public Association getAssociation(FullQualifiedName edmFQName) throws ODataException {
- <br/>if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
- <br/>if (ASSOCIATION_1_1.getName().equals(edmFQName.getName())) {
- <br/>return new Association().setName(ASSOCIATION_1_1.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_4).setRole(ROLE_1_4).setMultiplicity(EdmMultiplicity.ONE));
- }
- }
- <br/>return null;
- }
-
- <p>public EntityContainerInfo getEntityContainerInfo(String name) throws ODataException {
- <br/>if (name == null || ENTITY_CONTAINER_1.equals(name)) {
- <br/>return new EntityContainerInfo().setName(ENTITY_CONTAINER_1).setDefaultEntityContainer(true);
- } <br/>else if (ENTITY_CONTAINER_2.equals(name)) {
- <br/>return new EntityContainerInfo().setName(name).setDefaultEntityContainer(false);
- }
- <br/>return null;
- }
-
- <p>public EntitySet getEntitySet(String entityContainer, String name) throws ODataException {
- <br/>if (ENTITY_CONTAINER_1.equals(entityContainer)) {
- <br/>if (ENTITY_SET_1_1.equals(name)) {
- <br/>return new EntitySet().setName(name).setEntityType(ENTITY_TYPE_1_1);
- }
- } <br/>else if (ENTITY_CONTAINER_2.equals(entityContainer)) {
- <br/>if (ENTITY_SET_2_1.equals(name)) {
- <br/>return new EntitySet().setName(name).setEntityType(ENTITY_TYPE_2_1);
- }
- }
- <br/>return null;
- }
-
- <p>public FunctionImport getFunctionImport(String entityContainer, String name) throws ODataException {
- <br/>if (ENTITY_CONTAINER_1.equals(entityContainer)) {
- <br/>if (FUNCTION_IMPORT_1.equals(name)) {
- <br/>List<FunctionImportParameter> parameters = new ArrayList<FunctionImportParameter>();
- <br/>parameters.add(new FunctionImportParameter().setName("q").setType(EdmSimpleTypeKind.String)
- .setFacets(new Facets().setNullable(true)));
- <br/>return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(ENTITY_TYPE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEntitySet(ENTITY_SET_1_1)
- .setHttpMethod("GET")
- .setParameters(parameters);
-
- } <br/>else if (FUNCTION_IMPORT_2.equals(name)) {
- <br/>return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(COMPLEX_TYPE_1).setMultiplicity(EdmMultiplicity.MANY))
- .setHttpMethod("GET");
-
- }
- }
-
- <br/>return null;
- }
-
- <p>public AssociationSet getAssociationSet(String entityContainer, FullQualifiedName association, String sourceEntitySetName, String sourceEntitySetRole) throws ODataException {
- <br/>if (ENTITY_CONTAINER_1.equals(entityContainer))
- <br/>if (ASSOCIATION_1_1.equals(association))
- <br/>return new AssociationSet().setName(ASSOCIATION_1_1.getName())
- .setAssociation(ASSOCIATION_1_1)
- .setEnd1(new AssociationSetEnd().setRole(ROLE_1_4).setEntitySet(ENTITY_SET_1_4))
- .setEnd2(new AssociationSetEnd().setRole(ROLE_1_1).setEntitySet(ENTITY_SET_1_1));
-
- <br/>return null;
- }
-}
-</p>
+ * <p>public static final String NAMESPACE_1 = "RefScenario";
+ * <br/>public static final String NAMESPACE_2 = "RefScenario2";
+ * <br/>private static final FullQualifiedName ENTITY_TYPE_1_1 = new FullQualifiedName(NAMESPACE_1, "Employee");
+ * <br/>private static final FullQualifiedName ENTITY_TYPE_1_BASE = new FullQualifiedName(NAMESPACE_1, "Base");
+ * <br/>private static final FullQualifiedName ENTITY_TYPE_1_4 = new FullQualifiedName(NAMESPACE_1, "Manager");
+ * <br/>private static final FullQualifiedName ENTITY_TYPE_2_1 = new FullQualifiedName(NAMESPACE_2, "Photo");
+ * <br/>private static final FullQualifiedName COMPLEX_TYPE_1 = new FullQualifiedName(NAMESPACE_1, "c_Location");
+ * <br/>private static final FullQualifiedName COMPLEX_TYPE_2 = new FullQualifiedName(NAMESPACE_1, "c_City");
+ * <br/>private static final FullQualifiedName ASSOCIATION_1_1 = new FullQualifiedName(NAMESPACE_1, "ManagerEmployees");
+ * <br/>private static final String ROLE_1_1 = "r_Employees";
+ * <br/>private static final String ROLE_1_4 = "r_Manager";
+ * <br/>private static final String ENTITY_CONTAINER_1 = "Container1";
+ * <br/>private static final String ENTITY_CONTAINER_2 = "Container2";
+ * <br/>private static final String ENTITY_SET_1_1 = "Employees";
+ * <br/>private static final String ENTITY_SET_1_4 = "Managers";
+ * <br/>private static final String ENTITY_SET_2_1 = "Photos";
+ * <br/>private static final String FUNCTION_IMPORT_1 = "EmployeeSearch";
+ * <br/>private static final String FUNCTION_IMPORT_2 = "AllLocations";
+ * </p>
+ * <p>public List<Schema> getSchemas() throws ODataException {
+ * <p>List<Schema> schemas = new ArrayList<Schema>();
+ * <br/>Schema schema = new Schema();
+ * <br/>schema.setNamespace(NAMESPACE_1);
+ *
+ * <br/>List<EntityType> entityTypes = new ArrayList<EntityType>();
+ * <br/>entityTypes.add(getEntityType(ENTITY_TYPE_1_1));
+ * <br/>entityTypes.add(getEntityType(ENTITY_TYPE_1_4));
+ * <br/>entityTypes.add(getEntityType(ENTITY_TYPE_1_BASE));
+ * <br/>schema.setEntityTypes(entityTypes);
+ *
+ * <br/>List<ComplexType> complexTypes = new ArrayList<ComplexType>();
+ * <br/>complexTypes.add(getComplexType(COMPLEX_TYPE_1));
+ * <br/>complexTypes.add(getComplexType(COMPLEX_TYPE_2));
+ * <br/>schema.setComplexTypes(complexTypes);
+ *
+ * <br/>List<Association> associations = new ArrayList<Association>();
+ * <br/>associations.add(getAssociation(ASSOCIATION_1_1));
+ * <br/>schema.setAssociations(associations);
+ *
+ * <br/>EntityContainer entityContainer = new EntityContainer();
+ * <br/>entityContainer.setName(ENTITY_CONTAINER_1).setDefaultEntityContainer(true);
+ *
+ * <br/>List<EntitySet> entitySets = new ArrayList<EntitySet>();
+ * <br/>entitySets.add(getEntitySet(ENTITY_CONTAINER_1, ENTITY_SET_1_1));
+ * <br/>entitySets.add(getEntitySet(ENTITY_CONTAINER_1, ENTITY_SET_1_4));
+ * <br/>entityContainer.setEntitySets(entitySets);
+ *
+ * <br/>List<AssociationSet> associationSets = new ArrayList<AssociationSet>();
+ * <br/>associationSets.add(getAssociationSet(ENTITY_CONTAINER_1, ASSOCIATION_1_1, ENTITY_SET_1_4, ROLE_1_4));
+ * <br/>entityContainer.setAssociationSets(associationSets);
+ *
+ * <br/>List<FunctionImport> functionImports = new ArrayList<FunctionImport>();
+ * <br/>functionImports.add(getFunctionImport(ENTITY_CONTAINER_1, FUNCTION_IMPORT_1));
+ * <br/>functionImports.add(getFunctionImport(ENTITY_CONTAINER_1, FUNCTION_IMPORT_2));
+ * <br/>entityContainer.setFunctionImports(functionImports);
+ *
+ * <br/>schema.setEntityContainers(Arrays.asList(entityContainer));
+ *
+ * <br/>schemas.add(schema);
+ * </p>
+ * <p>schema = new Schema();
+ * <br/>schema.setNamespace(NAMESPACE_2);
+ *
+ * <br/>schema.setEntityTypes(Arrays.asList(getEntityType(ENTITY_TYPE_2_1)));
+ *
+ * <br/>entityContainer = new EntityContainer();
+ * <br/>entityContainer.setName(ENTITY_CONTAINER_2);
+ * <br/>entityContainer.setEntitySets(Arrays.asList(getEntitySet(ENTITY_CONTAINER_2, ENTITY_SET_2_1)));
+ * <br/>schema.setEntityContainers(Arrays.asList(entityContainer));
+ *
+ * <br/>schemas.add(schema);
+ * </p>
+ * <p>return schemas;</p>
+ * }
+ *
+ * <p>public EntityType getEntityType(FullQualifiedName edmFQName) throws ODataException {
+ * <p>if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
+ * <br/>if (ENTITY_TYPE_1_1.getName().equals(edmFQName.getName())) {
+ * <br/>List<Property> properties = new ArrayList<Property>();
+ * <br/>properties.add(new SimpleProperty().setName("EmployeeId").setType(EdmSimpleTypeKind.String)
+ * .setFacets(new Facets().setNullable(false))
+ * .setMapping(new Mapping().setInternalName("getId")));
+ * <br/>properties.add(new SimpleProperty().setName("EmployeeName").setType(EdmSimpleTypeKind.String)
+ * .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ * .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
+ * <br/>properties.add(new SimpleProperty().setName("ManagerId").setType(EdmSimpleTypeKind.String)
+ * .setMapping(new Mapping().setInternalName("getManager.getId")));
+ * <br/>properties.add(new SimpleProperty().setName("RoomId").setType(EdmSimpleTypeKind.String)
+ * .setMapping(new Mapping().setInternalName("getRoom.getId")));
+ * <br/>properties.add(new SimpleProperty().setName("TeamId").setType(EdmSimpleTypeKind.String)
+ * .setFacets(new Facets().setMaxLength(2))
+ * .setMapping(new Mapping().setInternalName("getTeam.getId")));
+ * <br/>properties.add(new ComplexProperty().setName("Location").setType(COMPLEX_TYPE_1)
+ * .setFacets(new Facets().setNullable(false)));
+ * <br/>properties.add(new SimpleProperty().setName("Age").setType(EdmSimpleTypeKind.Int16));
+ * <br/>properties.add(new SimpleProperty().setName("EntryDate").setType(EdmSimpleTypeKind.DateTime)
+ * .setFacets(new Facets().setNullable(true))
+ * .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ * .setFcTargetPath(EdmTargetPath.SYNDICATION_UPDATED)));
+ * <br/>properties.add(new SimpleProperty().setName("ImageUrl").setType(EdmSimpleTypeKind.String)
+ * .setMapping(new Mapping().setInternalName("getImageUri")));
+ * <br/>List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
+ * <br/>navigationProperties.add(new NavigationProperty().setName("ne_Manager")
+ * .setRelationship(ASSOCIATION_1_1).setFromRole(ROLE_1_1).setToRole(ROLE_1_4));
+ *
+ * <br/>return new EntityType().setName(ENTITY_TYPE_1_1.getName())
+ * .setProperties(properties)
+ * .setHasStream(true)
+ * .setKey(getKey("EmployeeId"))
+ * .setNavigationProperties(navigationProperties)
+ * .setMapping(new Mapping().setMimeType("getImageType"));
+ *
+ * <p>} else if (ENTITY_TYPE_1_BASE.getName().equals(edmFQName.getName())) {
+ * <br/>List<Property> properties = new ArrayList<Property>();
+ * <br/>properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.String)
+ * .setFacets(new Facets().setNullable(false).setDefaultValue("1")));
+ * <br/>properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
+ * .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ * .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
+ *
+ * <br/>return new EntityType().setName(ENTITY_TYPE_1_BASE.getName())
+ * .setAbstract(true)
+ * .setProperties(properties)
+ * .setKey(getKey("Id"));
+ *
+ * <p>} else if (ENTITY_TYPE_1_4.getName().equals(edmFQName.getName())) {
+ * <br/>List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
+ * <br/>navigationProperties.add(new NavigationProperty().setName("nm_Employees")
+ * .setRelationship(ASSOCIATION_1_1).setFromRole(ROLE_1_4).setToRole(ROLE_1_1));
+ *
+ * <br/>return new EntityType().setName(ENTITY_TYPE_1_4.getName())
+ * .setBaseType(ENTITY_TYPE_1_1)
+ * .setHasStream(true)
+ * .setNavigationProperties(navigationProperties)
+ * .setMapping(new Mapping().setMimeType("getImageType"));
+ *
+ * <p>} else if (NAMESPACE_2.equals(edmFQName.getNamespace())) {
+ * <br/>if (ENTITY_TYPE_2_1.getName().equals(edmFQName.getName())) {
+ * <br/>List<Property> properties = new ArrayList<Property>();
+ * <br/>properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.Int32)
+ * .setFacets(new Facets().setNullable(false).setConcurrencyMode(EdmConcurrencyMode.Fixed)));
+ * <br/>properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
+ * .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ * .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
+ * <br/>properties.add(new SimpleProperty().setName("Type").setType(EdmSimpleTypeKind.String)
+ * .setFacets(new Facets().setNullable(false)));
+ * <br/>properties.add(new SimpleProperty().setName("ImageUrl").setType(EdmSimpleTypeKind.String)
+ * .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ * .setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI))
+ * .setMapping(new Mapping().setInternalName("getImageUri")));
+ * <br/>properties.add(new SimpleProperty().setName("Image").setType(EdmSimpleTypeKind.Binary)
+ * .setMapping(new Mapping().setMimeType("getImageType")));
+ * <br/>properties.add(new SimpleProperty().setName("BinaryData").setType(EdmSimpleTypeKind.Binary)
+ * .setFacets(new Facets().setNullable(true))
+ * .setMimeType("image/jpeg"));
+ * <br/>properties.add(new SimpleProperty().setName("Содержание").setType(EdmSimpleTypeKind.String)
+ * .setFacets(new Facets().setNullable(true))
+ * .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ * .setFcKeepInContent(false)
+ * .setFcNsPrefix("ру") // CYRILLIC SMALL LETTER ER + CYRILLIC SMALL LETTER U
+ * .setFcNsUri("http://localhost")
+ * .setFcTargetPath("Содержание"))
+ * .setMapping(new Mapping().setInternalName("getContent")));
+ *
+ * <br/>return new EntityType().setName(ENTITY_TYPE_2_1.getName())
+ * .setProperties(properties)
+ * .setHasStream(true)
+ * .setKey(getKey("Id", "Type"))
+ * .setMapping(new Mapping().setMimeType("getType"));
+ * }
+ * }
+ * }
+ * <p>return null;
+ * }
+ *
+ * <p>public ComplexType getComplexType(FullQualifiedName edmFQName) throws ODataException {
+ * <br/>if (NAMESPACE_1.equals(edmFQName.getNamespace()))
+ * <br/>if (COMPLEX_TYPE_1.getName().equals(edmFQName.getName())) {
+ * <br/>List<Property> properties = new ArrayList<Property>();
+ * <br/>properties.add(new ComplexProperty().setName("City").setType(COMPLEX_TYPE_2));
+ * <br/>properties.add(new SimpleProperty().setName("Country").setType(EdmSimpleTypeKind.String));
+ * <br/>return new ComplexType().setName(COMPLEX_TYPE_1.getName()).setProperties(properties);
+ *
+ * } <br/>else if (COMPLEX_TYPE_2.getName().equals(edmFQName.getName())) {
+ * <br/>List<Property> properties = new ArrayList<Property>();
+ * <br/>properties.add(new SimpleProperty().setName("PostalCode").setType(EdmSimpleTypeKind.String));
+ * <br/>properties.add(new SimpleProperty().setName("CityName").setType(EdmSimpleTypeKind.String));
+ * <br/>return new ComplexType().setName(COMPLEX_TYPE_2.getName()).setProperties(properties);
+ * }
+ *
+ * <br/>return null;
+ * }
+ *
+ * <p>public Association getAssociation(FullQualifiedName edmFQName) throws ODataException {
+ * <br/>if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
+ * <br/>if (ASSOCIATION_1_1.getName().equals(edmFQName.getName())) {
+ * <br/>return new Association().setName(ASSOCIATION_1_1.getName())
+ * .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ * .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_4).setRole(ROLE_1_4).setMultiplicity(EdmMultiplicity.ONE));
+ * }
+ * }
+ * <br/>return null;
+ * }
+ *
+ * <p>public EntityContainerInfo getEntityContainerInfo(String name) throws ODataException {
+ * <br/>if (name == null || ENTITY_CONTAINER_1.equals(name)) {
+ * <br/>return new EntityContainerInfo().setName(ENTITY_CONTAINER_1).setDefaultEntityContainer(true);
+ * } <br/>else if (ENTITY_CONTAINER_2.equals(name)) {
+ * <br/>return new EntityContainerInfo().setName(name).setDefaultEntityContainer(false);
+ * }
+ * <br/>return null;
+ * }
+ *
+ * <p>public EntitySet getEntitySet(String entityContainer, String name) throws ODataException {
+ * <br/>if (ENTITY_CONTAINER_1.equals(entityContainer)) {
+ * <br/>if (ENTITY_SET_1_1.equals(name)) {
+ * <br/>return new EntitySet().setName(name).setEntityType(ENTITY_TYPE_1_1);
+ * }
+ * } <br/>else if (ENTITY_CONTAINER_2.equals(entityContainer)) {
+ * <br/>if (ENTITY_SET_2_1.equals(name)) {
+ * <br/>return new EntitySet().setName(name).setEntityType(ENTITY_TYPE_2_1);
+ * }
+ * }
+ * <br/>return null;
+ * }
+ *
+ * <p>public FunctionImport getFunctionImport(String entityContainer, String name) throws ODataException {
+ * <br/>if (ENTITY_CONTAINER_1.equals(entityContainer)) {
+ * <br/>if (FUNCTION_IMPORT_1.equals(name)) {
+ * <br/>List<FunctionImportParameter> parameters = new ArrayList<FunctionImportParameter>();
+ * <br/>parameters.add(new FunctionImportParameter().setName("q").setType(EdmSimpleTypeKind.String)
+ * .setFacets(new Facets().setNullable(true)));
+ * <br/>return new FunctionImport().setName(name)
+ * .setReturnType(new ReturnType().setTypeName(ENTITY_TYPE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ * .setEntitySet(ENTITY_SET_1_1)
+ * .setHttpMethod("GET")
+ * .setParameters(parameters);
+ *
+ * } <br/>else if (FUNCTION_IMPORT_2.equals(name)) {
+ * <br/>return new FunctionImport().setName(name)
+ * .setReturnType(new ReturnType().setTypeName(COMPLEX_TYPE_1).setMultiplicity(EdmMultiplicity.MANY))
+ * .setHttpMethod("GET");
+ *
+ * }
+ * }
+ *
+ * <br/>return null;
+ * }
+ *
+ * <p>public AssociationSet getAssociationSet(String entityContainer, FullQualifiedName association, String
+ * sourceEntitySetName, String sourceEntitySetRole) throws ODataException {
+ * <br/>if (ENTITY_CONTAINER_1.equals(entityContainer))
+ * <br/>if (ASSOCIATION_1_1.equals(association))
+ * <br/>return new AssociationSet().setName(ASSOCIATION_1_1.getName())
+ * .setAssociation(ASSOCIATION_1_1)
+ * .setEnd1(new AssociationSetEnd().setRole(ROLE_1_4).setEntitySet(ENTITY_SET_1_4))
+ * .setEnd2(new AssociationSetEnd().setRole(ROLE_1_1).setEntitySet(ENTITY_SET_1_1));
+ *
+ * <br/>return null;
+ * }
+ * }
+ * </p>
*/
package org.apache.olingo.odata2.api.edm.provider;
[50/59] [abbrv] git commit: cleanup of jpa api
Posted by ch...@apache.org.
cleanup of jpa api
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/da6d5ca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/da6d5ca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/da6d5ca1
Branch: refs/heads/master
Commit: da6d5ca1a80f515ad7dac71c8765e0e653c8b423
Parents: afcc636
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 15:05:04 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 15:05:04 2013 +0200
----------------------------------------------------------------------
.../processor/api/jpa/ODataJPAContext.java | 53 ++++----
.../processor/api/jpa/ODataJPAProcessor.java | 39 +++---
.../api/jpa/ODataJPAServiceFactory.java | 57 ++++-----
.../processor/api/jpa/access/JPAEdmBuilder.java | 67 ++++------
.../jpa/access/JPAEdmMappingModelAccess.java | 94 +++++++-------
.../processor/api/jpa/access/JPAFunction.java | 31 ++---
.../processor/api/jpa/access/JPAJoinClause.java | 56 ++++-----
.../api/jpa/access/JPAMethodContext.java | 43 ++++---
.../api/jpa/access/JPAMethodContextView.java | 28 ++---
.../processor/api/jpa/access/JPAProcessor.java | 87 ++++++-------
.../processor/api/jpa/access/package-info.java | 28 ++---
.../api/jpa/exception/ODataJPAException.java | 43 ++++---
.../jpa/exception/ODataJPAMessageService.java | 34 ++---
.../jpa/exception/ODataJPAModelException.java | 81 +++++++-----
.../jpa/exception/ODataJPARuntimeException.java | 87 +++++++------
.../api/jpa/exception/package-info.java | 30 ++---
.../api/jpa/factory/JPAAccessFactory.java | 46 +++----
.../api/jpa/factory/JPQLBuilderFactory.java | 55 ++++-----
.../api/jpa/factory/ODataJPAAccessFactory.java | 59 ++++-----
.../api/jpa/factory/ODataJPAFactory.java | 44 +++----
.../processor/api/jpa/factory/package-info.java | 28 ++---
.../processor/api/jpa/jpql/JPQLContext.java | 67 +++++-----
.../processor/api/jpa/jpql/JPQLContextType.java | 28 ++---
.../processor/api/jpa/jpql/JPQLContextView.java | 31 +++--
.../api/jpa/jpql/JPQLJoinContextView.java | 31 +++--
.../jpql/JPQLJoinSelectSingleContextView.java | 31 +++--
.../api/jpa/jpql/JPQLSelectContextView.java | 28 ++---
.../jpa/jpql/JPQLSelectSingleContextView.java | 28 ++---
.../processor/api/jpa/jpql/JPQLStatement.java | 53 ++++----
.../processor/api/jpa/jpql/package-info.java | 28 ++---
.../api/jpa/model/JPAEdmAssociationEndView.java | 57 ++++-----
.../api/jpa/model/JPAEdmAssociationSetView.java | 30 ++---
.../api/jpa/model/JPAEdmAssociationView.java | 66 +++++-----
.../processor/api/jpa/model/JPAEdmBaseView.java | 40 +++---
.../jpa/model/JPAEdmComplexPropertyView.java | 31 +++--
.../api/jpa/model/JPAEdmComplexTypeView.java | 56 ++++-----
.../jpa/model/JPAEdmEntityContainerView.java | 37 +++---
.../api/jpa/model/JPAEdmEntitySetView.java | 36 +++---
.../api/jpa/model/JPAEdmEntityTypeView.java | 38 +++---
.../api/jpa/model/JPAEdmExtension.java | 38 +++---
.../api/jpa/model/JPAEdmFunctionImportView.java | 33 +++--
.../processor/api/jpa/model/JPAEdmKeyView.java | 33 +++--
.../processor/api/jpa/model/JPAEdmMapping.java | 34 ++---
.../api/jpa/model/JPAEdmModelView.java | 34 +++--
.../jpa/model/JPAEdmNavigationPropertyView.java | 34 +++--
.../api/jpa/model/JPAEdmPropertyView.java | 47 ++++---
.../JPAEdmReferentialConstraintRoleView.java | 36 +++---
.../model/JPAEdmReferentialConstraintView.java | 31 +++--
.../api/jpa/model/JPAEdmSchemaView.java | 55 ++++-----
.../jpa/model/mapping/JPAAttributeMapType.java | 115 ++++++++---------
.../jpa/model/mapping/JPAEdmMappingModel.java | 43 +++----
.../mapping/JPAEdmMappingModelFactory.java | 26 ++--
.../model/mapping/JPAEmbeddableTypeMapType.java | 95 +++++++-------
.../mapping/JPAEmbeddableTypesMapType.java | 45 +++----
.../jpa/model/mapping/JPAEntityTypeMapType.java | 123 +++++++++----------
.../model/mapping/JPAEntityTypesMapType.java | 45 +++----
.../mapping/JPAPersistenceUnitMapType.java | 59 ++++-----
.../model/mapping/JPARelationshipMapType.java | 73 ++++++-----
.../api/jpa/model/mapping/package-info.java | 31 ++---
.../processor/api/jpa/model/package-info.java | 30 ++---
.../odata2/processor/api/jpa/package-info.java | 30 ++---
61 files changed, 1407 insertions(+), 1489 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
index 0f7027b..83dc6a4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa;
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmExtension;
* <li>An instance of Java Persistence Entity Manager Factory</li>
* </ol>
*
- * <br>
+ * <br>
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
* @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAAccessFactory
@@ -56,7 +56,7 @@ public interface ODataJPAContext {
* The method sets the Java Persistence Unit Name into the context.
*
* @param pUnitName
- * is the Java Persistence Unit Name.
+ * is the Java Persistence Unit Name.
*
*/
public void setPersistenceUnitName(String pUnitName);
@@ -72,9 +72,8 @@ public interface ODataJPAContext {
* The method sets the OData Processor for JPA into the context.
*
* @param processor
- * is the specific implementation of
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAProcessor}
- * for processing OData service requests.
+ * is the specific implementation of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAProcessor} for
+ * processing OData service requests.
*/
public void setODataProcessor(ODataProcessor processor);
@@ -89,9 +88,8 @@ public interface ODataJPAContext {
* The method sets EDM provider into the context
*
* @param edmProvider
- * is the specific implementation of
- * {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider} for
- * transforming Java persistence models to Entity Data Model
+ * is the specific implementation of {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider} for
+ * transforming Java persistence models to Entity Data Model
*
*/
public void setEdmProvider(EdmProvider edmProvider);
@@ -112,7 +110,7 @@ public interface ODataJPAContext {
* context.
*
* @param emf
- * is of type {@link javax.persistence.EntityManagerFactory}
+ * is of type {@link javax.persistence.EntityManagerFactory}
*
*/
public void setEntityManagerFactory(EntityManagerFactory emf);
@@ -128,8 +126,7 @@ public interface ODataJPAContext {
* The method sets OData context into the context.
*
* @param ctx
- * is an OData context of type
- * {@link org.apache.olingo.odata2.api.processor.ODataContext}
+ * is an OData context of type {@link org.apache.olingo.odata2.api.processor.ODataContext}
*/
public void setODataContext(ODataContext ctx);
@@ -138,7 +135,7 @@ public interface ODataJPAContext {
* mapping model is an XML document based on JPAEDMMappingModel.xsd
*
* @param name
- * is the name of JPA EDM mapping model
+ * is the name of JPA EDM mapping model
*/
public void setJPAEdmMappingModel(String name);
@@ -165,8 +162,7 @@ public interface ODataJPAContext {
* several times overwrites already set extension instance in the context.
*
* @param jpaEdmExtension
- * is an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmExtension}
+ * is an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmExtension}
*
*/
public void setJPAEdmExtension(JPAEdmExtension jpaEdmExtension);
@@ -174,7 +170,8 @@ public interface ODataJPAContext {
/**
* The method returns the JPA Edm Extension instance set into the context.
*
- * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEmbeddableTypeMapType}
+ * @return an instance of type
+ * {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEmbeddableTypeMapType}
*/
public JPAEdmExtension getJPAEdmExtension();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
index 4513445..441d38e 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa;
@@ -27,23 +27,20 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
* Extend this class and implement an OData JPA processor if the default
* behavior of OData JPA Processor library has to be overwritten.
*
- *
+ *
*
*
*/
public abstract class ODataJPAProcessor extends ODataSingleProcessor {
/**
- * An instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext} object
+ * An instance of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext} object
*/
protected ODataJPAContext oDataJPAContext;
/**
- * An instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAProcessor}. The
- * instance is created using
- * {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory}.
+ * An instance of {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAProcessor}. The
+ * instance is created using {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory}.
*/
protected JPAProcessor jpaProcessor;
@@ -59,7 +56,7 @@ public abstract class ODataJPAProcessor extends ODataSingleProcessor {
* Constructor
*
* @param oDataJPAContext
- * non null OData JPA Context object
+ * non null OData JPA Context object
*/
public ODataJPAProcessor(final ODataJPAContext oDataJPAContext) {
if (oDataJPAContext == null) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java
index ae38e2e..7ad7243 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa;
@@ -30,8 +30,8 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
/**
* <p>
- * Extend this factory class and create own instance of
- * {@link org.apache.olingo.odata2.api.ODataService} that transforms Java Persistence
+ * Extend this factory class and create own instance of {@link org.apache.olingo.odata2.api.ODataService} that
+ * transforms Java Persistence
* Models into an OData Service. The factory class instantiates instances of
* type {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider} and
* {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor}. The OData
@@ -40,8 +40,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
* </p>
* <p>
* The factory implementation is passed as servlet init parameter to a JAX-RS
- * runtime which will instantiate a {@link org.apache.olingo.odata2.api.ODataService}
- * implementation using this factory.
+ * runtime which will instantiate a {@link org.apache.olingo.odata2.api.ODataService} implementation using this factory.
* </p>
*
* <p>
@@ -52,8 +51,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
*
* <b>Sample Configuration:</b>
*
- * <pre>
- * {@code
+ * <pre> {@code
* <servlet>
* <servlet-name>ReferenceScenarioServlet</servlet-name>
* <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
@@ -71,8 +69,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
* </init-param>
* <load-on-startup>1</load-on-startup>
* </servlet>
- * }
- * </pre>
+ * } </pre>
*/
public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
@@ -121,17 +118,16 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
/**
* Implement this method and initialize OData JPA Context. It is mandatory
- * to set an instance of type {@link javax.persistence.EntityManagerFactory}
- * into the context. An exception of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException}
- * is thrown if EntityManagerFactory is not initialized. <br>
+ * to set an instance of type {@link javax.persistence.EntityManagerFactory} into the context. An exception of type
+ * {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException} is thrown if
+ * EntityManagerFactory is not initialized. <br>
* <br>
* <b>Sample Code:</b> <code>
- * <p>public class JPAReferenceServiceFactory extends ODataJPAServiceFactory{</p>
- *
- * <blockquote>private static final String PUNIT_NAME = "punit";
+ * <p>public class JPAReferenceServiceFactory extends ODataJPAServiceFactory{</p>
+ *
+ * <blockquote>private static final String PUNIT_NAME = "punit";
* <br>
- * public ODataJPAContext initializeODataJPAContext() {
+ * public ODataJPAContext initializeODataJPAContext() {
* <blockquote>ODataJPAContext oDataJPAContext = this.getODataJPAContext();
* <br>
* EntityManagerFactory emf = Persistence.createEntityManagerFactory(PUNIT_NAME);
@@ -143,8 +139,7 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
* } </code>
* <p>
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
* @throws ODataJPARuntimeException
*/
public abstract ODataJPAContext initializeODataJPAContext() throws ODataJPARuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java
index 30d7f1c..110a1f1 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.access;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
* JPAEdmBuilder interface provides methods for building elements of an Entity Data Model (EDM) from
* a Java Persistence Model.
*
- *
+ *
*
*/
public interface JPAEdmBuilder {
@@ -34,37 +34,20 @@ public interface JPAEdmBuilder {
* processes EDM JPA Containers which could be accessed using the following
* views,
* <ul>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView}
- * </li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}</li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView} </li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}</li>
* <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmBaseView}</li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView}
- * </li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}</li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}
- * </li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}</li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}</li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView} </li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}</li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView} </li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}</li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}</li>
* <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView}</li>
* <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView}</li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
- * </li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView}</li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView}
- * </li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
- * </li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView} </li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView}</li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView} </li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView} </li>
* <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView}</li>
* </ul>
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
index 59ca79a..216db55 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.access;
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingMod
/**
* Interface provides methods to access JPA EDM mapping model.
*
- *
+ *
* @see JPAEdmMappingModel
*
*/
@@ -31,9 +31,8 @@ public interface JPAEdmMappingModelAccess {
/**
* The method searches and loads the mapping model stored in <file>.xml
- * file into the java object
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingModel}
- * . The name of the file is set into ODataJPAContext method.
+ * file into the java object {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingModel} . The
+ * name of the file is set into ODataJPAContext method.
*
* @see org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext#setJPAEdmMappingModel(String)
*/
@@ -43,7 +42,7 @@ public interface JPAEdmMappingModelAccess {
* The method returns if there exists a mapping model.
*
* @return true - if there exists a mapping model for the OData service else
- * false
+ * false
*/
public boolean isMappingModelExists();
@@ -51,8 +50,7 @@ public interface JPAEdmMappingModelAccess {
* The method returns a JPA EDM mapping model Java object. The mapping model
* in XML files is un-marshaled into the Java object.
*
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingModel}
+ * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingModel}
*/
public JPAEdmMappingModel getJPAEdmMappingModel();
@@ -60,9 +58,9 @@ public interface JPAEdmMappingModelAccess {
* The method returns EDM Schema namespace for the persistence unit name
*
* @param persistenceUnitName
- * is the Java persistence unit name
+ * is the Java persistence unit name
* @return EDM schema name space mapped to Java persistence unit name or
- * null if no mapping is available
+ * null if no mapping is available
*/
public String mapJPAPersistenceUnit(String persistenceUnitName);
@@ -71,9 +69,9 @@ public interface JPAEdmMappingModelAccess {
* type name
*
* @param jpaEntityTypeName
- * is the Java persistence entity type name
+ * is the Java persistence entity type name
* @return EDM entity type name mapped to Java persistence entity type name
- * or null if no mapping is available
+ * or null if no mapping is available
*/
public String mapJPAEntityType(String jpaEntityTypeName);
@@ -82,9 +80,9 @@ public interface JPAEdmMappingModelAccess {
* type name
*
* @param jpaEntityTypeName
- * is the Java persistence entity type name
+ * is the Java persistence entity type name
* @return EDM entity set name mapped to Java persistence entity type name
- * or null if no mapping is available
+ * or null if no mapping is available
*/
public String mapJPAEntitySet(String jpaEntityTypeName);
@@ -93,11 +91,11 @@ public interface JPAEdmMappingModelAccess {
* attribute name.
*
* @param jpaEntityTypeName
- * is the Java persistence entity type name
+ * is the Java persistence entity type name
* @param jpaAttributeName
- * is the Java persistence attribute name
+ * is the Java persistence attribute name
* @return EDM property name mapped to Java persistence attribute name or
- * null if no mapping is available
+ * null if no mapping is available
*/
public String mapJPAAttribute(String jpaEntityTypeName, String jpaAttributeName);
@@ -106,11 +104,11 @@ public interface JPAEdmMappingModelAccess {
* entity relationship name.
*
* @param jpaEntityTypeName
- * is the Java persistence entity type name
+ * is the Java persistence entity type name
* @param jpaRelationshipName
- * is the Java persistence relationship name
+ * is the Java persistence relationship name
* @return EDM navigation property name mapped to Java persistence entity
- * relationship name or null if no mapping is available
+ * relationship name or null if no mapping is available
*/
public String mapJPARelationship(String jpaEntityTypeName, String jpaRelationshipName);
@@ -119,9 +117,9 @@ public interface JPAEdmMappingModelAccess {
* name.
*
* @param jpaEmbeddableTypeName
- * is the Java persistence embeddable type name
+ * is the Java persistence embeddable type name
* @return EDM complex type name mapped to Java persistence entity
- * relationship name or null if no mapping is available
+ * relationship name or null if no mapping is available
*/
public String mapJPAEmbeddableType(String jpaEmbeddableTypeName);
@@ -130,11 +128,11 @@ public interface JPAEdmMappingModelAccess {
* type's attribute name.
*
* @param jpaEmbeddableTypeName
- * is the Java persistence
+ * is the Java persistence
* @param jpaAttributeName
- * is the Java persistence attribute name
+ * is the Java persistence attribute name
* @return EDM property name mapped to Java persistence attribute name or
- * null if no mapping is available
+ * null if no mapping is available
*/
public String mapJPAEmbeddableTypeAttribute(String jpaEmbeddableTypeName, String jpaAttributeName);
@@ -143,9 +141,9 @@ public interface JPAEdmMappingModelAccess {
* model
*
* @param jpaEntityTypeName
- * is the name of JPA Entity Type
+ * is the name of JPA Entity Type
* @return <b>true</b> - if JPA Entity should be excluded<br>
- * <b>false</b> - if JPA Entity should be not be excluded
+ * <b>false</b> - if JPA Entity should be not be excluded
*
*/
public boolean checkExclusionOfJPAEntityType(String jpaEntityTypeName);
@@ -155,11 +153,11 @@ public interface JPAEdmMappingModelAccess {
* Entity Type
*
* @param jpaEntityTypeName
- * is the name of JPA Entity Type
+ * is the name of JPA Entity Type
* @param jpaAttributeName
- * is the name of JPA attribute
+ * is the name of JPA attribute
* @return <b>true</b> - if JPA attribute should be excluded<br>
- * <b>false</b> - if JPA attribute should be not be excluded
+ * <b>false</b> - if JPA attribute should be not be excluded
*
*/
public boolean checkExclusionOfJPAAttributeType(String jpaEntityTypeName, String jpaAttributeName);
@@ -169,9 +167,9 @@ public interface JPAEdmMappingModelAccess {
* from EDM model
*
* @param jpaEmbeddableTypeName
- * is the name of JPA Embeddable Type
+ * is the name of JPA Embeddable Type
* @return <b>true</b> - if JPA Embeddable Type should be excluded<br>
- * <b>false</b> - if JPA Embeddable Type should be not be excluded
+ * <b>false</b> - if JPA Embeddable Type should be not be excluded
*
*/
public boolean checkExclusionOfJPAEmbeddableType(String jpaEmbeddableTypeName);
@@ -181,12 +179,12 @@ public interface JPAEdmMappingModelAccess {
* excluded from EDM model
*
* @param jpaEmbeddableTypeName
- * is the name of JPA Embeddable Attribute Type
+ * is the name of JPA Embeddable Attribute Type
* @param jpaAttributeName
- * is the name of JPA Attribute name
+ * is the name of JPA Attribute name
* @return <b>true</b> - if JPA Embeddable Attribute Type should be excluded<br>
- * <b>false</b> - if JPA Embeddable Attribute Type should be not be
- * excluded
+ * <b>false</b> - if JPA Embeddable Attribute Type should be not be
+ * excluded
*
*/
public boolean checkExclusionOfJPAEmbeddableAttributeType(String jpaEmbeddableTypeName, String jpaAttributeName);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
index f266411..4e32b0c 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.access;
@@ -28,7 +28,7 @@ import java.lang.reflect.Type;
* <li>Custom Operation (Annotated with EDM Annotation FunctionImport)</li>
* </ol>
*
- *
+ *
*
*/
public class JPAFunction {
@@ -38,7 +38,8 @@ public class JPAFunction {
private Type returnType;
private Object[] args;
- public JPAFunction(final Method function, final Class<?>[] parameterTypes, final Type returnType, final Object[] args) {
+ public JPAFunction(final Method function, final Class<?>[] parameterTypes, final Type returnType,
+ final Object[] args) {
this.function = function;
this.parameterTypes = parameterTypes;
this.returnType = returnType;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
index 2c57474..f0a4c8d 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.access;
@@ -29,7 +29,7 @@ package org.apache.olingo.odata2.processor.api.jpa.access;
* </ol>
* </b>
*
- *
+ *
*
*/
public class JPAJoinClause {
@@ -43,7 +43,7 @@ public class JPAJoinClause {
* <li>INNER - inner join
* </ol>
*
- *
+ *
*
*/
public enum JOIN {
@@ -100,23 +100,22 @@ public class JPAJoinClause {
* Constructor for creating elements of JPA Join Clause container.
*
* @param entityName
- * is the name of the JPA entity participating in the join
+ * is the name of the JPA entity participating in the join
* @param entityAlias
- * is the alias for the JPA entity participating in the join
+ * is the alias for the JPA entity participating in the join
* @param entityRelationShip
- * is the name of the JPA entity relationship participating in
- * the join
+ * is the name of the JPA entity relationship participating in
+ * the join
* @param entityRelationShipAlias
- * is the alias name of the JPA entity relationship participating
- * in the join
+ * is the alias name of the JPA entity relationship participating
+ * in the join
* @param joinCondition
- * is the condition on which the joins should occur
+ * is the condition on which the joins should occur
* @param joinType
- * is the type of join
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause.JOIN}
- * to execute
+ * is the type of join {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause.JOIN} to execute
*/
- public JPAJoinClause(final String entityName, final String entityAlias, final String entityRelationShip, final String entityRelationShipAlias, final String joinCondition, final JOIN joinType) {
+ public JPAJoinClause(final String entityName, final String entityAlias, final String entityRelationShip,
+ final String entityRelationShipAlias, final String joinCondition, final JOIN joinType) {
this.entityName = entityName;
this.entityAlias = entityAlias;
@@ -137,9 +136,8 @@ public class JPAJoinClause {
}
/**
- * The method returns the type of
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause.JOIN}
- * that can be used for building JPQL join statements.
+ * The method returns the type of {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause.JOIN} that
+ * can be used for building JPQL join statements.
*
* @return join type
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
index 1f0f14c..fd44200 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.access;
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
* executing operations on JPA Entity/Custom processor objects. <br>
* A default implementation is provided by the library.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.access.JPAMethodContextView
* @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
*
@@ -81,14 +81,15 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
* the method instantiates an instance of type JPAMethodContextBuilder.
*
* @param contextType
- * indicates the type of JPQLContextBuilder to instantiate.
+ * indicates the type of JPQLContextBuilder to instantiate.
* @param resultsView
- * is the OData request view
+ * is the OData request view
* @return {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAMethodContext.JPAMethodContextBuilder}
*
* @throws ODataJPARuntimeException
*/
- public final static JPAMethodContextBuilder createBuilder(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
+ public final static JPAMethodContextBuilder
+ createBuilder(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
return JPAMethodContextBuilder.create(contextType, resultsView);
}
@@ -96,7 +97,7 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
* The abstract class is extended by specific JPA Method Context Builder to
* build JPA Method Context types.
*
- *
+ *
*
*/
public static abstract class JPAMethodContextBuilder {
@@ -112,8 +113,10 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
protected JPAMethodContextBuilder() {}
- private static JPAMethodContextBuilder create(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
- JPAMethodContextBuilder contextBuilder = ODataJPAFactory.createFactory().getJPQLBuilderFactory().getJPAMethodContextBuilder(contextType);
+ private static JPAMethodContextBuilder create(final JPQLContextType contextType, final Object resultsView)
+ throws ODataJPARuntimeException {
+ JPAMethodContextBuilder contextBuilder =
+ ODataJPAFactory.createFactory().getJPQLBuilderFactory().getJPAMethodContextBuilder(contextType);
if (contextBuilder == null) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQLCTXBLDR_CREATE, null);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java
index fab588f..fb057a0 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.access;
@@ -24,7 +24,7 @@ import java.util.List;
* The interface provides view on JPA Method Context. JPA Method context can be
* used to access custom operations or JPA Entity property access methods.
*
- *
+ *
*
*/
public interface JPAMethodContextView {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
index 1d86226..d13dd77 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.access;
@@ -36,9 +36,9 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelExcepti
import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
/**
- * The interface provides methods for processing OData Requests for Create, Read, Update, Delete operations.
- * Pass the OData request or parsed OData request (Map of properties) as request.
- * A JPA entity is returned as a response.
+ * The interface provides methods for processing OData Requests for Create, Read, Update, Delete operations.
+ * Pass the OData request or parsed OData request (Map of properties) as request.
+ * A JPA entity is returned as a response.
*
*/
public interface JPAProcessor {
@@ -47,14 +47,14 @@ public interface JPAProcessor {
* list of Objects of type representing JPA Entity Types.
*
* @param <T>
- * Template parameter representing Java Persistence Entity Type.
- * <p>
- * <b>Note:-</b> Default parameter is Object.
- * </p>
+ * Template parameter representing Java Persistence Entity Type.
+ * <p>
+ * <b>Note:-</b> Default parameter is Object.
+ * </p>
*
* @param requestView
- * is an OData request for querying an entity set
- * <p>
+ * is an OData request for querying an entity set
+ * <p>
* @return list of objects representing JPA entity types
**/
public <T> List<T> process(GetEntitySetUriInfo requestView)
@@ -65,15 +65,15 @@ public interface JPAProcessor {
* Object of type representing JPA Entity Type.
*
* @param <T>
- * Template parameter representing Java Persistence Entity Type.
- * <p>
- * <b>Note:-</b> Default parameter is Object.
- * </p>
+ * Template parameter representing Java Persistence Entity Type.
+ * <p>
+ * <b>Note:-</b> Default parameter is Object.
+ * </p>
*
* @param requestView
- * OData request for reading an entity
+ * OData request for reading an entity
*
- * <p>
+ * <p>
* @return object representing JPA entity type
**/
public <T> Object process(GetEntityUriInfo requestView)
@@ -83,7 +83,7 @@ public interface JPAProcessor {
* Processes OData request for fetching Entity count. The method returns JPA Entity count
*
* @param requestView
- * OData request for counting an entity set
+ * OData request for counting an entity set
* @return long value representing count of JPA entity set
*
* @throws ODataJPAModelException
@@ -97,8 +97,8 @@ public interface JPAProcessor {
* Processes OData request for fetching Entity count. The method returns count of target entity.
* This is specific to situation where cardinality is 1:1
*
- * @param resultsView
- * OData request for counting target entity.
+ * @param resultsView
+ * OData request for counting target entity.
* @return long value representing count of JPA entity
*
* @throws ODataJPAModelException
@@ -113,7 +113,7 @@ public interface JPAProcessor {
* operations return type has multiplicity of ONE.
*
* @param requestView
- * OData request for executing function import
+ * OData request for executing function import
* @return result of executing function import
* @throws ODataJPAModelException
* @throws ODataJPARuntimeException
@@ -122,11 +122,11 @@ public interface JPAProcessor {
throws ODataJPAModelException, ODataJPARuntimeException;
/**
- * Processes OData request for executing $links OData command for N:1 relation.
+ * Processes OData request for executing $links OData command for N:1 relation.
* The method returns an Object of type representing OData entity.
*
* @param uriParserResultView
- * OData request for Entity Link URI
+ * OData request for Entity Link URI
* @return an object representing JPA entity
* @throws ODataJPAModelException
* @throws ODataJPARuntimeException
@@ -135,11 +135,11 @@ public interface JPAProcessor {
throws ODataJPAModelException, ODataJPARuntimeException;
/**
- * Processes OData request for executing $links OData command for N:1 relation.
+ * Processes OData request for executing $links OData command for N:1 relation.
* The method returns an Object of type representing OData entity.
*
* @param uriParserResultView
- * OData request for Entity Set Link URI
+ * OData request for Entity Set Link URI
* @return a list of object representing JPA entities
* @throws ODataJPAModelException
* @throws ODataJPARuntimeException
@@ -149,7 +149,7 @@ public interface JPAProcessor {
/**
* Processes OData request for creating Entity. The method returns an Object
- * which is created. A Null reference implies object was not created.
+ * which is created. A Null reference implies object was not created.
*
* @param createView
* @param content
@@ -166,7 +166,8 @@ public interface JPAProcessor {
ODataJPARuntimeException;
/**
- * Processes OData request for creating Entity. The method expects a parsed OData request which is a Map of properties.
+ * Processes OData request for creating Entity. The method expects a parsed OData request which is a Map of
+ * properties.
* The method returns an Object that is created. A Null reference implies object was not created.
*
* @param createView
@@ -184,7 +185,7 @@ public interface JPAProcessor {
/**
* Processes OData request for updating Entity. The method returns an Object
- * which is updated. A Null reference implies object was not created.
+ * which is updated. A Null reference implies object was not created.
*
* @param deleteuriInfo
* @param contentType
@@ -199,7 +200,7 @@ public interface JPAProcessor {
/**
* Processes OData request for updating Entity. The method returns an Object
- * which is updated. A Null reference implies object was not created.
+ * which is updated. A Null reference implies object was not created.
*
* @param deleteuriInfo
* @param contentType
@@ -213,7 +214,7 @@ public interface JPAProcessor {
/**
* Processes OData request for deleting Entity. The method returns an Object
- * which is deleted. A Null reference implies object was not created.
+ * which is deleted. A Null reference implies object was not created.
*
* @param deleteuriInfo
* @param contentType
@@ -230,7 +231,7 @@ public interface JPAProcessor {
* $links OData command.
*
* @param uriParserResultView
- * OData request for creating Links
+ * OData request for creating Links
* @param content
* @param requestContentType
* @param contentType
@@ -247,7 +248,7 @@ public interface JPAProcessor {
* $links OData command.
*
* @param uriParserResultView
- * OData request for updating Links
+ * OData request for updating Links
* @param content
* @param requestContentType
* @param contentType
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java
index de90b3c..38671c1 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java
@@ -1,26 +1,26 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
/**
* <h3>OData JPA Processor API Library - Java Persistence Access</h3>
* The library provides a set of APIs to access Java Persistence Models and Data.
*
- *
+ *
*/
package org.apache.olingo.odata2.processor.api.jpa.access;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
index cc6eec4..3347ee0 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.exception;
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
* provides non localized error texts that can be used for raising OData JPA
* exceptions with non localized error texts.
*
- *
+ *
*
*/
public abstract class ODataJPAException extends ODataException {
@@ -46,19 +46,18 @@ public abstract class ODataJPAException extends ODataException {
}
/**
- * The method creates a Reference to Message Object
- * {@link org.apache.olingo.odata2.api.exception.MessageReference} . The message
+ * The method creates a Reference to Message Object {@link org.apache.olingo.odata2.api.exception.MessageReference} .
+ * The message
* text key is derived out of parameters clazz.messageReferenceKey.
*
* @param clazz
- * is name of the class extending
- * {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAException}
+ * is name of the class extending {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAException}
* @param messageReferenceKey
- * is the key of the message
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.exception.MessageReference}
+ * is the key of the message
+ * @return an instance of type {@link org.apache.olingo.odata2.api.exception.MessageReference}
*/
- protected static MessageReference createMessageReference(final Class<? extends ODataJPAException> clazz, final String messageReferenceKey) {
+ protected static MessageReference createMessageReference(final Class<? extends ODataJPAException> clazz,
+ final String messageReferenceKey) {
return MessageReference.create(clazz, messageReferenceKey);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java
index 1a728e2..97dc1bf 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.exception;
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
* not found for the given language then the default language -EN is used for
* the message texts.
*
- *
+ *
* @see org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAException
* @see org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException
* @see org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException
@@ -40,9 +40,9 @@ public interface ODataJPAMessageService {
* {@link org.apache.olingo.odata2.api.exception.MessageReference}.
*
* @param context
- * is a Message Reference
- * exception
- * is a Throwable Exception
+ * is a Message Reference
+ * exception
+ * is a Throwable Exception
* @return a language dependent message text
*/
public String getLocalizedMessage(MessageReference context, Throwable exception);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
index b3790fa..7800b9e 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.exception;
@@ -25,27 +25,41 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
* The exception is thrown for any unexpected errors raising while
* accessing/transforming Java Persistence Models.
*
- *
+ *
*
*/
public class ODataJPAModelException extends ODataJPAException {
- public static final MessageReference INVALID_ENTITY_TYPE = createMessageReference(ODataJPAModelException.class, "INVALID_ENTITY_TYPE");
- public static final MessageReference INVALID_COMPLEX_TYPE = createMessageReference(ODataJPAModelException.class, "INVLAID_COMPLEX_TYPE");
- public static final MessageReference INVALID_ASSOCIATION = createMessageReference(ODataJPAModelException.class, "INVALID_ASSOCIATION");
- public static final MessageReference INVALID_ENTITYSET = createMessageReference(ODataJPAModelException.class, "INVALID_ENTITYSET");
- public static final MessageReference INVALID_ENTITYCONTAINER = createMessageReference(ODataJPAModelException.class, "INVALID_ENTITYCONTAINER");
- public static final MessageReference INVALID_ASSOCIATION_SET = createMessageReference(ODataJPAModelException.class, "INVALID_ASSOCIATION_SET");
- public static final MessageReference INVALID_FUNC_IMPORT = createMessageReference(ODataJPAModelException.class, "INVALID_FUNC_IMPORT");
+ public static final MessageReference INVALID_ENTITY_TYPE = createMessageReference(ODataJPAModelException.class,
+ "INVALID_ENTITY_TYPE");
+ public static final MessageReference INVALID_COMPLEX_TYPE = createMessageReference(ODataJPAModelException.class,
+ "INVLAID_COMPLEX_TYPE");
+ public static final MessageReference INVALID_ASSOCIATION = createMessageReference(ODataJPAModelException.class,
+ "INVALID_ASSOCIATION");
+ public static final MessageReference INVALID_ENTITYSET = createMessageReference(ODataJPAModelException.class,
+ "INVALID_ENTITYSET");
+ public static final MessageReference INVALID_ENTITYCONTAINER = createMessageReference(ODataJPAModelException.class,
+ "INVALID_ENTITYCONTAINER");
+ public static final MessageReference INVALID_ASSOCIATION_SET = createMessageReference(ODataJPAModelException.class,
+ "INVALID_ASSOCIATION_SET");
+ public static final MessageReference INVALID_FUNC_IMPORT = createMessageReference(ODataJPAModelException.class,
+ "INVALID_FUNC_IMPORT");
- public static final MessageReference BUILDER_NULL = createMessageReference(ODataJPAModelException.class, "BUILDER_NULL");
- public static final MessageReference TYPE_NOT_SUPPORTED = createMessageReference(ODataJPAModelException.class, "TYPE_NOT_SUPPORTED");
- public static final MessageReference FUNC_ENTITYSET_EXP = createMessageReference(ODataJPAModelException.class, "FUNC_ENTITYSET_EXP");
- public static final MessageReference FUNC_RETURN_TYPE_EXP = createMessageReference(ODataJPAModelException.class, "FUNC_RETURN_TYPE_EXP");
- public static final MessageReference FUNC_RETURN_TYPE_ENTITY_NOT_FOUND = createMessageReference(ODataJPAModelException.class, "FUNC_RETURN_TYPE_ENTITY_NOT_FOUND");
+ public static final MessageReference BUILDER_NULL = createMessageReference(ODataJPAModelException.class,
+ "BUILDER_NULL");
+ public static final MessageReference TYPE_NOT_SUPPORTED = createMessageReference(ODataJPAModelException.class,
+ "TYPE_NOT_SUPPORTED");
+ public static final MessageReference FUNC_ENTITYSET_EXP = createMessageReference(ODataJPAModelException.class,
+ "FUNC_ENTITYSET_EXP");
+ public static final MessageReference FUNC_RETURN_TYPE_EXP = createMessageReference(ODataJPAModelException.class,
+ "FUNC_RETURN_TYPE_EXP");
+ public static final MessageReference FUNC_RETURN_TYPE_ENTITY_NOT_FOUND = createMessageReference(
+ ODataJPAModelException.class, "FUNC_RETURN_TYPE_ENTITY_NOT_FOUND");
public static final MessageReference GENERAL = createMessageReference(ODataJPAModelException.class, "GENERAL");
- public static final MessageReference INNER_EXCEPTION = createMessageReference(ODataJPAModelException.class, "INNER_EXCEPTION");
- public static final MessageReference FUNC_PARAM_NAME_EXP = createMessageReference(ODataJPAModelException.class, "FUNC_PARAM_NAME_EXP");
+ public static final MessageReference INNER_EXCEPTION = createMessageReference(ODataJPAModelException.class,
+ "INNER_EXCEPTION");
+ public static final MessageReference FUNC_PARAM_NAME_EXP = createMessageReference(ODataJPAModelException.class,
+ "FUNC_PARAM_NAME_EXP");
private ODataJPAModelException(final String localizedMessage, final Throwable e, final MessageReference msgRef) {
super(localizedMessage, e, msgRef);
@@ -56,18 +70,19 @@ public class ODataJPAModelException extends ODataJPAException {
* with localized error texts.
*
* @param messageReference
- * is a <b>mandatory</b> parameter referring to a literal that
- * could be translated to localized error texts.
+ * is a <b>mandatory</b> parameter referring to a literal that
+ * could be translated to localized error texts.
* @param e
- * is an optional parameter representing the previous exception
- * in the call stack
+ * is an optional parameter representing the previous exception
+ * in the call stack
* @return an instance of ODataJPAModelException which can be then raised.
* @throws ODataJPARuntimeException
*/
public static ODataJPAModelException throwException(final MessageReference messageReference, final Throwable e) {
ODataJPAMessageService messageService;
- messageService = ODataJPAFactory.createFactory().getODataJPAAccessFactory().getODataJPAMessageService(DEFAULT_LOCALE);
+ messageService =
+ ODataJPAFactory.createFactory().getODataJPAAccessFactory().getODataJPAMessageService(DEFAULT_LOCALE);
String message = messageService.getLocalizedMessage(messageReference, e);
return new ODataJPAModelException(message, e, messageReference);
}
[55/59] [abbrv] cleanup jpa core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java
index 9f0a9e7..1675828 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -47,7 +47,8 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements JPAEdmAssoc
private List<JPAEdmReferentialConstraintView> inconsistentRefConstraintViewList;
private int numberOfSimilarEndPoints;
- public JPAEdmAssociation(final JPAEdmAssociationEndView associationEndview, final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView, final int value) {
+ public JPAEdmAssociation(final JPAEdmAssociationEndView associationEndview,
+ final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView, final int value) {
super(associationEndview);
associationEndView = associationEndview;
numberOfSimilarEndPoints = value;
@@ -93,8 +94,11 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements JPAEdmAssoc
if (association != null) {
if (view.compare(association.getEnd1(), association.getEnd2())) {
JPAEdmAssociationEndView associationEnd = associationEndMap.get(association.getName());
- if (associationEnd.getJoinColumnName() != null && associationEnd.getJoinColumnReferenceColumnName() != null && view.getJoinColumnName() != null && view.getJoinColumnReferenceColumnName() != null) {
- if (view.getJoinColumnName().equals(associationEnd.getJoinColumnName()) && view.getJoinColumnReferenceColumnName().equals(associationEnd.getJoinColumnReferenceColumnName())) {
+ if (associationEnd.getJoinColumnName() != null && associationEnd.getJoinColumnReferenceColumnName() != null
+ && view.getJoinColumnName() != null && view.getJoinColumnReferenceColumnName() != null) {
+ if (view.getJoinColumnName().equals(associationEnd.getJoinColumnName())
+ && view.getJoinColumnReferenceColumnName()
+ .equals(associationEnd.getJoinColumnReferenceColumnName())) {
currentAssociation = association;
return association;
}
@@ -120,7 +124,8 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements JPAEdmAssoc
}
@Override
- public void addJPAEdmAssociationView(final JPAEdmAssociationView associationView, final JPAEdmAssociationEndView associationEndView) {
+ public void addJPAEdmAssociationView(final JPAEdmAssociationView associationView,
+ final JPAEdmAssociationEndView associationEndView) {
if (associationView != null) {
currentAssociation = associationView.getEdmAssociation();
associationMap.put(currentAssociation.getName(), currentAssociation);
@@ -218,7 +223,10 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements JPAEdmAssoc
if (association != null) {
end1 = association.getEnd1();
end2 = association.getEnd2();
- if ((end1.getType().equals(currentAssociationEnd1.getType()) && end2.getType().equals(currentAssociationEnd2.getType())) || (end1.getType().equals(currentAssociationEnd2.getType()) && end2.getType().equals(currentAssociationEnd1.getType()))) {
+ if ((end1.getType().equals(currentAssociationEnd1.getType()) && end2.getType().equals(
+ currentAssociationEnd2.getType()))
+ || (end1.getType().equals(currentAssociationEnd2.getType()) && end2.getType().equals(
+ currentAssociationEnd1.getType()))) {
count++;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java
index 23e8e49..1b648ae 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -146,7 +146,14 @@ public class JPAEdmAssociationEnd extends JPAEdmBaseViewImpl implements JPAEdmAs
@Override
public boolean compare(final AssociationEnd end1, final AssociationEnd end2) {
- if ((end1.getType().equals(currentAssociationEnd1.getType()) && end2.getType().equals(currentAssociationEnd2.getType()) && end1.getMultiplicity().equals(currentAssociationEnd1.getMultiplicity()) && end2.getMultiplicity().equals(currentAssociationEnd2.getMultiplicity())) || (end1.getType().equals(currentAssociationEnd2.getType()) && end2.getType().equals(currentAssociationEnd1.getType()) && end1.getMultiplicity().equals(currentAssociationEnd2.getMultiplicity()) && end2.getMultiplicity().equals(currentAssociationEnd1.getMultiplicity()))) {
+ if ((end1.getType().equals(currentAssociationEnd1.getType())
+ && end2.getType().equals(currentAssociationEnd2.getType())
+ && end1.getMultiplicity().equals(currentAssociationEnd1.getMultiplicity()) && end2.getMultiplicity().equals(
+ currentAssociationEnd2.getMultiplicity()))
+ || (end1.getType().equals(currentAssociationEnd2.getType())
+ && end2.getType().equals(currentAssociationEnd1.getType())
+ && end1.getMultiplicity().equals(currentAssociationEnd2.getMultiplicity()) && end2.getMultiplicity()
+ .equals(currentAssociationEnd1.getMultiplicity()))) {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java
index 52ebe72..925a497 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -88,7 +88,8 @@ public class JPAEdmAssociationSet extends JPAEdmBaseViewImpl implements JPAEdmAs
currentAssociation = association;
- FullQualifiedName fQname = new FullQualifiedName(schemaView.getEdmSchema().getNamespace(), association.getName());
+ FullQualifiedName fQname =
+ new FullQualifiedName(schemaView.getEdmSchema().getNamespace(), association.getName());
currentAssociationSet = new AssociationSet();
currentAssociationSet.setAssociation(fQname);
@@ -97,7 +98,8 @@ public class JPAEdmAssociationSet extends JPAEdmBaseViewImpl implements JPAEdmAs
for (EntitySet entitySet : entitySetList) {
fQname = entitySet.getEntityType();
endFlag = 0;
- if (fQname.equals(association.getEnd1().getType()) || ++endFlag > 1 || fQname.equals(association.getEnd2().getType())) {
+ if (fQname.equals(association.getEnd1().getType()) || ++endFlag > 1
+ || fQname.equals(association.getEnd2().getType())) {
AssociationSetEnd end = new AssociationSetEnd();
end.setEntitySet(entitySet.getName());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java
index 1524402..0485bb1 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -46,7 +46,8 @@ public abstract class JPAEdmBaseViewImpl implements JPAEdmBaseView {
public JPAEdmBaseViewImpl(final ODataJPAContext context) {
pUnitName = context.getPersistenceUnitName();
metaModel = context.getEntityManagerFactory().getMetamodel();
- jpaEdmMappingModelAccess = ODataJPAFactory.createFactory().getJPAAccessFactory().getJPAEdmMappingModelAccess(context);
+ jpaEdmMappingModelAccess =
+ ODataJPAFactory.createFactory().getJPAAccessFactory().getJPAEdmMappingModelAccess(context);
jpaEdmExtension = context.getJPAEdmExtension();
jpaEdmMappingModelAccess.loadMappingModel();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java
index 025d101..ad25a1b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -128,7 +128,8 @@ public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements JPAEdmCompl
}
@Override
- public void expandEdmComplexType(final ComplexType complexType, List<Property> expandedList, final String embeddablePropertyName) {
+ public void expandEdmComplexType(final ComplexType complexType, List<Property> expandedList,
+ final String embeddablePropertyName) {
if (expandedList == null) {
expandedList = new ArrayList<Property>();
@@ -171,13 +172,13 @@ public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements JPAEdmCompl
* The Complex Type is created only if it is not created
* earlier. A local buffer is maintained to track the list
* of complex types created.
- *
+ *
* ************************************************************
- * Build EDM Complex Type - STEPS
+ * Build EDM Complex Type - STEPS
* ************************************************************
* 1) Fetch list of embeddable types from JPA Model
- * 2) Search local buffer if there exists already a Complex
- * type for the embeddable type.
+ * 2) Search local buffer if there exists already a Complex
+ * type for the embeddable type.
* 3) If the complex type was already been built continue with
* the next embeddable type, else create new EDM Complex Type.
* 4) Create a Property view with Complex Type
@@ -188,9 +189,8 @@ public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements JPAEdmCompl
* 7) Provide name for EDM complex type.
*
* ************************************************************
- * Build EDM Complex Type - STEPS
+ * Build EDM Complex Type - STEPS
* ************************************************************
- *
*/
@Override
public void build() throws ODataJPAModelException, ODataJPARuntimeException {
@@ -241,7 +241,10 @@ public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements JPAEdmCompl
private boolean isExcluded(final JPAEdmComplexType jpaEdmComplexType) {
JPAEdmMappingModelAccess mappingModelAccess = jpaEdmComplexType.getJPAEdmMappingModelAccess();
- if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists() && mappingModelAccess.checkExclusionOfJPAEmbeddableType(jpaEdmComplexType.getJPAEmbeddableType().getJavaType().getSimpleName())) {
+ if (mappingModelAccess != null
+ && mappingModelAccess.isMappingModelExists()
+ && mappingModelAccess.checkExclusionOfJPAEmbeddableType(jpaEdmComplexType.getJPAEmbeddableType()
+ .getJavaType().getSimpleName())) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java
index 8af8f6b..fee40c2 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java
index 4f52d7d..9e5248f 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java
index 9c158a9..5864a1c 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -112,7 +112,8 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements JPAEdmEntity
currentEdmEntityType.setProperties(propertyView.getEdmPropertyList());
if (propertyView.getJPAEdmNavigationPropertyView() != null) {
JPAEdmNavigationPropertyView navPropView = propertyView.getJPAEdmNavigationPropertyView();
- if (navPropView.getConsistentEdmNavigationProperties() != null && !navPropView.getConsistentEdmNavigationProperties().isEmpty()) {
+ if (navPropView.getConsistentEdmNavigationProperties() != null
+ && !navPropView.getConsistentEdmNavigationProperties().isEmpty()) {
currentEdmEntityType.setNavigationProperties(navPropView.getConsistentEdmNavigationProperties());
}
}
@@ -127,7 +128,8 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements JPAEdmEntity
private boolean isExcluded(final JPAEdmEntityType jpaEdmEntityType) {
JPAEdmMappingModelAccess mappingModelAccess = jpaEdmEntityType.getJPAEdmMappingModelAccess();
- if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists() && mappingModelAccess.checkExclusionOfJPAEntityType(jpaEdmEntityType.getJPAEntityType().getName())) {
+ if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()
+ && mappingModelAccess.checkExclusionOfJPAEntityType(jpaEdmEntityType.getJPAEntityType().getName())) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFacets.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFacets.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFacets.java
index 56e8850..61f984f 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFacets.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFacets.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -39,8 +39,10 @@ public class JPAEdmFacets {
.getJavaMember()).getAnnotation(Column.class);
}
- if (column == null) return;
-
+ if (column == null) {
+ return;
+ }
+
setNullable(column, edmProperty);
switch (edmTypeKind) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java
index ab89ce9..62fcaae 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -82,7 +82,8 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
HashMap<Class<?>, String[]> customOperations = schemaView.getRegisteredOperations();
- jpaEdmEntityTypeView = schemaView.getJPAEdmEntityContainerView().getJPAEdmEntitySetView().getJPAEdmEntityTypeView();
+ jpaEdmEntityTypeView =
+ schemaView.getJPAEdmEntityContainerView().getJPAEdmEntitySetView().getJPAEdmEntityTypeView();
jpaEdmComplexTypeView = schemaView.getJPAEdmComplexTypeView();
if (customOperations != null) {
@@ -136,7 +137,8 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
private FunctionImport buildFunctionImport(final Method method) throws ODataJPAModelException {
- org.apache.olingo.odata2.api.annotation.edm.FunctionImport annotation = method.getAnnotation(org.apache.olingo.odata2.api.annotation.edm.FunctionImport.class);
+ org.apache.olingo.odata2.api.annotation.edm.FunctionImport annotation =
+ method.getAnnotation(org.apache.olingo.odata2.api.annotation.edm.FunctionImport.class);
if (annotation != null && annotation.returnType() != ReturnType.NONE) {
FunctionImport functionImport = new FunctionImport();
@@ -161,7 +163,8 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
return null;
}
- private void buildParameter(final FunctionImport functionImport, final Method method) throws ODataJPAModelException {
+ private void buildParameter(final FunctionImport functionImport, final Method method)
+ throws ODataJPAModelException {
Annotation[][] annotations = method.getParameterAnnotations();
Class<?>[] parameterTypes = method.getParameterTypes();
@@ -176,7 +179,8 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
Parameter annotation = (Parameter) element;
FunctionImportParameter functionImportParameter = new FunctionImportParameter();
if (annotation.name().equals("")) {
- throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_PARAM_NAME_EXP.addContent(method.getDeclaringClass().getName(), method.getName()), null);
+ throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_PARAM_NAME_EXP.addContent(method
+ .getDeclaringClass().getName(), method.getName()), null);
} else {
functionImportParameter.setName(annotation.name());
}
@@ -214,12 +218,14 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
}
}
- private void buildReturnType(final FunctionImport functionImport, final Method method, final org.apache.olingo.odata2.api.annotation.edm.FunctionImport annotation) throws ODataJPAModelException {
+ private void buildReturnType(final FunctionImport functionImport, final Method method,
+ final org.apache.olingo.odata2.api.annotation.edm.FunctionImport annotation) throws ODataJPAModelException {
ReturnType returnType = annotation.returnType();
Multiplicity multiplicity = null;
if (returnType != ReturnType.NONE) {
- org.apache.olingo.odata2.api.edm.provider.ReturnType functionReturnType = new org.apache.olingo.odata2.api.edm.provider.ReturnType();
+ org.apache.olingo.odata2.api.edm.provider.ReturnType functionReturnType =
+ new org.apache.olingo.odata2.api.edm.provider.ReturnType();
multiplicity = annotation.multiplicity();
if (multiplicity == Multiplicity.MANY) {
@@ -238,7 +244,8 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
Class<?> methodReturnType = method.getReturnType();
if (methodReturnType == null || methodReturnType.getName().equals("void")) {
- throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.addContent(method.getDeclaringClass(), method.getName()), null);
+ throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.addContent(method
+ .getDeclaringClass(), method.getName()), null);
}
switch (returnType) {
case ENTITY_TYPE:
@@ -250,7 +257,8 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
}
if (edmEntityType == null) {
- throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND.addContent(method.getDeclaringClass(), method.getName(), methodReturnType.getSimpleName()), null);
+ throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND
+ .addContent(method.getDeclaringClass(), method.getName(), methodReturnType.getSimpleName()), null);
}
functionReturnType.setTypeName(JPAEdmNameBuilder.build(schemaView, edmEntityType.getName()));
break;
@@ -268,7 +276,8 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
complexType = jpaEdmComplexTypeView.searchEdmComplexType(getReturnTypeName(method));
}
if (complexType == null) {
- throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND.addContent(method.getDeclaringClass(), method.getName(), methodReturnType.getSimpleName()), null);
+ throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND
+ .addContent(method.getDeclaringClass(), method.getName(), methodReturnType.getSimpleName()), null);
}
functionReturnType.setTypeName(JPAEdmNameBuilder.build(schemaView, complexType.getName()));
break;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java
index cfe47fc..15cd26e 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -85,7 +85,8 @@ public class JPAEdmKey extends JPAEdmBaseViewImpl implements JPAEdmKeyView {
}
if (isBuildModeComplexType) {
- ComplexType complexType = complexTypeView.searchEdmComplexType(propertyView.getJPAAttribute().getJavaType().getName());
+ ComplexType complexType =
+ complexTypeView.searchEdmComplexType(propertyView.getJPAAttribute().getJavaType().getName());
normalizeComplexKey(complexType, propertyRefList);
} else {
PropertyRef propertyRef = new PropertyRef();
@@ -101,7 +102,7 @@ public class JPAEdmKey extends JPAEdmBaseViewImpl implements JPAEdmKeyView {
}
- //TODO think how to stop the recursion if A includes B and B includes A!!!!!!
+ // TODO think how to stop the recursion if A includes B and B includes A!!!!!!
public void normalizeComplexKey(final ComplexType complexType, final List<PropertyRef> propertyRefList) {
for (Property property : complexType.getProperties()) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmMappingImpl.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmMappingImpl.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmMappingImpl.java
index cc40fad..99d9f5f 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmMappingImpl.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmMappingImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModel.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModel.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModel.java
index a307fa1..fac5614 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModel.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModel.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java
index 7224bc6..6070b31 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -38,7 +38,8 @@ public class JPAEdmNavigationProperty extends JPAEdmBaseViewImpl implements JPAE
private List<NavigationProperty> consistentNavigationProperties = null;
private int count;
- public JPAEdmNavigationProperty(final JPAEdmAssociationView associationView, final JPAEdmPropertyView propertyView, final int countNumber) {
+ public JPAEdmNavigationProperty(final JPAEdmAssociationView associationView, final JPAEdmPropertyView propertyView,
+ final int countNumber) {
super(associationView);
this.associationView = associationView;
this.propertyView = propertyView;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java
index def45db..28cc7ce 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -123,15 +123,14 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
}
@Override
- public JPAEdmNavigationPropertyView getJPAEdmNavigationPropertyView()
- {
+ public JPAEdmNavigationPropertyView getJPAEdmNavigationPropertyView() {
return navigationPropertyView;
}
private class JPAEdmPropertyBuilder implements JPAEdmBuilder {
/*
*
- * Each call to build method creates a new EDM Property List.
+ * Each call to build method creates a new EDM Property List.
* The Property List can be created either by an Entity type or
* ComplexType. The flag isBuildModeComplexType tells if the
* Properties are built for complex type or for Entity Type.
@@ -144,28 +143,27 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
* by Schema.
*
* Building Properties is divided into four parts
- * A) Building Simple Properties
- * B) Building Complex Properties
- * C) Building Associations
- * D) Building Navigation Properties
- *
+ * A) Building Simple Properties
+ * B) Building Complex Properties
+ * C) Building Associations
+ * D) Building Navigation Properties
+ *
* ************************************************************
- * Build EDM Schema - STEPS
+ * Build EDM Schema - STEPS
* ************************************************************
- * A) Building Simple Properties:
+ * A) Building Simple Properties:
*
- * 1) Fetch JPA Attribute List from
- * A) Complex Type
- * B) Entity Type
- * depending on isBuildModeComplexType.
+ * 1) Fetch JPA Attribute List from
+ * A) Complex Type
+ * B) Entity Type
+ * depending on isBuildModeComplexType.
* B) Building Complex Properties
* C) Building Associations
* D) Building Navigation Properties
-
+ *
* ************************************************************
- * Build EDM Schema - STEPS
+ * Build EDM Schema - STEPS
* ************************************************************
- *
*/
@Override
public void build() throws ODataJPAModelException, ODataJPARuntimeException {
@@ -192,7 +190,7 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
for (Object jpaAttribute : jpaAttributes) {
currentAttribute = (Attribute<?, ?>) jpaAttribute;
- // Check for need to Exclude
+ // Check for need to Exclude
if (isExcluded((JPAEdmPropertyView) JPAEdmProperty.this, entityTypeName, currentAttribute.getName())) {
continue;
}
@@ -250,8 +248,7 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
}
keyView.getBuilder().build();
complexTypeView.expandEdmComplexType(complexType, properties, currentAttribute.getName());
- }
- else {
+ } else {
currentComplexProperty = new ComplexProperty();
if (isBuildModeComplexType) {
JPAEdmNameBuilder
@@ -285,7 +282,8 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
JPAEdmAssociationView associationView = schemaView.getJPAEdmAssociationView();
if (associationView.searchAssociation(associationEndView) == null) {
int count = associationView.getNumberOfAssociationsWithSimilarEndPoints(associationEndView);
- JPAEdmAssociationView associationViewLocal = new JPAEdmAssociation(associationEndView, entityTypeView, JPAEdmProperty.this, count);
+ JPAEdmAssociationView associationViewLocal =
+ new JPAEdmAssociation(associationEndView, entityTypeView, JPAEdmProperty.this, count);
associationViewLocal.getBuilder().build();
associationView.addJPAEdmAssociationView(associationViewLocal, associationEndView);
}
@@ -298,17 +296,17 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
associationView.addJPAEdmRefConstraintView(refConstraintView);
}
- if (navigationPropertyView == null)
- {
+ if (navigationPropertyView == null) {
navigationPropertyView = new JPAEdmNavigationProperty(schemaView);
}
currentEntityName = entityTypeView.getJPAEntityType().getName();
- if (currentAttribute.isCollection())
+ if (currentAttribute.isCollection()) {
targetEntityName = ((PluralAttribute<?, ?, ?>) currentAttribute).getElementType().getJavaType()
.getSimpleName();
- else
+ } else {
targetEntityName = currentAttribute.getJavaType().getSimpleName();
+ }
Integer sequenceNumber = associationCount.get(currentEntityName + targetEntityName);
if (sequenceNumber == null) {
sequenceNumber = new Integer(1);
@@ -316,7 +314,8 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
sequenceNumber = new Integer(sequenceNumber.intValue() + 1);
}
associationCount.put(currentEntityName + targetEntityName, sequenceNumber);
- JPAEdmNavigationPropertyView localNavigationPropertyView = new JPAEdmNavigationProperty(associationView, JPAEdmProperty.this, sequenceNumber.intValue());
+ JPAEdmNavigationPropertyView localNavigationPropertyView =
+ new JPAEdmNavigationProperty(associationView, JPAEdmProperty.this, sequenceNumber.intValue());
localNavigationPropertyView.getBuilder().build();
navigationPropertyView.addJPAEdmNavigationPropertyView(localNavigationPropertyView);
break;
@@ -359,15 +358,18 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
return complexTypeView;
}
- private boolean isExcluded(final JPAEdmPropertyView jpaEdmPropertyView, final String jpaEntityTypeName, final String jpaAttributeName) {
+ private boolean isExcluded(final JPAEdmPropertyView jpaEdmPropertyView, final String jpaEntityTypeName,
+ final String jpaAttributeName) {
JPAEdmMappingModelAccess mappingModelAccess = jpaEdmPropertyView
.getJPAEdmMappingModelAccess();
boolean isExcluded = false;
if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
// Exclusion of a simple property in a complex type
- if (isBuildModeComplexType && mappingModelAccess.checkExclusionOfJPAEmbeddableAttributeType(jpaEntityTypeName, jpaAttributeName)
+ if (isBuildModeComplexType
+ && mappingModelAccess.checkExclusionOfJPAEmbeddableAttributeType(jpaEntityTypeName, jpaAttributeName)
// Exclusion of a simple property of an Entity Type
- || (!isBuildModeComplexType && mappingModelAccess.checkExclusionOfJPAAttributeType(jpaEntityTypeName, jpaAttributeName))) {
+ || (!isBuildModeComplexType && mappingModelAccess.checkExclusionOfJPAAttributeType(jpaEntityTypeName,
+ jpaAttributeName))) {
isExcluded = true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java
index 850e473..2888a9a 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -47,7 +47,8 @@ public class JPAEdmReferentialConstraint extends JPAEdmBaseViewImpl implements J
private String relationShipName;
- public JPAEdmReferentialConstraint(final JPAEdmAssociationView associationView, final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
+ public JPAEdmReferentialConstraint(final JPAEdmAssociationView associationView,
+ final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
super(associationView);
this.associationView = associationView;
this.propertyView = propertyView;
@@ -127,10 +128,12 @@ public class JPAEdmReferentialConstraint extends JPAEdmBaseViewImpl implements J
firstBuild = false;
if (principalRoleView == null && dependentRoleView == null) {
- principalRoleView = new JPAEdmReferentialConstraintRole(RoleType.PRINCIPAL, entityTypeView, propertyView, associationView);
+ principalRoleView =
+ new JPAEdmReferentialConstraintRole(RoleType.PRINCIPAL, entityTypeView, propertyView, associationView);
principalRoleView.getBuilder().build();
- dependentRoleView = new JPAEdmReferentialConstraintRole(RoleType.DEPENDENT, entityTypeView, propertyView, associationView);
+ dependentRoleView =
+ new JPAEdmReferentialConstraintRole(RoleType.DEPENDENT, entityTypeView, propertyView, associationView);
dependentRoleView.getBuilder().build();
if (referentialConstraint == null) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java
index 75a803b..3761d4b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -66,7 +66,9 @@ public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl implemen
private JPAEdmRefConstraintRoleBuilder builder;
private ReferentialConstraintRole currentRole;
- public JPAEdmReferentialConstraintRole(final JPAEdmReferentialConstraintRoleView.RoleType roleType, final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView, final JPAEdmAssociationView associationView) {
+ public JPAEdmReferentialConstraintRole(final JPAEdmReferentialConstraintRoleView.RoleType roleType,
+ final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView,
+ final JPAEdmAssociationView associationView) {
super(entityTypeView);
this.entityTypeView = entityTypeView;
@@ -167,15 +169,16 @@ public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl implemen
if (roleType == RoleType.PRINCIPAL) {
jpaAttributeType = jpaAttribute.getJavaType().getSimpleName();
if (jpaAttributeType.equals("List")) {
- Type type = ((ParameterizedType) jpaAttribute.getJavaMember().getDeclaringClass().getDeclaredField(jpaAttribute.getName()).getGenericType()).getActualTypeArguments()[0];
+ Type type =
+ ((ParameterizedType) jpaAttribute.getJavaMember().getDeclaringClass().getDeclaredField(
+ jpaAttribute.getName()).getGenericType()).getActualTypeArguments()[0];
int lastIndexOfDot = type.toString().lastIndexOf(".");
jpaAttributeType = type.toString().substring(lastIndexOfDot + 1);
}
edmEntityType = entityTypeView.searchEdmEntityType(jpaAttributeType);
- }
-
- else if (roleType == RoleType.DEPENDENT) {
- edmEntityType = entityTypeView.searchEdmEntityType(jpaAttribute.getDeclaringType().getJavaType().getSimpleName());
+ } else if (roleType == RoleType.DEPENDENT) {
+ edmEntityType =
+ entityTypeView.searchEdmEntityType(jpaAttribute.getDeclaringType().getJavaType().getSimpleName());
}
List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/02a598bd/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java
index b073d65..b9ded8b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.core.jpa.model;
@@ -146,7 +146,7 @@ public class JPAEdmSchema extends JPAEdmBaseViewImpl implements JPAEdmSchemaView
List<ComplexType> complexTypes = complexTypeView.getConsistentEdmComplexTypes();
List<ComplexType> existingComplexTypes = new ArrayList<ComplexType>();
for (ComplexType complexType : complexTypes) {
- if (complexType != null && nonKeyComplexList.contains(complexType.getName())) {//null check for exclude
+ if (complexType != null && nonKeyComplexList.contains(complexType.getName())) {// null check for exclude
existingComplexTypes.add(complexType);
}
}
@@ -165,7 +165,8 @@ public class JPAEdmSchema extends JPAEdmBaseViewImpl implements JPAEdmSchemaView
}
}
- List<EntityType> entityTypes = entityContainerView.getJPAEdmEntitySetView().getJPAEdmEntityTypeView().getConsistentEdmEntityTypes();
+ List<EntityType> entityTypes =
+ entityContainerView.getJPAEdmEntitySetView().getJPAEdmEntityTypeView().getConsistentEdmEntityTypes();
List<NavigationProperty> navigationProperties;
if (entityTypes != null && !entityTypes.isEmpty()) {
for (EntityType entityType : entityTypes) {
[38/59] [abbrv] cleanup of odata fit tests
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java
index f0189b9..68cb724 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java
@@ -1,31 +1,30 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref.contentnegotiation;
import java.util.Arrays;
import java.util.List;
-import org.junit.Ignore;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.core.uri.UriType;
+import org.junit.Ignore;
+import org.junit.Test;
/**
*
@@ -33,17 +32,38 @@ import org.apache.olingo.odata2.core.uri.UriType;
public class ContentNegotiationPostRequestTest extends AbstractContentNegotiationTest {
public static final String EMPLOYEE_1_XML =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/\" m:etag=\"W/"1"\">" +
- "<id>http://localhost:19000/Employees('1')</id>" +
- "<title type=\"text\">Walter Winter</title>" +
- "<updated>1999-01-01T00:00:00Z</updated>" +
- "<category term=\"RefScenario.Employee\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- "<link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>" +
- "<link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\" etag=\"mmEtag\"/>" +
- "<link href=\"Employees('1')/ne_Room\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room\" type=\"application/atom+xml; type=entry\" title=\"ne_Room\"/>" +
- "<link href=\"Employees('1')/ne_Manager\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager\" type=\"application/atom+xml; type=entry\" title=\"ne_Manager\"/>" +
- "<link href=\"Employees('1')/ne_Team\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team\" type=\"application/atom+xml; type=entry\" title=\"ne_Team\"/>" +
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/\" " +
+ "m:etag=\"W/"1"\">"
+ +
+ "<id>http://localhost:19000/Employees('1')</id>"
+ +
+ "<title type=\"text\">Walter Winter</title>"
+ +
+ "<updated>1999-01-01T00:00:00Z</updated>"
+ +
+ "<category term=\"RefScenario.Employee\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ "<link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>"
+ +
+ "<link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\" etag=\"mmEtag\"/>"
+ +
+ "<link href=\"Employees('1')/ne_Room\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"ne_Room\"/>"
+ +
+ "<link href=\"Employees('1')/ne_Manager\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"ne_Manager\"/>"
+ +
+ "<link href=\"Employees('1')/ne_Team\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"ne_Team\"/>"
+ +
"<content type=\"application/octet-stream\" src=\"Employees('1')/$value\"/>" +
"<m:properties>" +
"<d:EmployeeId>1</d:EmployeeId>" +
@@ -65,15 +85,32 @@ public class ContentNegotiationPostRequestTest extends AbstractContentNegotiatio
"</entry>";
private static final String ROOM_1_XML =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">" +
- "<id>http://localhost:19000/test/Rooms('1')</id>" +
- "<title type=\"text\">Room 1</title>" +
- "<updated>2013-01-11T13:50:50.541+01:00</updated>" +
- "<category term=\"RefScenario.Room\" scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>" +
- "<link href=\"Rooms('1')\" rel=\"edit\" title=\"Room\"/>" +
- "<link href=\"Rooms('1')/nr_Employees\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees\" type=\"application/atom+xml; type=feed\" title=\"nr_Employees\"/>" +
- "<link href=\"Rooms('1')/nr_Building\" rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building\" type=\"application/atom+xml; type=entry\" title=\"nr_Building\"/>" +
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
+ "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
+ "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
+ "xml:base=\"http://localhost:19000/test/\" m:etag=\"W/"1"\">"
+ +
+ "<id>http://localhost:19000/test/Rooms('1')</id>"
+ +
+ "<title type=\"text\">Room 1</title>"
+ +
+ "<updated>2013-01-11T13:50:50.541+01:00</updated>"
+ +
+ "<category term=\"RefScenario.Room\" " +
+ "scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\"/>"
+ +
+ "<link href=\"Rooms('1')\" rel=\"edit\" title=\"Room\"/>"
+ +
+ "<link href=\"Rooms('1')/nr_Employees\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees\" " +
+ "type=\"application/atom+xml; type=feed\" title=\"nr_Employees\"/>"
+ +
+ "<link href=\"Rooms('1')/nr_Building\" " +
+ "rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building\" " +
+ "type=\"application/atom+xml; type=entry\" title=\"nr_Building\"/>"
+ +
"<content type=\"application/xml\">" +
"<m:properties>" +
"<d:Id>1</d:Id>" +
@@ -91,7 +128,8 @@ public class ContentNegotiationPostRequestTest extends AbstractContentNegotiatio
FitTestSet testSet = FitTestSet.create(UriType.URI1, "/Employees", false, true, false).init();
// set specific response 'Content-Type's for '$format'
- testSet.setTestParam(Arrays.asList("application/xml", "application/xml; charset=utf-8"), HttpStatusCodes.OK, "application/xml; charset=utf-8");
+ testSet.setTestParam(Arrays.asList("application/xml", "application/xml; charset=utf-8"), HttpStatusCodes.OK,
+ "application/xml; charset=utf-8");
testSet.setTestParam(Arrays.asList("", "application/atom+xml", "application/atom+xml; charset=utf-8"),
HttpStatusCodes.OK, "application/atom+xml; type=feed; charset=utf-8");
@@ -126,7 +164,7 @@ public class ContentNegotiationPostRequestTest extends AbstractContentNegotiatio
.acceptHeader(Arrays.asList("", "application/xml"))
.content(ROOM_1_XML)
.requestContentTypes(CONTENT_TYPE_VALUES)
- // .requestContentTypes(Arrays.asList("application/xml; charset=utf-8", "application/xml"))
+ // .requestContentTypes(Arrays.asList("application/xml; charset=utf-8", "application/xml"))
.expectedStatusCode(HttpStatusCodes.CREATED)
.init();
@@ -137,13 +175,15 @@ public class ContentNegotiationPostRequestTest extends AbstractContentNegotiatio
final List<String> unsupportedRequestContentTypes = Arrays.asList(
"text/plain",
"text/plain; charset=utf-8",
- // "application/json",
- // "application/json; charset=utf-8",
+ // "application/json",
+ // "application/json; charset=utf-8",
"application/atomsvc+xml",
"application/atomsvc+xml; charset=utf-8"
);
- testSet.modifyRequestContentTypes(unsupportedRequestContentTypes, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE, "application/xml");
- testSet.modifyRequestContentTypes(Arrays.asList("application/json", "application/json; charset=utf-8"), HttpStatusCodes.BAD_REQUEST, "application/xml");
+ testSet.modifyRequestContentTypes(unsupportedRequestContentTypes, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE,
+ "application/xml");
+ testSet.modifyRequestContentTypes(Arrays.asList("application/json", "application/json; charset=utf-8"),
+ HttpStatusCodes.BAD_REQUEST, "application/xml");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -162,7 +202,9 @@ public class ContentNegotiationPostRequestTest extends AbstractContentNegotiatio
HttpStatusCodes expectedStatusCode = HttpStatusCodes.CREATED;
String expectedContentType = "application/atom+xml; charset=utf-8; type=entry";
- FitTest test = FitTest.create(uriType, httpMethod, path, queryOption, acceptHeader, content, requestContentType, expectedStatusCode, expectedContentType);
+ FitTest test =
+ FitTest.create(uriType, httpMethod, path, queryOption, acceptHeader, content, requestContentType,
+ expectedStatusCode, expectedContentType);
test.execute(getEndpoint());
}
@@ -181,7 +223,9 @@ public class ContentNegotiationPostRequestTest extends AbstractContentNegotiatio
HttpStatusCodes expectedStatusCode = HttpStatusCodes.CREATED;
String expectedContentType = "image/jpeg";
- FitTest test = FitTest.create(uriType, httpMethod, path, queryOption, acceptHeader, content, requestContentType, expectedStatusCode, expectedContentType);
+ FitTest test =
+ FitTest.create(uriType, httpMethod, path, queryOption, acceptHeader, content, requestContentType,
+ expectedStatusCode, expectedContentType);
test.execute(getEndpoint());
}
@@ -210,7 +254,8 @@ public class ContentNegotiationPostRequestTest extends AbstractContentNegotiatio
"application/atomsvc+xml",
"application/atomsvc+xml; charset=utf-8"
);
- testSet.modifyRequestContentTypes(unsupportedRequestContentTypes, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE, "application/xml");
+ testSet.modifyRequestContentTypes(unsupportedRequestContentTypes, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE,
+ "application/xml");
// execute all defined tests
testSet.execute(getEndpoint());
@@ -238,7 +283,8 @@ public class ContentNegotiationPostRequestTest extends AbstractContentNegotiatio
"application/atomsvc+xml",
"application/atomsvc+xml; charset=utf-8"
);
- testSet.modifyRequestContentTypes(unsupportedRequestContentTypes, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE, "application/xml");
+ testSet.modifyRequestContentTypes(unsupportedRequestContentTypes, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE,
+ "application/xml");
// execute all defined tests
testSet.execute(getEndpoint());
[20/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java
index 378ca48..590ea47 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -104,16 +104,30 @@ public class BasicProviderTest extends AbstractProviderTest {
String metadata = StringHelper.inputStreamToString((InputStream) response.getEntity());
setNamespaces();
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @Nullable and @annoPrefix:annoName]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @m:FC_TargetPath and @annoPrefix:annoName]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]/a:propertyAnnoElement", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]/a:propertyAnnoElement2", metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @Nullable and " +
+ "@annoPrefix:annoName]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @m:FC_TargetPath and " +
+ "@annoPrefix:annoName]",
+ metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]/a:propertyAnnoElement",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]/a:propertyAnnoElement2",
+ metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1", metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/b:schemaElementTest2", metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/prefix:schemaElementTest3", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/a:schemaElementTest4[@rel=\"self\" and @pre:href=\"http://foo\"]", metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/a:schemaElementTest4[@rel=\"self\" and " +
+ "@pre:href=\"http://foo\"]",
+ metadata);
}
@Test
@@ -127,16 +141,30 @@ public class BasicProviderTest extends AbstractProviderTest {
String metadata = StringHelper.inputStreamToString((InputStream) response.getEntity());
setNamespaces();
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @Nullable and @annoPrefix:annoName]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @m:FC_TargetPath and @annoPrefix:annoName]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]/a:propertyAnnoElement", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]/a:propertyAnnoElement2", metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @Nullable and " +
+ "@annoPrefix:annoName]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name and @Type and @m:FC_TargetPath and " +
+ "@annoPrefix:annoName]",
+ metadata);
+ assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]/a:propertyAnnoElement",
+ metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:EntityType/a:Property[@Name=\"EmployeeName\"]/a:propertyAnnoElement2",
+ metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1", metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/b:schemaElementTest2", metadata);
assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/prefix:schemaElementTest3", metadata);
- assertXpathExists("/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/a:schemaElementTest4[@rel=\"self\" and @pre:href=\"http://foo\"]", metadata);
+ assertXpathExists(
+ "/edmx:Edmx/edmx:DataServices/a:Schema/a:schemaElementTest1/a:schemaElementTest4[@rel=\"self\" and " +
+ "@pre:href=\"http://foo\"]",
+ metadata);
}
@Test
@@ -154,34 +182,42 @@ public class BasicProviderTest extends AbstractProviderTest {
@Test
public void readPropertyValue() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
- final Integer age = (Integer) provider.readPropertyValue(property, new ByteArrayInputStream("42".getBytes("UTF-8")), null);
+ final Integer age =
+ (Integer) provider.readPropertyValue(property, new ByteArrayInputStream("42".getBytes("UTF-8")), null);
assertEquals(Integer.valueOf(42), age);
}
@Test
public void readPropertyValueWithMapping() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
- final Long age = (Long) provider.readPropertyValue(property, new ByteArrayInputStream("42".getBytes("UTF-8")), Long.class);
+ final Long age =
+ (Long) provider.readPropertyValue(property, new ByteArrayInputStream("42".getBytes("UTF-8")), Long.class);
assertEquals(Long.valueOf(42), age);
}
@Test(expected = EntityProviderException.class)
public void readPropertyValueWithInvalidMapping() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
- final Float age = (Float) provider.readPropertyValue(property, new ByteArrayInputStream("42".getBytes("UTF-8")), Float.class);
+ final Float age =
+ (Float) provider.readPropertyValue(property, new ByteArrayInputStream("42".getBytes("UTF-8")), Float.class);
assertEquals(Float.valueOf(42), age);
}
@Test
public void readPropertyBinaryValue() throws Exception {
final byte[] bytes = new byte[] { 1, 2, 3, 4, -128 };
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("Image");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("Image");
- assertTrue(Arrays.equals(bytes, (byte[]) provider.readPropertyValue(property, new ByteArrayInputStream(bytes), null)));
+ assertTrue(Arrays.equals(bytes, (byte[]) provider
+ .readPropertyValue(property, new ByteArrayInputStream(bytes), null)));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java
index 9aab0bb..3af05cd 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -32,7 +32,7 @@ public class LoadXMLFactoryTest {
// CHECKSTYLE:OFF
@Test
public void loadWoodstockFactory() throws Exception {
- System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); //NOSONAR
+ System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); // NOSONAR
XMLOutputFactory factory = XMLOutputFactory.newInstance();
assertNotNull(factory);
assertEquals("com.ctc.wstx.stax.WstxOutputFactory", factory.getClass().getName());
@@ -40,7 +40,7 @@ public class LoadXMLFactoryTest {
@Test
public void loadSunFactory() throws Exception {
- System.setProperty("javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"); //NOSONAR
+ System.setProperty("javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"); // NOSONAR
XMLOutputFactory factory = XMLOutputFactory.newInstance();
assertNotNull(factory);
assertEquals("com.sun.xml.internal.stream.XMLOutputFactoryImpl", factory.getClass().getName());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
index 4970966..8a904d5 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java
index e7ec51a..e7ab5b9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -111,7 +111,8 @@ public class PerformanceTest extends AbstractProviderTest {
}
@Test
- public void readAtomEntry() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void readAtomEntry() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
long t = startTimer();
for (int i = 0; i < TIMES; i++) {
@@ -139,7 +140,8 @@ public class PerformanceTest extends AbstractProviderTest {
}
@Test
- public void readAtomEntryOptimized() throws IOException, XpathException, SAXException, XMLStreamException, FactoryConfigurationError, ODataException {
+ public void readAtomEntryOptimized() throws IOException, XpathException, SAXException, XMLStreamException,
+ FactoryConfigurationError, ODataException {
long t = startTimer();
ExpandSelectTreeNode epProperties = null;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
index de2214b..d62e3f0 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep;
@@ -65,9 +65,12 @@ public class ProviderFacadeImplTest {
"<category term=\"RefScenario.Employee\" scheme=\"" + Edm.NAMESPACE_SCHEME_2007_08 + "\"/>" +
"<link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>" +
"<link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\"/>" +
- "<link href=\"Employees('1')/ne_Room\" rel=\"" + Edm.NAMESPACE_REL_2007_08 + "ne_Room\" type=\"application/atom+xml; type=entry\" title=\"ne_Room\"/>" +
- "<link href=\"Employees('1')/ne_Manager\" rel=\"" + Edm.NAMESPACE_REL_2007_08 + "ne_Manager\" type=\"application/atom+xml; type=entry\" title=\"ne_Manager\"/>" +
- "<link href=\"Employees('1')/ne_Team\" rel=\"" + Edm.NAMESPACE_REL_2007_08 + "ne_Team\" type=\"application/atom+xml; type=entry\" title=\"ne_Team\"/>" +
+ "<link href=\"Employees('1')/ne_Room\" rel=\"" + Edm.NAMESPACE_REL_2007_08
+ + "ne_Room\" type=\"application/atom+xml; type=entry\" title=\"ne_Room\"/>" +
+ "<link href=\"Employees('1')/ne_Manager\" rel=\"" + Edm.NAMESPACE_REL_2007_08
+ + "ne_Manager\" type=\"application/atom+xml; type=entry\" title=\"ne_Manager\"/>" +
+ "<link href=\"Employees('1')/ne_Team\" rel=\"" + Edm.NAMESPACE_REL_2007_08
+ + "ne_Team\" type=\"application/atom+xml; type=entry\" title=\"ne_Team\"/>" +
"<content type=\"application/octet-stream\" src=\"Employees('1')/$value\"/>" +
"<m:properties>" +
"<d:EmployeeId>1</d:EmployeeId>" +
@@ -94,7 +97,9 @@ public class ProviderFacadeImplTest {
final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
InputStream content = new ByteArrayInputStream(EMPLOYEE_1_XML.getBytes("UTF-8"));
- final ODataEntry result = new ProviderFacadeImpl().readEntry(contentType, entitySet, content, EntityProviderReadProperties.init().mergeSemantic(true).build());
+ final ODataEntry result =
+ new ProviderFacadeImpl().readEntry(contentType, entitySet, content, EntityProviderReadProperties.init()
+ .mergeSemantic(true).build());
assertNotNull(result);
assertFalse(result.containsInlineEntry());
assertNotNull(result.getExpandSelectTree());
@@ -109,7 +114,8 @@ public class ProviderFacadeImplTest {
@Test
public void readPropertyValue() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
InputStream content = new ByteArrayInputStream("2012-02-29T01:02:03".getBytes("UTF-8"));
final Object result = new ProviderFacadeImpl().readPropertyValue(property, content, Long.class);
assertEquals(1330477323000L, result);
@@ -117,10 +123,13 @@ public class ProviderFacadeImplTest {
@Test
public void readProperty() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
final String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">42</Age>";
InputStream content = new ByteArrayInputStream(xml.getBytes("UTF-8"));
- final Map<String, Object> result = new ProviderFacadeImpl().readProperty(HttpContentType.APPLICATION_XML, property, content, EntityProviderReadProperties.init().build());
+ final Map<String, Object> result =
+ new ProviderFacadeImpl().readProperty(HttpContentType.APPLICATION_XML, property, content,
+ EntityProviderReadProperties.init().build());
assertFalse(result.isEmpty());
assertEquals(42, result.get("Age"));
}
@@ -136,8 +145,11 @@ public class ProviderFacadeImplTest {
@Test
public void readLinks() throws Exception {
final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
- InputStream content = new ByteArrayInputStream("{\"d\":{\"__count\":\"42\",\"results\":[{\"uri\":\"http://somelink\"}]}}".getBytes("UTF-8"));
- final List<String> result = new ProviderFacadeImpl().readLinks(HttpContentType.APPLICATION_JSON, entitySet, content);
+ InputStream content =
+ new ByteArrayInputStream("{\"d\":{\"__count\":\"42\",\"results\":[{\"uri\":\"http://somelink\"}]}}"
+ .getBytes("UTF-8"));
+ final List<String> result =
+ new ProviderFacadeImpl().readLinks(HttpContentType.APPLICATION_JSON, entitySet, content);
assertEquals(Arrays.asList("http://somelink"), result);
}
@@ -145,7 +157,9 @@ public class ProviderFacadeImplTest {
public void writeFeed() throws Exception {
final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
List<Map<String, Object>> propertiesList = new ArrayList<Map<String, Object>>();
- final ODataResponse result = new ProviderFacadeImpl().writeFeed(HttpContentType.APPLICATION_JSON, entitySet, propertiesList, EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeFeed(HttpContentType.APPLICATION_JSON, entitySet, propertiesList,
+ EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
assertEquals("{\"d\":{\"results\":[]}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
}
@@ -154,7 +168,9 @@ public class ProviderFacadeImplTest {
final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams");
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("Id", "42");
- final ODataResponse result = new ProviderFacadeImpl().writeEntry(HttpContentType.APPLICATION_JSON, entitySet, properties, EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeEntry(HttpContentType.APPLICATION_JSON, entitySet, properties,
+ EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
assertEquals("{\"d\":{\"__metadata\":{\"id\":\"http://root/Teams('42')\","
+ "\"uri\":\"http://root/Teams('42')\",\"type\":\"RefScenario.Team\"},"
+ "\"Id\":\"42\",\"Name\":null,\"isScrumTeam\":null,"
@@ -164,8 +180,10 @@ public class ProviderFacadeImplTest {
@Test
public void writeProperty() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
- final ODataResponse result = new ProviderFacadeImpl().writeProperty(HttpContentType.APPLICATION_XML, property, 987654321000L);
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeProperty(HttpContentType.APPLICATION_XML, property, 987654321000L);
assertNull("EntityProvider should not set content header", result.getContentHeader());
assertTrue(StringHelper.inputStreamToString((InputStream) result.getEntity())
.endsWith("\">2001-04-19T04:25:21</EntryDate>"));
@@ -176,7 +194,9 @@ public class ProviderFacadeImplTest {
final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("Id", "42");
- final ODataResponse result = new ProviderFacadeImpl().writeLink(HttpContentType.APPLICATION_JSON, entitySet, properties, EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeLink(HttpContentType.APPLICATION_JSON, entitySet, properties,
+ EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
assertEquals("{\"d\":{\"uri\":\"http://root/Rooms('42')\"}}",
StringHelper.inputStreamToString((InputStream) result.getEntity()));
}
@@ -189,23 +209,28 @@ public class ProviderFacadeImplTest {
List<Map<String, Object>> propertiesList = new ArrayList<Map<String, Object>>();
propertiesList.add(properties);
propertiesList.add(properties);
- final ODataResponse result = new ProviderFacadeImpl().writeLinks(HttpContentType.APPLICATION_JSON, entitySet, propertiesList, EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeLinks(HttpContentType.APPLICATION_JSON, entitySet, propertiesList,
+ EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
assertEquals("{\"d\":[{\"uri\":\"http://root/Rooms('42')\"},{\"uri\":\"http://root/Rooms('42')\"}]}",
StringHelper.inputStreamToString((InputStream) result.getEntity()));
}
@Test
public void writeServiceDocument() throws Exception {
- final ODataResponse result = new ProviderFacadeImpl().writeServiceDocument(HttpContentType.APPLICATION_JSON, MockFacade.getMockEdm(), "root");
+ final ODataResponse result =
+ new ProviderFacadeImpl()
+ .writeServiceDocument(HttpContentType.APPLICATION_JSON, MockFacade.getMockEdm(), "root");
assertEquals("{\"d\":{\"EntitySets\":[]}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
}
@Test
public void writePropertyValue() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
final ODataResponse result = new ProviderFacadeImpl().writePropertyValue(property, 987654321000L);
assertNull("BasicProvider should not set content header", result.getContentHeader());
-
+
assertEquals("2001-04-19T04:25:21", StringHelper.inputStreamToString((InputStream) result.getEntity()));
}
@@ -218,7 +243,8 @@ public class ProviderFacadeImplTest {
@Test
public void writeBinary() throws Exception {
- final ODataResponse result = new ProviderFacadeImpl().writeBinary(HttpContentType.APPLICATION_OCTET_STREAM, new byte[] { 102, 111, 111 });
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeBinary(HttpContentType.APPLICATION_OCTET_STREAM, new byte[] { 102, 111, 111 });
assertEquals(HttpContentType.APPLICATION_OCTET_STREAM, result.getContentHeader());
assertEquals("foo", StringHelper.inputStreamToString((InputStream) result.getEntity()));
}
@@ -233,10 +259,12 @@ public class ProviderFacadeImplTest {
@Test
public void writeFunctionImport() throws Exception {
- final EdmFunctionImport function = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
+ final EdmFunctionImport function =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("MaximalAge", 99);
- final ODataResponse result = new ProviderFacadeImpl().writeFunctionImport(HttpContentType.APPLICATION_JSON, function, properties, null);
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeFunctionImport(HttpContentType.APPLICATION_JSON, function, properties, null);
assertEquals("{\"d\":{\"MaximalAge\":99}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java
index 03cbb78..5e0809e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.aggregator;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java
index 11e5ddc..37a352c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -47,13 +47,15 @@ import org.apache.olingo.odata2.testutil.mock.MockFacade;
*/
public abstract class AbstractConsumerTest extends BaseTest {
- protected static final EntityProviderReadProperties DEFAULT_PROPERTIES = EntityProviderReadProperties.init().mergeSemantic(false).build();
+ protected static final EntityProviderReadProperties DEFAULT_PROPERTIES = EntityProviderReadProperties.init()
+ .mergeSemantic(false).build();
protected XMLStreamReader createReaderForTest(final String input) throws XMLStreamException {
return createReaderForTest(input, false);
}
- protected XMLStreamReader createReaderForTest(final String input, final boolean namespaceAware) throws XMLStreamException {
+ protected XMLStreamReader createReaderForTest(final String input, final boolean namespaceAware)
+ throws XMLStreamException {
XMLInputFactory factory = XMLInputFactory.newInstance();
factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, namespaceAware);
@@ -97,7 +99,7 @@ public abstract class AbstractConsumerTest extends BaseTest {
* As example an correct method call would be:
* <p>
* <code>
- * createTypeMappings("someKey", Integer.class, "anotherKey", Long.class);
+ * createTypeMappings("someKey", Integer.class, "anotherKey", Long.class);
* </code>
* </p>
*
@@ -128,7 +130,8 @@ public abstract class AbstractConsumerTest extends BaseTest {
* @return
* @throws UnsupportedEncodingException
*/
- protected InputStream createContentAsStream(final String content, final boolean replaceWhitespaces) throws UnsupportedEncodingException {
+ protected InputStream createContentAsStream(final String content, final boolean replaceWhitespaces)
+ throws UnsupportedEncodingException {
String contentForStream = content;
if (replaceWhitespaces) {
contentForStream = content.replaceAll(">\\s.<", "><");
@@ -137,8 +140,10 @@ public abstract class AbstractConsumerTest extends BaseTest {
return new ByteArrayInputStream(contentForStream.getBytes("UTF-8"));
}
- protected ODataEntry prepareAndExecuteEntry(final String fileName, final String entitySetName, final EntityProviderReadProperties readProperties) throws IOException, EdmException, ODataException, UnsupportedEncodingException, EntityProviderException {
- //prepare
+ protected ODataEntry prepareAndExecuteEntry(final String fileName, final String entitySetName,
+ final EntityProviderReadProperties readProperties) throws IOException, EdmException, ODataException,
+ UnsupportedEncodingException, EntityProviderException {
+ // prepare
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet(entitySetName);
String content = readFile(fileName);
assertNotNull(content);
@@ -151,8 +156,10 @@ public abstract class AbstractConsumerTest extends BaseTest {
return result;
}
- protected ODataFeed prepareAndExecuteFeed(final String fileName, final String entitySetName, final EntityProviderReadProperties readProperties) throws IOException, EdmException, ODataException, UnsupportedEncodingException, EntityProviderException {
- //prepare
+ protected ODataFeed prepareAndExecuteFeed(final String fileName, final String entitySetName,
+ final EntityProviderReadProperties readProperties) throws IOException, EdmException, ODataException,
+ UnsupportedEncodingException, EntityProviderException {
+ // prepare
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet(entitySetName);
String content = readFile(fileName);
assertNotNull(content);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
index f25c95c..d82eff3 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -234,7 +234,8 @@ public class AtomServiceDocumentConsumerTest {
} else if ("link".equals(extElement.getName())) {
assertEquals(Edm.NAMESPACE_ATOM_2005, extElement.getNamespace());
assertEquals(4, extElement.getAttributes().size());
- assertEquals("TravelagencyCollection/OpenSearchDescription.xml", extElement.getAttributes().get(0).getText());
+ assertEquals("TravelagencyCollection/OpenSearchDescription.xml", extElement.getAttributes().get(0)
+ .getText());
assertEquals("href", extElement.getAttributes().get(0).getName());
} else {
fail();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
index 37edd4d..0d4a2f4 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -49,7 +49,7 @@ public class JsonEntryConsumerTest extends AbstractConsumerTest {
private static final String INVALID_ENTRY_TEAM_DOUBLE_NAME_PROPERTY = "JsonInvalidTeamDoubleNameProperty.json";
private static final String SIMPLE_ENTRY_BUILDING_WITHOUT_D = "JsonBuildingWithoutD.json";
- //Negative Test jsonStart
+ // Negative Test jsonStart
private static final String negativeJsonStart_1 = "{ \"abc\": {";
private static final String negativeJsonStart_2 = "{ \"d\": [a: 1, b: 2] }";
@@ -131,7 +131,7 @@ public class JsonEntryConsumerTest extends AbstractConsumerTest {
@Test
public void readSimpleBuildingEntry() throws Exception {
ODataEntry result = prepareAndExecuteEntry(SIMPLE_ENTRY_BUILDING, "Buildings", DEFAULT_PROPERTIES);
- //verify
+ // verify
Map<String, Object> properties = result.getProperties();
assertNotNull(properties);
assertEquals("1", properties.get("Id"));
@@ -149,7 +149,7 @@ public class JsonEntryConsumerTest extends AbstractConsumerTest {
@Test
public void readSimpleBuildingEntryWithoutD() throws Exception {
ODataEntry result = prepareAndExecuteEntry(SIMPLE_ENTRY_BUILDING_WITHOUT_D, "Buildings", DEFAULT_PROPERTIES);
- //verify
+ // verify
Map<String, Object> properties = result.getProperties();
assertNotNull(properties);
assertEquals("1", properties.get("Id"));
@@ -167,7 +167,8 @@ public class JsonEntryConsumerTest extends AbstractConsumerTest {
@Test
public void readMinimalEntry() throws Exception {
final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams");
- final ODataEntry result = new JsonEntityConsumer().readEntry(entitySet, createContentAsStream("{\"Id\":\"99\"}"), DEFAULT_PROPERTIES);
+ final ODataEntry result =
+ new JsonEntityConsumer().readEntry(entitySet, createContentAsStream("{\"Id\":\"99\"}"), DEFAULT_PROPERTIES);
final Map<String, Object> properties = result.getProperties();
assertNotNull(properties);
@@ -201,7 +202,7 @@ public class JsonEntryConsumerTest extends AbstractConsumerTest {
@Test
public void readWithDoublePropertyOnTeam() throws Exception {
- //The file contains the name property two times
+ // The file contains the name property two times
try {
prepareAndExecuteEntry(INVALID_ENTRY_TEAM_DOUBLE_NAME_PROPERTY, "Teams", DEFAULT_PROPERTIES);
fail("Exception has to be thrown");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java
index 8c03c04..4919d99 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -76,7 +76,8 @@ public class JsonEntryDeepInsertEntryTest extends AbstractConsumerTest {
@Test
public void innerEntryNoMediaResourceWithCallback() throws Exception {
EntryCallback callback = new EntryCallback();
- EntityProviderReadProperties readProperties = EntityProviderReadProperties.init().mergeSemantic(false).callback(callback).build();
+ EntityProviderReadProperties readProperties =
+ EntityProviderReadProperties.init().mergeSemantic(false).callback(callback).build();
ODataEntry outerEntry = prepareAndExecuteEntry(EMPLOYEE_WITH_INLINE_TEAM, "Employees", readProperties);
assertThat(outerEntry.getProperties().get("ne_Team"), nullValue());
@@ -96,9 +97,10 @@ public class JsonEntryDeepInsertEntryTest extends AbstractConsumerTest {
@Test
public void innerEntryWithOptionalNavigationProperty() throws Exception {
- //prepare
+ // prepare
EntryCallback callback = new EntryCallback();
- EntityProviderReadProperties readProperties = EntityProviderReadProperties.init().mergeSemantic(false).callback(callback).build();
+ EntityProviderReadProperties readProperties =
+ EntityProviderReadProperties.init().mergeSemantic(false).callback(callback).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
// modify edm for test case (change multiplicity to ZERO_TO_ONE)
EdmType navigationType = mock(EdmType.class);
@@ -178,7 +180,8 @@ public class JsonEntryDeepInsertEntryTest extends AbstractConsumerTest {
@Test
public void inlineRoomWithInlineBuildingWithRoomCallback() throws Exception {
EntryCallback callback = new EntryCallback();
- EntityProviderReadProperties readProperties = EntityProviderReadProperties.init().mergeSemantic(false).callback(callback).build();
+ EntityProviderReadProperties readProperties =
+ EntityProviderReadProperties.init().mergeSemantic(false).callback(callback).build();
ODataEntry outerEntry = prepareAndExecuteEntry(INLINE_ROOM_WITH_INLINE_BUILDING, "Employees", readProperties);
ODataEntry innerRoom = (ODataEntry) outerEntry.getProperties().get("ne_Room");
@@ -221,7 +224,8 @@ public class JsonEntryDeepInsertEntryTest extends AbstractConsumerTest {
public void inlineRoomWithInlineBuildingWithCallbacks() throws Exception {
EntryCallback buildingCallback = new EntryCallback();
EntryCallback roomCallback = new EntryCallback(buildingCallback);
- EntityProviderReadProperties readProperties = EntityProviderReadProperties.init().mergeSemantic(false).callback(roomCallback).build();
+ EntityProviderReadProperties readProperties =
+ EntityProviderReadProperties.init().mergeSemantic(false).callback(roomCallback).build();
ODataEntry outerEntry = prepareAndExecuteEntry(INLINE_ROOM_WITH_INLINE_BUILDING, "Employees", readProperties);
ODataEntry innerRoom = (ODataEntry) outerEntry.getProperties().get("ne_Room");
@@ -289,7 +293,8 @@ public class JsonEntryDeepInsertEntryTest extends AbstractConsumerTest {
}
@Override
- public EntityProviderReadProperties receiveReadProperties(final EntityProviderReadProperties readProperties, final EdmNavigationProperty navString) {
+ public EntityProviderReadProperties receiveReadProperties(final EntityProviderReadProperties readProperties,
+ final EdmNavigationProperty navString) {
return EntityProviderReadProperties.init().mergeSemantic(false).callback(innerCallback).build();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
index 51e5453..3fec7f9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -46,7 +46,8 @@ public class JsonEntryDeepInsertFeedTest extends AbstractConsumerTest {
private static final String BUILDING_WITH_INLINE_ROOMS = "JsonBuildingWithInlineRooms.json";
private static final String TEAM_WITH_INLINE_EMPLOYEES = "JsonTeamsWithInlineEmployees.json";
- private static final String BUILDING_WITH_INLINE_ROOMS_NEXTLINK_AND_COUNT = "JsonBuildingWithInlineRoomsAndNextLinkAndCount.json";
+ private static final String BUILDING_WITH_INLINE_ROOMS_NEXTLINK_AND_COUNT =
+ "JsonBuildingWithInlineRoomsAndNextLinkAndCount.json";
@Test
public void innerFeedNoMediaResourceWithoutCallback() throws Exception {
@@ -79,7 +80,8 @@ public class JsonEntryDeepInsertFeedTest extends AbstractConsumerTest {
@Test
public void innerFeedNoMediaResourceWithoutCallbackContainsNextLinkAndCount() throws Exception {
- ODataEntry outerEntry = prepareAndExecuteEntry(BUILDING_WITH_INLINE_ROOMS_NEXTLINK_AND_COUNT, "Buildings", DEFAULT_PROPERTIES);
+ ODataEntry outerEntry =
+ prepareAndExecuteEntry(BUILDING_WITH_INLINE_ROOMS_NEXTLINK_AND_COUNT, "Buildings", DEFAULT_PROPERTIES);
ODataFeed innerRoomFeed = (ODataFeed) outerEntry.getProperties().get("nb_Rooms");
assertNotNull(innerRoomFeed);
@@ -124,7 +126,8 @@ public class JsonEntryDeepInsertFeedTest extends AbstractConsumerTest {
@Test
public void innerFeedNoMediaResourceWithCallback() throws Exception {
FeedCallback callback = new FeedCallback();
- EntityProviderReadProperties readProperties = EntityProviderReadProperties.init().mergeSemantic(false).callback(callback).build();
+ EntityProviderReadProperties readProperties =
+ EntityProviderReadProperties.init().mergeSemantic(false).callback(callback).build();
ODataEntry outerEntry = prepareAndExecuteEntry(BUILDING_WITH_INLINE_ROOMS, "Buildings", readProperties);
ODataFeed innerRoomFeed = (ODataFeed) outerEntry.getProperties().get("nb_Rooms");
@@ -156,7 +159,8 @@ public class JsonEntryDeepInsertFeedTest extends AbstractConsumerTest {
@Test
public void innerFeedNoMediaResourceWithCallbackContainsNextLinkAndCount() throws Exception {
- ODataEntry outerEntry = prepareAndExecuteEntry(BUILDING_WITH_INLINE_ROOMS_NEXTLINK_AND_COUNT, "Buildings", DEFAULT_PROPERTIES);
+ ODataEntry outerEntry =
+ prepareAndExecuteEntry(BUILDING_WITH_INLINE_ROOMS_NEXTLINK_AND_COUNT, "Buildings", DEFAULT_PROPERTIES);
ODataFeed innerRoomFeed = (ODataFeed) outerEntry.getProperties().get("nb_Rooms");
assertNotNull(innerRoomFeed);
@@ -206,7 +210,8 @@ public class JsonEntryDeepInsertFeedTest extends AbstractConsumerTest {
}
@Override
- public EntityProviderReadProperties receiveReadProperties(final EntityProviderReadProperties readProperties, final EdmNavigationProperty navString) {
+ public EntityProviderReadProperties receiveReadProperties(final EntityProviderReadProperties readProperties,
+ final EdmNavigationProperty navString) {
return EntityProviderReadProperties.init().mergeSemantic(false).callback(innerCallback).build();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
index 8056c3c..ed25f21 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
@@ -48,7 +48,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
assertNotNull(entries);
assertEquals(2, entries.size());
- //Team1
+ // Team1
ODataEntry entry = entries.get(0);
Map<String, Object> properties = entry.getProperties();
assertNotNull(properties);
@@ -63,7 +63,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
checkMediaDataInitial(entry.getMediaMetadata());
- //Team2
+ // Team2
entry = entries.get(1);
properties = entry.getProperties();
assertNotNull(properties);
@@ -78,7 +78,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
checkMediaDataInitial(entry.getMediaMetadata());
- //Check FeedMetadata
+ // Check FeedMetadata
FeedMetadata feedMetadata = feed.getFeedMetadata();
assertNotNull(feedMetadata);
assertNull(feedMetadata.getInlineCount());
@@ -93,7 +93,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
assertNotNull(entries);
assertEquals(2, entries.size());
- //Team1
+ // Team1
ODataEntry entry = entries.get(0);
Map<String, Object> properties = entry.getProperties();
assertNotNull(properties);
@@ -108,7 +108,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
checkMediaDataInitial(entry.getMediaMetadata());
- //Team2
+ // Team2
entry = entries.get(1);
properties = entry.getProperties();
assertNotNull(properties);
@@ -123,7 +123,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
checkMediaDataInitial(entry.getMediaMetadata());
- //Check FeedMetadata
+ // Check FeedMetadata
FeedMetadata feedMetadata = feed.getFeedMetadata();
assertNotNull(feedMetadata);
assertNull(feedMetadata.getInlineCount());
@@ -277,7 +277,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
assertNotNull(entries);
assertEquals(2, entries.size());
- //Check FeedMetadata
+ // Check FeedMetadata
FeedMetadata feedMetadata = feed.getFeedMetadata();
assertNotNull(feedMetadata);
assertEquals(Integer.valueOf(3), feedMetadata.getInlineCount());
@@ -292,7 +292,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
assertNotNull(entries);
assertEquals(2, entries.size());
- //Check FeedMetadata
+ // Check FeedMetadata
FeedMetadata feedMetadata = feed.getFeedMetadata();
assertNotNull(feedMetadata);
assertEquals(Integer.valueOf(3), feedMetadata.getInlineCount());
@@ -302,7 +302,13 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
@Test
public void feedWithInlineCountAndNextAndDelta() throws Exception {
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams");
- String content = "{\"d\":{\"__count\":\"3\",\"results\":[{\"__metadata\":{\"id\":\"http://localhost:8080/ReferenceScenario.svc/Teams('1')\",\"uri\":\"http://localhost:8080/ReferenceScenario.svc/Teams('1')\",\"type\":\"RefScenario.Team\"},\"Id\":\"1\",\"Name\":\"Team 1\",\"isScrumTeam\":false,\"nt_Employees\":{\"__deferred\":{\"uri\":\"http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees\"}}}],\"__next\":\"Rooms?$skiptoken=98&$inlinecount=allpages\",\"__delta\":\"deltalink\"}}";
+ String content =
+ "{\"d\":{\"__count\":\"3\",\"results\":[{" +
+ "\"__metadata\":{\"id\":\"http://localhost:8080/ReferenceScenario.svc/Teams('1')\"," +
+ "\"uri\":\"http://localhost:8080/ReferenceScenario.svc/Teams('1')\",\"type\":\"RefScenario.Team\"}," +
+ "\"Id\":\"1\",\"Name\":\"Team 1\",\"isScrumTeam\":false,\"nt_Employees\":{\"__deferred\":{" +
+ "\"uri\":\"http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees\"}}}]," +
+ "\"__next\":\"Rooms?$skiptoken=98&$inlinecount=allpages\",\"__delta\":\"deltalink\"}}";
assertNotNull(content);
InputStream contentBody = createContentAsStream(content);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java
index b72ab07..46436c2 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
[47/59] [abbrv] cleanup of jpa api
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypesMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypesMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypesMapType.java
index 9d18d0b..131e738 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypesMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypesMapType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
@@ -36,13 +36,15 @@ import javax.xml.bind.annotation.XmlType;
*
* <pre>
* <complexType name="JPAEmbeddableTypesMapType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="JPAEmbeddableType" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAEmbeddableTypeMapType" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="JPAEmbeddableType"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAEmbeddableTypeMapType"
+ * maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
* </complexType>
* </pre>
*
@@ -73,8 +75,7 @@ public class JPAEmbeddableTypesMapType {
*
*
* <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JPAEmbeddableTypeMapType }
+ * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType }
*
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java
index fe94216..2f4526c 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlType;
/**
*
- * The default name for EDM
- * entity type is derived from JPA entity type name. This can be
- * overriden using JPAEntityTypeMapType.
- *
+ * The default name for EDM
+ * entity type is derived from JPA entity type name. This can be
+ * overriden using JPAEntityTypeMapType.
+ *
*
* <p>Java class for JPAEntityTypeMapType complex type.
*
@@ -37,25 +37,28 @@ import javax.xml.bind.annotation.XmlType;
*
* <pre>
* <complexType name="JPAEntityTypeMapType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="EDMEntityType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="EDMEntitySet" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="JPAAttributes" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAAttributeMapType"/>
- * <element name="JPARelationships" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPARelationshipMapType"/>
- * </sequence>
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </restriction>
- * </complexContent>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="EDMEntityType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="EDMEntitySet" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="JPAAttributes"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAAttributeMapType"/>
+ * <element name="JPARelationships"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPARelationshipMapType"/>
+ * </sequence>
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * </restriction>
+ * </complexContent>
* </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes", "jpaRelationships" })
+@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes",
+ "jpaRelationships" })
public class JPAEntityTypeMapType {
@XmlElement(name = "EDMEntityType")
@@ -75,9 +78,8 @@ public class JPAEntityTypeMapType {
* Gets the value of the edmEntityType property.
*
* @return
- * possible object is
- * {@link String }
- *
+ * possible object is {@link String }
+ *
*/
public String getEDMEntityType() {
return edmEntityType;
@@ -87,9 +89,8 @@ public class JPAEntityTypeMapType {
* Sets the value of the edmEntityType property.
*
* @param value
- * allowed object is
- * {@link String }
- *
+ * allowed object is {@link String }
+ *
*/
public void setEDMEntityType(final String value) {
edmEntityType = value;
@@ -99,9 +100,8 @@ public class JPAEntityTypeMapType {
* Gets the value of the edmEntitySet property.
*
* @return
- * possible object is
- * {@link String }
- *
+ * possible object is {@link String }
+ *
*/
public String getEDMEntitySet() {
return edmEntitySet;
@@ -111,9 +111,8 @@ public class JPAEntityTypeMapType {
* Sets the value of the edmEntitySet property.
*
* @param value
- * allowed object is
- * {@link String }
- *
+ * allowed object is {@link String }
+ *
*/
public void setEDMEntitySet(final String value) {
edmEntitySet = value;
@@ -123,9 +122,8 @@ public class JPAEntityTypeMapType {
* Gets the value of the jpaAttributes property.
*
* @return
- * possible object is
- * {@link JPAAttributeMapType }
- *
+ * possible object is {@link JPAAttributeMapType }
+ *
*/
public JPAAttributeMapType getJPAAttributes() {
return jpaAttributes;
@@ -135,9 +133,8 @@ public class JPAEntityTypeMapType {
* Sets the value of the jpaAttributes property.
*
* @param value
- * allowed object is
- * {@link JPAAttributeMapType }
- *
+ * allowed object is {@link JPAAttributeMapType }
+ *
*/
public void setJPAAttributes(final JPAAttributeMapType value) {
jpaAttributes = value;
@@ -147,9 +144,8 @@ public class JPAEntityTypeMapType {
* Gets the value of the jpaRelationships property.
*
* @return
- * possible object is
- * {@link JPARelationshipMapType }
- *
+ * possible object is {@link JPARelationshipMapType }
+ *
*/
public JPARelationshipMapType getJPARelationships() {
return jpaRelationships;
@@ -159,9 +155,8 @@ public class JPAEntityTypeMapType {
* Sets the value of the jpaRelationships property.
*
* @param value
- * allowed object is
- * {@link JPARelationshipMapType }
- *
+ * allowed object is {@link JPARelationshipMapType }
+ *
*/
public void setJPARelationships(final JPARelationshipMapType value) {
jpaRelationships = value;
@@ -171,9 +166,8 @@ public class JPAEntityTypeMapType {
* Gets the value of the name property.
*
* @return
- * possible object is
- * {@link String }
- *
+ * possible object is {@link String }
+ *
*/
public String getName() {
return name;
@@ -183,9 +177,8 @@ public class JPAEntityTypeMapType {
* Sets the value of the name property.
*
* @param value
- * allowed object is
- * {@link String }
- *
+ * allowed object is {@link String }
+ *
*/
public void setName(final String value) {
name = value;
@@ -195,9 +188,8 @@ public class JPAEntityTypeMapType {
* Gets the value of the exclude property.
*
* @return
- * possible object is
- * {@link Boolean }
- *
+ * possible object is {@link Boolean }
+ *
*/
public boolean isExclude() {
if (exclude == null) {
@@ -211,9 +203,8 @@ public class JPAEntityTypeMapType {
* Sets the value of the exclude property.
*
* @param value
- * allowed object is
- * {@link Boolean }
- *
+ * allowed object is {@link Boolean }
+ *
*/
public void setExclude(final Boolean value) {
exclude = value;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypesMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypesMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypesMapType.java
index a6832a2..cd2a6de 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypesMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypesMapType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
@@ -36,13 +36,15 @@ import javax.xml.bind.annotation.XmlType;
*
* <pre>
* <complexType name="JPAEntityTypesMapType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="JPAEntityType" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAEntityTypeMapType" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="JPAEntityType"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAEntityTypeMapType"
+ * maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
* </complexType>
* </pre>
*
@@ -73,8 +75,7 @@ public class JPAEntityTypesMapType {
*
*
* <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JPAEntityTypeMapType }
+ * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType }
*
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java
index b60215e..a9d34b2 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
@@ -39,23 +39,26 @@ import javax.xml.bind.annotation.XmlType;
*
* <pre>
* <complexType name="JPAPersistenceUnitMapType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="EDMSchemaNamespace" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="JPAEntityTypes" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAEntityTypesMapType"/>
- * <element name="JPAEmbeddableTypes" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAEmbeddableTypesMapType"/>
- * </sequence>
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </restriction>
- * </complexContent>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="EDMSchemaNamespace" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="JPAEntityTypes"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAEntityTypesMapType"/>
+ * <element name="JPAEmbeddableTypes"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAEmbeddableTypesMapType"/>
+ * </sequence>
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
* </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAPersistenceUnitMapType", propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" })
+@XmlType(name = "JPAPersistenceUnitMapType",
+ propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" })
public class JPAPersistenceUnitMapType {
@XmlElement(name = "EDMSchemaNamespace")
@@ -81,7 +84,7 @@ public class JPAPersistenceUnitMapType {
* Sets the value of the edmSchemaNamespace property.
*
* @param value
- * allowed object is {@link String }
+ * allowed object is {@link String }
*
*/
public void setEDMSchemaNamespace(final String value) {
@@ -102,7 +105,7 @@ public class JPAPersistenceUnitMapType {
* Sets the value of the jpaEntityTypes property.
*
* @param value
- * allowed object is {@link JPAEntityTypesMapType }
+ * allowed object is {@link JPAEntityTypesMapType }
*
*/
public void setJPAEntityTypes(final JPAEntityTypesMapType value) {
@@ -123,7 +126,7 @@ public class JPAPersistenceUnitMapType {
* Sets the value of the jpaEmbeddableTypes property.
*
* @param value
- * allowed object is {@link JPAEmbeddableTypesMapType }
+ * allowed object is {@link JPAEmbeddableTypesMapType }
*
*/
public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) {
@@ -144,7 +147,7 @@ public class JPAPersistenceUnitMapType {
* Sets the value of the name property.
*
* @param value
- * allowed object is {@link String }
+ * allowed object is {@link String }
*
*/
public void setName(final String value) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPARelationshipMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPARelationshipMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPARelationshipMapType.java
index 5c88792..986c187 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPARelationshipMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPARelationshipMapType.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
@@ -43,21 +43,21 @@ import javax.xml.bind.annotation.XmlValue;
*
* <pre>
* <complexType name="JPARelationshipMapType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="JPARelationship" maxOccurs="unbounded" minOccurs="0">
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </element>
- * </sequence>
- * </restriction>
- * </complexContent>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="JPARelationship" maxOccurs="unbounded" minOccurs="0">
+ * <complexType>
+ * <simpleContent>
+ * <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </simpleContent>
+ * </complexType>
+ * </element>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
* </complexType>
* </pre>
*
@@ -88,8 +88,7 @@ public class JPARelationshipMapType {
*
*
* <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JPARelationshipMapType.JPARelationship }
+ * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship }
*
*
*/
@@ -110,11 +109,11 @@ public class JPARelationshipMapType {
*
* <pre>
* <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </simpleContent>
+ * <simpleContent>
+ * <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </simpleContent>
* </complexType>
* </pre>
*
@@ -143,7 +142,7 @@ public class JPARelationshipMapType {
* Sets the value of the value property.
*
* @param value
- * allowed object is {@link String }
+ * allowed object is {@link String }
*
*/
public void setValue(final String value) {
@@ -164,7 +163,7 @@ public class JPARelationshipMapType {
* Sets the value of the name property.
*
* @param value
- * allowed object is {@link String }
+ * allowed object is {@link String }
*
*/
public void setName(final String value) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java
index 615b993..4593031 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java
@@ -1,27 +1,28 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
/**
* <h3>OData JPA Processor API Library - Mapping Model</h3>
* The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes.
*
- *
+ *
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping",
+ elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.olingo.odata2.processor.api.jpa.model.mapping;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java
index 75279e8..b2cf90a 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java
@@ -1,27 +1,27 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
/**
* <h3>OData JPA Processor API Library - JPA EDM Model</h3>
- * The library provides a set of views over the JPA/EDM element containers.
+ * The library provides a set of views over the JPA/EDM element containers.
* The views can used to access the elements that form EDM.
*
- *
+ *
*/
package org.apache.olingo.odata2.processor.api.jpa.model;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java
index 4ca40de..89f4974 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
/**
* <h3>OData JPA Processor API Library</h3>
@@ -24,10 +24,10 @@
* To create an OData service from JPA models
* <ol><li>extend the service factory class {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAServiceFactory}
* and implement the methods</li>
- * <li>define a JAX-RS servlet in web.xml and configure the service factory as servlet init parameter.
+ * <li>define a JAX-RS servlet in web.xml and configure the service factory as servlet init parameter.
* <p><b>See Also:</b>{@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAServiceFactory}</li></ol>
*
- *
+ *
*/
package org.apache.olingo.odata2.processor.api.jpa;
[26/59] [abbrv] Cleanup of core
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
index 89bfe94..eb5ecb1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.core.edm.EdmSimpleTypeFacadeImpl;
*
*/
public class FilterParserImpl implements FilterParser {
- /*do the static initialization*/
+ /* do the static initialization */
protected static Map<String, InfoBinaryOperator> availableBinaryOperators;
protected static Map<String, InfoMethod> availableMethods;
protected static Map<String, InfoUnaryOperator> availableUnaryOperators;
@@ -59,7 +59,7 @@ public class FilterParserImpl implements FilterParser {
initAvailTables();
}
- /*instance attributes*/
+ /* instance attributes */
protected EdmEntityType resourceEntityType = null;
protected TokenList tokenList = null;
protected String curExpression;
@@ -73,15 +73,17 @@ public class FilterParserImpl implements FilterParser {
}
@Override
- public FilterExpression parseFilterString(final String filterExpression) throws ExpressionParserException, ExpressionParserInternalError {
+ public FilterExpression parseFilterString(final String filterExpression) throws ExpressionParserException,
+ ExpressionParserInternalError {
return parseFilterString(filterExpression, false);
}
- public FilterExpression parseFilterString(final String filterExpression, final boolean allowOnlyBinary) throws ExpressionParserException, ExpressionParserInternalError {
+ public FilterExpression parseFilterString(final String filterExpression, final boolean allowOnlyBinary)
+ throws ExpressionParserException, ExpressionParserInternalError {
CommonExpression node = null;
curExpression = filterExpression;
try {
- // Throws TokenizerException and FilterParserException. FilterParserException is caught somewhere above
+ // Throws TokenizerException and FilterParserException. FilterParserException is caught somewhere above
tokenList = new Tokenizer(filterExpression).tokenize();
if (!tokenList.hasTokens()) {
return new FilterExpressionImpl(filterExpression);
@@ -102,22 +104,26 @@ public class FilterParserImpl implements FilterParser {
}
// Post check
- if (tokenList.tokenCount() > tokenList.currentToken) //this indicates that not all tokens have been read
+ if (tokenList.tokenCount() > tokenList.currentToken) // this indicates that not all tokens have been read
{
// Tested with TestParserExceptions.TestPMparseFilterString
- throw FilterParserExceptionImpl.createINVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING(tokenList.elementAt(tokenList.currentToken), filterExpression);
+ throw FilterParserExceptionImpl.createINVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING(tokenList
+ .elementAt(tokenList.currentToken), filterExpression);
}
// Create and return filterExpression node
- if ((allowOnlyBinary == true) && (node.getEdmType() != null) && (node.getEdmType() != EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance())) {
+ if ((allowOnlyBinary == true) && (node.getEdmType() != null)
+ && (node.getEdmType() != EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance())) {
// Tested with TestParserExceptions.testAdditionalStuff CASE 9
- throw FilterParserExceptionImpl.createTYPE_EXPECTED_AT(EdmBoolean.getInstance(), node.getEdmType(), 1, curExpression);
+ throw FilterParserExceptionImpl.createTYPE_EXPECTED_AT(EdmBoolean.getInstance(), node.getEdmType(), 1,
+ curExpression);
}
return new FilterExpressionImpl(filterExpression, node);
}
- protected CommonExpression readElements(final CommonExpression leftExpression, final int priority) throws ExpressionParserException, ExpressionParserInternalError {
+ protected CommonExpression readElements(final CommonExpression leftExpression, final int priority)
+ throws ExpressionParserException, ExpressionParserInternalError {
CommonExpression leftNode = leftExpression;
CommonExpression rightNode;
BinaryExpression binaryNode;
@@ -126,18 +132,20 @@ public class FilterParserImpl implements FilterParser {
ActualBinaryOperator nextOperator;
while ((operator != null) && (operator.getOP().getPriority() >= priority)) {
- tokenList.next(); //eat the operator
- rightNode = readElement(leftNode, operator); //throws FilterParserException, FilterParserInternalError
+ tokenList.next(); // eat the operator
+ rightNode = readElement(leftNode, operator); // throws FilterParserException, FilterParserInternalError
if (rightNode == null) {
// Tested with TestParserExceptions.testAdditionalStuff CASE 10
- throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(operator.getToken().getPosition() + operator.getToken().getUriLiteral().length(), curExpression);
+ throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(operator.getToken().getPosition()
+ + operator.getToken().getUriLiteral().length(), curExpression);
}
nextOperator = readBinaryOperator();
// It must be "while" because for example in "Filter=a or c eq d and e eq f"
- // after reading the "eq" operator the "and" operator must be consumed too. This is due to the fact that "and" has a higher priority than "or"
+ // after reading the "eq" operator the "and" operator must be consumed too. This is due to the fact that "and" has
+ // a higher priority than "or"
while ((nextOperator != null) && (nextOperator.getOP().getPriority() > operator.getOP().getPriority())) {
- //recurse until the a binary operator with a lower priority is detected
+ // recurse until the a binary operator with a lower priority is detected
rightNode = readElements(rightNode, nextOperator.getOP().getPriority());
nextOperator = readBinaryOperator();
}
@@ -162,10 +170,10 @@ public class FilterParserImpl implements FilterParser {
operator = readBinaryOperator();
}
- //Add special handling for expressions like $filter=notsupportedfunction('a')
- //If this special handling is not in place the error text would be
- //-->Invalid token "(" detected after parsing at position 21 in "notsupportedfunction('a')".
- //with this special handling we ensure that the error text would be
+ // Add special handling for expressions like $filter=notsupportedfunction('a')
+ // If this special handling is not in place the error text would be
+ // -->Invalid token "(" detected after parsing at position 21 in "notsupportedfunction('a')".
+ // with this special handling we ensure that the error text would be
Token token = tokenList.lookToken();
if (token != null) {
@@ -179,13 +187,14 @@ public class FilterParserImpl implements FilterParser {
}
/**
- * Reads the content between parenthesis. Its is expected that the current token is of kind {@link TokenKind#OPENPAREN}
- * because it MUST be check in the calling method ( when read the method name and the '(' is read).
+ * Reads the content between parenthesis. Its is expected that the current token is of kind
+ * {@link TokenKind#OPENPAREN} because it MUST be check in the calling method ( when read the method name and the '('
+ * is read).
* @return An expression which reflects the content within the parenthesis
* @throws ExpressionParserException
- * While reading the elements in the parenthesis an error occurred
- * @throws TokenizerMessage
- * The next token did not match the expected token
+ * While reading the elements in the parenthesis an error occurred
+ * @throws TokenizerMessage
+ * The next token did not match the expected token
*/
protected CommonExpression readParenthesis() throws ExpressionParserException, ExpressionParserInternalError {
// The existing of a '(' is verified BEFORE this method is called --> so it's a internal error
@@ -196,11 +205,12 @@ public class FilterParserImpl implements FilterParser {
// check for ')'
try {
- tokenList.expectToken(TokenKind.CLOSEPAREN); //TokenizerMessage
+ tokenList.expectToken(TokenKind.CLOSEPAREN); // TokenizerMessage
} catch (TokenizerExpectError e) {
// Internal parsing error, even if there are no more token (then there should be a different exception).
// Tested with TestParserExceptions.TestPMreadParenthesis
- throw FilterParserExceptionImpl.createMISSING_CLOSING_PHARENTHESIS(openParenthesis.getPosition(), curExpression, e);
+ throw FilterParserExceptionImpl.createMISSING_CLOSING_PHARENTHESIS(openParenthesis.getPosition(), curExpression,
+ e);
}
return parenthesisExpression;
}
@@ -208,34 +218,36 @@ public class FilterParserImpl implements FilterParser {
/**
* Read the parameters of a method expression
* @param methodInfo
- * Signature information about the method whose parameters should be read
+ * Signature information about the method whose parameters should be read
* @param methodExpression
- * Method expression to which the read parameters are added
+ * Method expression to which the read parameters are added
* @return
- * The method expression input parameter
+ * The method expression input parameter
* @throws ExpressionParserException
- * @throws ExpressionParserInternalError
- * @throws TokenizerExpectError
- * The next token did not match the expected token
+ * @throws ExpressionParserInternalError
+ * @throws TokenizerExpectError
+ * The next token did not match the expected token
*/
- protected MethodExpression readParameters(final InfoMethod methodInfo, final MethodExpressionImpl methodExpression, final Token methodToken) throws ExpressionParserException, ExpressionParserInternalError {
+ protected MethodExpression readParameters(final InfoMethod methodInfo, final MethodExpressionImpl methodExpression,
+ final Token methodToken) throws ExpressionParserException, ExpressionParserInternalError {
CommonExpression expression;
boolean expectAnotherExpression = false;
boolean readComma = true;
// The existing of a '(' is verified BEFORE this method is called --> so it's a internal error
- Token openParenthesis = tokenList.expectToken(TokenKind.OPENPAREN, true); //throws FilterParserInternalError
+ Token openParenthesis = tokenList.expectToken(TokenKind.OPENPAREN, true); // throws FilterParserInternalError
Token token = tokenList.lookToken();
if (token == null) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 1 e.g. "$filter=concat("
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 1 e.g. "$filter=concat("
throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(openParenthesis, curExpression);
}
while (token.getKind() != TokenKind.CLOSEPAREN) {
if (readComma == false) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 12 e.g. "$filter=concat('a' 'b')"
- throw FilterParserExceptionImpl.createCOMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS(tokenList.lookPrevToken(), curExpression);
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 12 e.g. "$filter=concat('a' 'b')"
+ throw FilterParserExceptionImpl.createCOMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS(tokenList
+ .lookPrevToken(), curExpression);
}
expression = readElement(null);
if (expression != null) {
@@ -243,22 +255,23 @@ public class FilterParserImpl implements FilterParser {
}
if ((expression == null) && (expectAnotherExpression == true)) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 4 e.g. "$filter=concat(,"
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 4 e.g. "$filter=concat(,"
throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(token, curExpression);
- } else if (expression != null) {//parameter list may be empty
+ } else if (expression != null) {// parameter list may be empty
methodExpression.appendParameter(expression);
}
token = tokenList.lookToken();
if (token == null) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 2 e.g. "$filter=concat(123"
- throw FilterParserExceptionImpl.createCOMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS(tokenList.lookPrevToken(), curExpression);
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 2 e.g. "$filter=concat(123"
+ throw FilterParserExceptionImpl.createCOMMA_OR_CLOSING_PHARENTHESIS_EXPECTED_AFTER_POS(tokenList
+ .lookPrevToken(), curExpression);
}
if (token.getKind() == TokenKind.COMMA) {
expectAnotherExpression = true;
if (expression == null) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 3 e.g. "$filter=concat(,"
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 3 e.g. "$filter=concat(,"
throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AT_POS(token, curExpression);
}
@@ -269,41 +282,45 @@ public class FilterParserImpl implements FilterParser {
}
}
- // because the while loop above only exits if a ')' has been found it is an
+ // because the while loop above only exits if a ')' has been found it is an
// internal error if there is not ')'
tokenList.expectToken(TokenKind.CLOSEPAREN, true);
- //---check parameter count
+ // ---check parameter count
int count = methodExpression.getParameters().size();
if ((methodInfo.getMinParameter() > -1) && (count < methodInfo.getMinParameter())) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 12
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 12
throw FilterParserExceptionImpl.createMETHOD_WRONG_ARG_COUNT(methodExpression, methodToken, curExpression);
}
if ((methodInfo.getMaxParameter() > -1) && (count > methodInfo.getMaxParameter())) {
- //Tested with TestParserExceptions.TestPMreadParameters CASE 15
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 15
throw FilterParserExceptionImpl.createMETHOD_WRONG_ARG_COUNT(methodExpression, methodToken, curExpression);
}
return methodExpression;
}
- protected CommonExpression readElement(final CommonExpression leftExpression) throws ExpressionParserException, ExpressionParserInternalError {
+ protected CommonExpression readElement(final CommonExpression leftExpression) throws ExpressionParserException,
+ ExpressionParserInternalError {
return readElement(leftExpression, null);
}
/**
* Reads: Unary operators, Methods, Properties, ...
* but not binary operators which are handelt in {@link #readElements(CommonExpression, int)}
- * @param leftExpression
- * Used while parsing properties. In this case ( e.g. parsing "a/b") the property "a" ( as leftExpression of "/") is relevant
- * to verify whether the property "b" exists inside the edm
+ * @param leftExpression
+ * Used while parsing properties. In this case ( e.g. parsing "a/b") the property "a" ( as leftExpression of "/") is
+ * relevant
+ * to verify whether the property "b" exists inside the edm
* @return a CommonExpression
* @throws ExpressionParserException
- * @throws ExpressionParserInternalError
- * @throws TokenizerMessage
+ * @throws ExpressionParserInternalError
+ * @throws TokenizerMessage
*/
- protected CommonExpression readElement(final CommonExpression leftExpression, final ActualBinaryOperator leftOperator) throws ExpressionParserException, ExpressionParserInternalError {
+ protected CommonExpression
+ readElement(final CommonExpression leftExpression, final ActualBinaryOperator leftOperator)
+ throws ExpressionParserException, ExpressionParserInternalError {
CommonExpression node = null;
Token token;
Token lookToken;
@@ -316,64 +333,66 @@ public class FilterParserImpl implements FilterParser {
case OPENPAREN:
node = readParenthesis();
return node;
- case CLOSEPAREN: // ')' finishes a parenthesis (it is no extra token)" +
- case COMMA: //. " ',' is a separator for function parameters (it is no extra token)" +
+ case CLOSEPAREN: // ')' finishes a parenthesis (it is no extra token)" +
+ case COMMA: // . " ',' is a separator for function parameters (it is no extra token)" +
return null;
default:
// continue
}
- //-->Check if the token is a unary operator
+ // -->Check if the token is a unary operator
InfoUnaryOperator unaryOperator = isUnaryOperator(lookToken);
if (unaryOperator != null) {
return readUnaryoperator(lookToken, unaryOperator);
}
- //---expect the look ahead token
+ // ---expect the look ahead token
token = tokenList.expectToken(lookToken.getUriLiteral(), true);
lookToken = tokenList.lookToken();
- //-->Check if the token is a method
- //To avoid name clashes between method names and property names we accept here only method names if a "(" follows.
- //Hence the parser accepts a property named "concat"
+ // -->Check if the token is a method
+ // To avoid name clashes between method names and property names we accept here only method names if a "(" follows.
+ // Hence the parser accepts a property named "concat"
InfoMethod methodOperator = isMethod(token, lookToken);
if (methodOperator != null) {
return readMethod(token, methodOperator);
}
- //-->Check if token is a terminal
- //is a terminal e.g. a Value like an EDM.String 'hugo' or 125L or 1.25D"
+ // -->Check if token is a terminal
+ // is a terminal e.g. a Value like an EDM.String 'hugo' or 125L or 1.25D"
if (token.getKind() == TokenKind.SIMPLE_TYPE) {
LiteralExpression literal = new LiteralExpressionImpl(token.getUriLiteral(), token.getJavaLiteral());
return literal;
}
- //-->Check if token is a property, e.g. "name" or "address"
+ // -->Check if token is a property, e.g. "name" or "address"
if (token.getKind() == TokenKind.LITERAL) {
PropertyExpressionImpl property = new PropertyExpressionImpl(token.getUriLiteral(), token.getJavaLiteral());
validateEdmProperty(leftExpression, property, token, leftOperator);
return property;
}
- // not Tested, should not occur
+ // not Tested, should not occur
throw ExpressionParserInternalError.createCOMMON();
}
- protected CommonExpression readUnaryoperator(final Token lookToken, final InfoUnaryOperator unaryOperator) throws ExpressionParserException, ExpressionParserInternalError {
+ protected CommonExpression readUnaryoperator(final Token lookToken, final InfoUnaryOperator unaryOperator)
+ throws ExpressionParserException, ExpressionParserInternalError {
tokenList.expectToken(lookToken.getUriLiteral(), true);
CommonExpression operand = readElement(null);
UnaryExpression unaryExpression = new UnaryExpressionImpl(unaryOperator, operand);
- validateUnaryOperatorTypes(unaryExpression); //throws ExpressionInvalidOperatorTypeException
+ validateUnaryOperatorTypes(unaryExpression); // throws ExpressionInvalidOperatorTypeException
return unaryExpression;
}
- protected CommonExpression readMethod(final Token token, final InfoMethod methodOperator) throws ExpressionParserException, ExpressionParserInternalError {
+ protected CommonExpression readMethod(final Token token, final InfoMethod methodOperator)
+ throws ExpressionParserException, ExpressionParserInternalError {
MethodExpressionImpl method = new MethodExpressionImpl(methodOperator);
readParameters(methodOperator, method, token);
- validateMethodTypes(method, token); //throws ExpressionInvalidOperatorTypeException
+ validateMethodTypes(method, token); // throws ExpressionInvalidOperatorTypeException
return method;
}
@@ -398,13 +417,13 @@ public class FilterParserImpl implements FilterParser {
}
/**
- * Check if a token is a UnaryOperator ( e.g. "not" or "-" )
+ * Check if a token is a UnaryOperator ( e.g. "not" or "-" )
*
* @param token Token to be checked
- *
+ *
* @return
- * <li>An instance of {@link InfoUnaryOperator} containing information about the specific unary operator</li>
- * <li><code>null</code> if the token is not an unary operator</li>
+ * <li>An instance of {@link InfoUnaryOperator} containing information about the specific unary operator</li>
+ * <li><code>null</code> if the token is not an unary operator</li>
*/
protected InfoUnaryOperator isUnaryOperator(final Token token) {
if ((token.getKind() == TokenKind.LITERAL) || (token.getKind() == TokenKind.SYMBOL)) {
@@ -421,7 +440,9 @@ public class FilterParserImpl implements FilterParser {
return null;
}
- protected void validateEdmProperty(final CommonExpression leftExpression, final PropertyExpressionImpl property, final Token propertyToken, final ActualBinaryOperator actBinOp) throws ExpressionParserException, ExpressionParserInternalError {
+ protected void validateEdmProperty(final CommonExpression leftExpression, final PropertyExpressionImpl property,
+ final Token propertyToken, final ActualBinaryOperator actBinOp) throws ExpressionParserException,
+ ExpressionParserInternalError {
// Exist if no edm provided
if (resourceEntityType == null) {
@@ -429,25 +450,27 @@ public class FilterParserImpl implements FilterParser {
}
if (leftExpression == null) {
- //e.g. "$filter=city eq 'Hong Kong'" --> "city" is checked against the resource entity type of the last URL segment
+ // e.g. "$filter=city eq 'Hong Kong'" --> "city" is checked against the resource entity type of the last URL
+ // segment
validateEdmPropertyOfStructuredType(resourceEntityType, property, propertyToken);
return;
}
- //e.g. "$filter='Hong Kong' eq address/city" --> city is "checked" against the type of the property "address".
- // "address" itself must be a (navigation)property of the resource entity type of the last URL segment AND
- // "address" must have a structural edm type
- EdmType parentType = leftExpression.getEdmType(); //parentType point now to the type of property "address"
+ // e.g. "$filter='Hong Kong' eq address/city" --> city is "checked" against the type of the property "address".
+ // "address" itself must be a (navigation)property of the resource entity type of the last URL segment AND
+ // "address" must have a structural edm type
+ EdmType parentType = leftExpression.getEdmType(); // parentType point now to the type of property "address"
if ((actBinOp != null) && (actBinOp.operator.getOperator() != BinaryOperator.PROPERTY_ACCESS)) {
validateEdmPropertyOfStructuredType(resourceEntityType, property, propertyToken);
return;
} else {
- if ((leftExpression.getKind() != ExpressionKind.PROPERTY) && (leftExpression.getKind() != ExpressionKind.MEMBER)) {
+ if ((leftExpression.getKind() != ExpressionKind.PROPERTY) &&
+ (leftExpression.getKind() != ExpressionKind.MEMBER)) {
if (actBinOp != null) {
- //Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 6
+ // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 6
throw FilterParserExceptionImpl.createLEFT_SIDE_NOT_A_PROPERTY(actBinOp.token, curExpression);
} else {
- // not Tested, should not occur
+ // not Tested, should not occur
throw ExpressionParserInternalError.createCOMMON();
}
@@ -455,21 +478,25 @@ public class FilterParserImpl implements FilterParser {
}
if (parentType instanceof EdmEntityType) {
- //e.g. "$filter='Hong Kong' eq navigationProp/city" --> "navigationProp" is a navigation property with a entity type
+ // e.g. "$filter='Hong Kong' eq navigationProp/city" --> "navigationProp" is a navigation property with a entity
+ // type
validateEdmPropertyOfStructuredType((EdmStructuralType) parentType, property, propertyToken);
} else if (parentType instanceof EdmComplexType) {
- //e.g. "$filter='Hong Kong' eq address/city" --> "address" is a property with a complex type
+ // e.g. "$filter='Hong Kong' eq address/city" --> "address" is a property with a complex type
validateEdmPropertyOfStructuredType((EdmStructuralType) parentType, property, propertyToken);
} else {
- //e.g. "$filter='Hong Kong' eq name/city" --> "name is of type String"
- //Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 5
- throw FilterParserExceptionImpl.createLEFT_SIDE_NOT_STRUCTURAL_TYPE(parentType, property, propertyToken, curExpression);
+ // e.g. "$filter='Hong Kong' eq name/city" --> "name is of type String"
+ // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 5
+ throw FilterParserExceptionImpl.createLEFT_SIDE_NOT_STRUCTURAL_TYPE(parentType, property, propertyToken,
+ curExpression);
}
return;
}
- protected void validateEdmPropertyOfStructuredType(final EdmStructuralType parentType, final PropertyExpressionImpl property, final Token propertyToken) throws ExpressionParserException, ExpressionParserInternalError {
+ protected void validateEdmPropertyOfStructuredType(final EdmStructuralType parentType,
+ final PropertyExpressionImpl property, final Token propertyToken) throws ExpressionParserException,
+ ExpressionParserInternalError {
try {
String propertyName = property.getUriLiteral();
EdmTyped edmProperty = parentType.getProperty(propertyName);
@@ -478,8 +505,9 @@ public class FilterParserImpl implements FilterParser {
property.setEdmProperty(edmProperty);
property.setEdmType(edmProperty.getType());
} else {
- //Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 3
- throw FilterParserExceptionImpl.createPROPERTY_NAME_NOT_FOUND_IN_TYPE(parentType, property, propertyToken, curExpression);
+ // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 3
+ throw FilterParserExceptionImpl.createPROPERTY_NAME_NOT_FOUND_IN_TYPE(parentType, property, propertyToken,
+ curExpression);
}
} catch (EdmException e) {
@@ -489,53 +517,59 @@ public class FilterParserImpl implements FilterParser {
}
/*
- protected void validateEdmPropertyOfComplexType1(EdmComplexType parentType, PropertyExpressionImpl property, Token propertyToken) throws FilterParserException, FilterParserInternalError
- {
- try {
- String propertyName = property.getUriLiteral();
- EdmTyped edmProperty = parentType.getProperty(propertyName);
-
- if (edmProperty != null)
- {
- property.setEdmProperty(edmProperty);
- property.setEdmType(edmProperty.getType());
- }
- else
- {
- //Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 3
- throw FilterParserExceptionImpl.createPROPERTY_NAME_NOT_FOUND_IN_TYPE(parentType, property, propertyToken, curExpression);
- }
-
- } catch (EdmException e) {
- // not Tested, should not occur
- throw FilterParserInternalError.createERROR_ACCESSING_EDM(e);
- }
- }
-
- protected void validateEdmPropertyOfEntityType1(EdmEntityType parentType, PropertyExpressionImpl property, Token propertyToken) throws FilterParserException, FilterParserInternalError
- {
- try {
- String propertyName = property.getUriLiteral();
- EdmTyped edmProperty = parentType.getProperty(propertyName);
-
- if (edmProperty != null)
- {
- property.setEdmProperty(edmProperty);
- property.setEdmType(edmProperty.getType());
- }
- else
- {
- //Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 1
- throw FilterParserExceptionImpl.createPROPERTY_NAME_NOT_FOUND_IN_TYPE(parentType, property, propertyToken, curExpression);
- }
-
- } catch (EdmException e) {
- // not Tested, should not occur
- throw FilterParserInternalError.createERROR_ACCESSING_EDM(e);
- }
- }*/
+ * protected void validateEdmPropertyOfComplexType1(EdmComplexType parentType, PropertyExpressionImpl property, Token
+ * propertyToken) throws FilterParserException, FilterParserInternalError
+ * {
+ * try {
+ * String propertyName = property.getUriLiteral();
+ * EdmTyped edmProperty = parentType.getProperty(propertyName);
+ *
+ * if (edmProperty != null)
+ * {
+ * property.setEdmProperty(edmProperty);
+ * property.setEdmType(edmProperty.getType());
+ * }
+ * else
+ * {
+ * //Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 3
+ * throw FilterParserExceptionImpl.createPROPERTY_NAME_NOT_FOUND_IN_TYPE(parentType, property, propertyToken,
+ * curExpression);
+ * }
+ *
+ * } catch (EdmException e) {
+ * // not Tested, should not occur
+ * throw FilterParserInternalError.createERROR_ACCESSING_EDM(e);
+ * }
+ * }
+ *
+ * protected void validateEdmPropertyOfEntityType1(EdmEntityType parentType, PropertyExpressionImpl property, Token
+ * propertyToken) throws FilterParserException, FilterParserInternalError
+ * {
+ * try {
+ * String propertyName = property.getUriLiteral();
+ * EdmTyped edmProperty = parentType.getProperty(propertyName);
+ *
+ * if (edmProperty != null)
+ * {
+ * property.setEdmProperty(edmProperty);
+ * property.setEdmType(edmProperty.getType());
+ * }
+ * else
+ * {
+ * //Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 1
+ * throw FilterParserExceptionImpl.createPROPERTY_NAME_NOT_FOUND_IN_TYPE(parentType, property, propertyToken,
+ * curExpression);
+ * }
+ *
+ * } catch (EdmException e) {
+ * // not Tested, should not occur
+ * throw FilterParserInternalError.createERROR_ACCESSING_EDM(e);
+ * }
+ * }
+ */
- protected void validateUnaryOperatorTypes(final UnaryExpression unaryExpression) throws ExpressionParserInternalError {
+ protected void validateUnaryOperatorTypes(final UnaryExpression unaryExpression)
+ throws ExpressionParserInternalError {
InfoUnaryOperator unOpt = availableUnaryOperators.get(unaryExpression.getOperator().toUriLiteral());
EdmType operandType = unaryExpression.getOperand().getEdmType();
@@ -552,7 +586,8 @@ public class FilterParserImpl implements FilterParser {
}
}
- protected void validateBinaryOperatorTypes(final BinaryExpression binaryExpression) throws ExpressionParserException, ExpressionParserInternalError {
+ protected void validateBinaryOperatorTypes(final BinaryExpression binaryExpression) throws ExpressionParserException,
+ ExpressionParserInternalError {
InfoBinaryOperator binOpt = availableBinaryOperators.get(binaryExpression.getOperator().toUriLiteral());
List<EdmType> actualParameterTypes = new ArrayList<EdmType>();
@@ -575,25 +610,28 @@ public class FilterParserImpl implements FilterParser {
BinaryExpressionImpl binaryExpressionImpl = (BinaryExpressionImpl) binaryExpression;
// Tested with TestParserExceptions.TestPMvalidateBinaryOperator
- throw FilterParserExceptionImpl.createINVALID_TYPES_FOR_BINARY_OPERATOR(binaryExpression.getOperator(), binaryExpression.getLeftOperand().getEdmType(), binaryExpression.getRightOperand().getEdmType(), binaryExpressionImpl.getToken(), curExpression);
+ throw FilterParserExceptionImpl.createINVALID_TYPES_FOR_BINARY_OPERATOR(binaryExpression.getOperator(),
+ binaryExpression.getLeftOperand().getEdmType(), binaryExpression.getRightOperand().getEdmType(),
+ binaryExpressionImpl.getToken(), curExpression);
}
binaryExpression.setEdmType(parameterSet.getReturnType());
}
- protected void validateMethodTypes(final MethodExpression methodExpression, final Token methodToken) throws ExpressionParserException, ExpressionParserInternalError {
+ protected void validateMethodTypes(final MethodExpression methodExpression, final Token methodToken)
+ throws ExpressionParserException, ExpressionParserInternalError {
InfoMethod methOpt = availableMethods.get(methodExpression.getUriLiteral());
List<EdmType> actualParameterTypes = new ArrayList<EdmType>();
- //If there are no parameter then don't perform a type check
+ // If there are no parameter then don't perform a type check
if (methodExpression.getParameters().size() == 0) {
return;
}
for (CommonExpression parameter : methodExpression.getParameters()) {
- //If there is not at parsing time its not possible to determine the type of eg myPropertyName.
- //Since this should not cause validation errors null type node arguments are leading to bypass
- //the validation
+ // If there is not at parsing time its not possible to determine the type of eg myPropertyName.
+ // Since this should not cause validation errors null type node arguments are leading to bypass
+ // the validation
if ((parameter.getEdmType() == null) && (resourceEntityType == null)) {
return;
}
@@ -601,10 +639,11 @@ public class FilterParserImpl implements FilterParser {
}
ParameterSet parameterSet = methOpt.validateParameterSet(actualParameterTypes);
- //If there is not returntype then the input parameter
+ // If there is not returntype then the input parameter
if (parameterSet == null) {
// Tested with TestParserExceptions.testPMvalidateMethodTypes CASE 1
- throw FilterParserExceptionImpl.createMETHOD_WRONG_INPUT_TYPE((MethodExpressionImpl) methodExpression, methodToken, curExpression);
+ throw FilterParserExceptionImpl.createMETHOD_WRONG_INPUT_TYPE((MethodExpressionImpl) methodExpression,
+ methodToken, curExpression);
}
methodExpression.setEdmType(parameterSet.getReturnType());
}
@@ -614,10 +653,10 @@ public class FilterParserImpl implements FilterParser {
Map<String, InfoMethod> lAvailableMethods = new HashMap<String, InfoMethod>();
Map<String, InfoUnaryOperator> lAvailableUnaryOperators = new HashMap<String, InfoUnaryOperator>();
- //create type validators
- //InputTypeValidator typeValidatorPromotion = new InputTypeValidator.TypePromotionValidator();
+ // create type validators
+ // InputTypeValidator typeValidatorPromotion = new InputTypeValidator.TypePromotionValidator();
ParameterSetCombination combination = null;
- //create type helpers
+ // create type helpers
EdmSimpleType boolean_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Boolean);
EdmSimpleType sbyte = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte);
EdmSimpleType byte_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Byte);
@@ -634,10 +673,11 @@ public class FilterParserImpl implements FilterParser {
EdmSimpleType guid = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Guid);
EdmSimpleType binary = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Binary);
- //---Memeber member access---
- lAvailableBinaryOperators.put("/", new InfoBinaryOperator(BinaryOperator.PROPERTY_ACCESS, "Primary", 100, new ParameterSetCombination.PSCReturnTypeEqLastParameter()));//todo fix this
+ // ---Memeber member access---
+ lAvailableBinaryOperators.put("/", new InfoBinaryOperator(BinaryOperator.PROPERTY_ACCESS, "Primary", 100,
+ new ParameterSetCombination.PSCReturnTypeEqLastParameter()));// todo fix this
- //---Multiplicative---
+ // ---Multiplicative---
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(sbyte, sbyte, sbyte));
combination.add(new ParameterSet(byte_, byte_, byte_));
@@ -649,11 +689,14 @@ public class FilterParserImpl implements FilterParser {
combination.add(new ParameterSet(decimal, decimal, decimal));
- lAvailableBinaryOperators.put(BinaryOperator.MUL.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.MUL, "Multiplicative", 60, combination));
- lAvailableBinaryOperators.put(BinaryOperator.DIV.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.DIV, "Multiplicative", 60, combination));
- lAvailableBinaryOperators.put(BinaryOperator.MODULO.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.MODULO, "Multiplicative", 60, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.MUL.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.MUL,
+ "Multiplicative", 60, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.DIV.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.DIV,
+ "Multiplicative", 60, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.MODULO.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.MODULO,
+ "Multiplicative", 60, combination));
- //---Additive---
+ // ---Additive---
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(sbyte, sbyte, sbyte));
combination.add(new ParameterSet(byte_, byte_, byte_));
@@ -664,10 +707,12 @@ public class FilterParserImpl implements FilterParser {
combination.add(new ParameterSet(double_, double_, double_));
combination.add(new ParameterSet(decimal, decimal, decimal));
- lAvailableBinaryOperators.put(BinaryOperator.ADD.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.ADD, "Additive", 50, combination));
- lAvailableBinaryOperators.put(BinaryOperator.SUB.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.SUB, "Additive", 50, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.ADD.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.ADD,
+ "Additive", 50, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.SUB.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.SUB,
+ "Additive", 50, combination));
- //---Relational---
+ // ---Relational---
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(boolean_, string, string));
combination.add(new ParameterSet(boolean_, time, time));
@@ -684,152 +729,168 @@ public class FilterParserImpl implements FilterParser {
combination.add(new ParameterSet(boolean_, decimal, decimal));
combination.add(new ParameterSet(boolean_, binary, binary));
- lAvailableBinaryOperators.put(BinaryOperator.LT.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.LT, "Relational", 40, combination));
- lAvailableBinaryOperators.put(BinaryOperator.GT.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.GT, "Relational", 40, combination));
- lAvailableBinaryOperators.put(BinaryOperator.GE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.GE, "Relational", 40, combination));
- lAvailableBinaryOperators.put(BinaryOperator.LE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.LE, "Relational", 40, combination));
-
- //---Equality---
- //combination = new ParameterSetCombination.PSCflex();
+ lAvailableBinaryOperators.put(BinaryOperator.LT.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.LT,
+ "Relational", 40, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.GT.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.GT,
+ "Relational", 40, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.GE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.GE,
+ "Relational", 40, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.LE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.LE,
+ "Relational", 40, combination));
+
+ // ---Equality---
+ // combination = new ParameterSetCombination.PSCflex();
combination.addFirst(new ParameterSet(boolean_, boolean_, boolean_));
- /*combination.add(new ParameterSet(boolean_, string, string));
- combination.add(new ParameterSet(boolean_, time, time));
- combination.add(new ParameterSet(boolean_, datetime, datetime));
- combination.add(new ParameterSet(boolean_, datetimeoffset, datetimeoffset));
- combination.add(new ParameterSet(boolean_, guid, guid));
- combination.add(new ParameterSet(boolean_, sbyte, sbyte));
- combination.add(new ParameterSet(boolean_, byte_, byte_));
- combination.add(new ParameterSet(boolean_, int16, int16));
- combination.add(new ParameterSet(boolean_, int32, int32));
- combination.add(new ParameterSet(boolean_, int64, int64));
- combination.add(new ParameterSet(boolean_, single, single));
- combination.add(new ParameterSet(boolean_, double_, double_));
- combination.add(new ParameterSet(boolean_, decimal, decimal));
- combination.add(new ParameterSet(boolean_, binary, binary));*/
-
- lAvailableBinaryOperators.put(BinaryOperator.EQ.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.EQ, "Equality", 30, combination));
- lAvailableBinaryOperators.put(BinaryOperator.NE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.NE, "Equality", 30, combination));
-
- //"---Conditinal AND---
+ /*
+ * combination.add(new ParameterSet(boolean_, string, string));
+ * combination.add(new ParameterSet(boolean_, time, time));
+ * combination.add(new ParameterSet(boolean_, datetime, datetime));
+ * combination.add(new ParameterSet(boolean_, datetimeoffset, datetimeoffset));
+ * combination.add(new ParameterSet(boolean_, guid, guid));
+ * combination.add(new ParameterSet(boolean_, sbyte, sbyte));
+ * combination.add(new ParameterSet(boolean_, byte_, byte_));
+ * combination.add(new ParameterSet(boolean_, int16, int16));
+ * combination.add(new ParameterSet(boolean_, int32, int32));
+ * combination.add(new ParameterSet(boolean_, int64, int64));
+ * combination.add(new ParameterSet(boolean_, single, single));
+ * combination.add(new ParameterSet(boolean_, double_, double_));
+ * combination.add(new ParameterSet(boolean_, decimal, decimal));
+ * combination.add(new ParameterSet(boolean_, binary, binary));
+ */
+
+ lAvailableBinaryOperators.put(BinaryOperator.EQ.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.EQ,
+ "Equality", 30, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.NE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.NE,
+ "Equality", 30, combination));
+
+ // "---Conditinal AND---
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(boolean_, boolean_, boolean_));
- lAvailableBinaryOperators.put(BinaryOperator.AND.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.AND, "Conditinal", 20, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.AND.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.AND,
+ "Conditinal", 20, combination));
- //---Conditinal OR---
+ // ---Conditinal OR---
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(boolean_, boolean_, boolean_));
- lAvailableBinaryOperators.put(BinaryOperator.OR.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.OR, "Conditinal", 10, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.OR.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.OR,
+ "Conditinal", 10, combination));
- //endswith
+ // endswith
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(boolean_, string, string));
- lAvailableMethods.put(MethodOperator.ENDSWITH.toUriLiteral(), new InfoMethod(MethodOperator.ENDSWITH, 2, 2, combination));
+ lAvailableMethods.put(MethodOperator.ENDSWITH.toUriLiteral(), new InfoMethod(MethodOperator.ENDSWITH, 2, 2,
+ combination));
- //indexof
+ // indexof
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(int32, string, string));
- lAvailableMethods.put(MethodOperator.INDEXOF.toUriLiteral(), new InfoMethod(MethodOperator.INDEXOF, 2, 2, combination));
+ lAvailableMethods.put(MethodOperator.INDEXOF.toUriLiteral(), new InfoMethod(MethodOperator.INDEXOF, 2, 2,
+ combination));
- //startswith
+ // startswith
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(boolean_, string, string));
- lAvailableMethods.put(MethodOperator.STARTSWITH.toUriLiteral(), new InfoMethod(MethodOperator.STARTSWITH, 2, 2, combination));
+ lAvailableMethods.put(MethodOperator.STARTSWITH.toUriLiteral(), new InfoMethod(MethodOperator.STARTSWITH, 2, 2,
+ combination));
- //tolower
+ // tolower
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(string, string));
lAvailableMethods.put(MethodOperator.TOLOWER.toUriLiteral(), new InfoMethod(MethodOperator.TOLOWER, combination));
- //toupper
+ // toupper
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(string, string));
lAvailableMethods.put(MethodOperator.TOUPPER.toUriLiteral(), new InfoMethod(MethodOperator.TOUPPER, combination));
- //trim
+ // trim
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(string, string));
lAvailableMethods.put(MethodOperator.TRIM.toUriLiteral(), new InfoMethod(MethodOperator.TRIM, combination));
- //substring
+ // substring
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(string, string, int32));
combination.add(new ParameterSet(string, string, int32, int32));
- lAvailableMethods.put(MethodOperator.SUBSTRING.toUriLiteral(), new InfoMethod(MethodOperator.SUBSTRING, 1, -1, combination));
+ lAvailableMethods.put(MethodOperator.SUBSTRING.toUriLiteral(), new InfoMethod(MethodOperator.SUBSTRING, 1, -1,
+ combination));
- //substringof
+ // substringof
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(boolean_, string, string));
- lAvailableMethods.put(MethodOperator.SUBSTRINGOF.toUriLiteral(), new InfoMethod(MethodOperator.SUBSTRINGOF, 1, -1, combination));
+ lAvailableMethods.put(MethodOperator.SUBSTRINGOF.toUriLiteral(), new InfoMethod(MethodOperator.SUBSTRINGOF, 1, -1,
+ combination));
- //concat
+ // concat
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(string, string, string).setFurtherType(string));
- lAvailableMethods.put(MethodOperator.CONCAT.toUriLiteral(), new InfoMethod(MethodOperator.CONCAT, 2, -1, combination));
+ lAvailableMethods.put(MethodOperator.CONCAT.toUriLiteral(), new InfoMethod(MethodOperator.CONCAT, 2, -1,
+ combination));
- //length
+ // length
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(int32, string));
lAvailableMethods.put(MethodOperator.LENGTH.toUriLiteral(), new InfoMethod(MethodOperator.LENGTH, combination));
- //year
+ // year
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(int32, datetime));
lAvailableMethods.put(MethodOperator.YEAR.toUriLiteral(), new InfoMethod(MethodOperator.YEAR, combination));
- //month
+ // month
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(int32, datetime));
lAvailableMethods.put(MethodOperator.MONTH.toUriLiteral(), new InfoMethod(MethodOperator.MONTH, combination));
- //day
+ // day
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(int32, datetime));
lAvailableMethods.put(MethodOperator.DAY.toUriLiteral(), new InfoMethod(MethodOperator.DAY, combination));
- //hour
+ // hour
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(int32, datetime));
combination.add(new ParameterSet(int32, time));
combination.add(new ParameterSet(int32, datetimeoffset));
lAvailableMethods.put(MethodOperator.HOUR.toUriLiteral(), new InfoMethod(MethodOperator.HOUR, combination));
- //minute
+ // minute
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(int32, datetime));
combination.add(new ParameterSet(int32, time));
combination.add(new ParameterSet(int32, datetimeoffset));
lAvailableMethods.put(MethodOperator.MINUTE.toUriLiteral(), new InfoMethod(MethodOperator.MINUTE, combination));
- //second
+ // second
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(int32, datetime));
combination.add(new ParameterSet(int32, time));
combination.add(new ParameterSet(int32, datetimeoffset));
lAvailableMethods.put(MethodOperator.SECOND.toUriLiteral(), new InfoMethod(MethodOperator.SECOND, combination));
- //round
+ // round
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(decimal, decimal));
combination.add(new ParameterSet(double_, double_));
lAvailableMethods.put(MethodOperator.ROUND.toUriLiteral(), new InfoMethod(MethodOperator.ROUND, combination));
- //ceiling
+ // ceiling
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(decimal, decimal));
combination.add(new ParameterSet(double_, double_));
lAvailableMethods.put(MethodOperator.CEILING.toUriLiteral(), new InfoMethod(MethodOperator.CEILING, combination));
- //floor
+ // floor
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(decimal, decimal));
combination.add(new ParameterSet(double_, double_));
lAvailableMethods.put(MethodOperator.FLOOR.toUriLiteral(), new InfoMethod(MethodOperator.FLOOR, combination));
- //---unary---
+ // ---unary---
- //minus
+ // minus
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(sbyte, sbyte));
combination.add(new ParameterSet(byte_, byte_));
@@ -840,13 +901,15 @@ public class FilterParserImpl implements FilterParser {
combination.add(new ParameterSet(double_, double_));
combination.add(new ParameterSet(decimal, decimal));
- //minus
- lAvailableUnaryOperators.put(UnaryOperator.MINUS.toUriLiteral(), new InfoUnaryOperator(UnaryOperator.MINUS, "minus", combination));
+ // minus
+ lAvailableUnaryOperators.put(UnaryOperator.MINUS.toUriLiteral(), new InfoUnaryOperator(UnaryOperator.MINUS,
+ "minus", combination));
- //not
+ // not
combination = new ParameterSetCombination.PSCflex();
combination.add(new ParameterSet(boolean_, boolean_));
- lAvailableUnaryOperators.put(UnaryOperator.NOT.toUriLiteral(), new InfoUnaryOperator(UnaryOperator.NOT, "not", combination));
+ lAvailableUnaryOperators.put(UnaryOperator.NOT.toUriLiteral(), new InfoUnaryOperator(UnaryOperator.NOT, "not",
+ combination));
availableBinaryOperators = Collections.unmodifiableMap(lAvailableBinaryOperators);
availableMethods = Collections.unmodifiableMap(lAvailableMethods);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java
index 4c66a98..47958b3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.BinaryOperator;
/**
* Describes a binary operator which is allowed in OData expressions
- *
+ *
*/
class InfoBinaryOperator {
private BinaryOperator operator;
@@ -34,7 +34,8 @@ class InfoBinaryOperator {
private int priority;
ParameterSetCombination combination;
- public InfoBinaryOperator(final BinaryOperator operator, final String category, final int priority, final ParameterSetCombination combination) {
+ public InfoBinaryOperator(final BinaryOperator operator, final String category, final int priority,
+ final ParameterSetCombination combination) {
this.operator = operator;
this.category = category;
syntax = operator.toUriLiteral();
@@ -58,7 +59,8 @@ class InfoBinaryOperator {
return priority;
}
- public ParameterSet validateParameterSet(final List<EdmType> actualParameterTypes) throws ExpressionParserInternalError {
+ public ParameterSet validateParameterSet(final List<EdmType> actualParameterTypes)
+ throws ExpressionParserInternalError {
return combination.validate(actualParameterTypes);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java
index 95ca87e..400cbd0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.MethodOperator;
/**
* Describes a method expression which is allowed in OData expressions
- *
+ *
*/
class InfoMethod {
@@ -43,7 +43,8 @@ class InfoMethod {
this.combination = combination;
}
- public InfoMethod(final MethodOperator method, final int minParameters, final int maxParameters, final ParameterSetCombination combination) {
+ public InfoMethod(final MethodOperator method, final int minParameters, final int maxParameters,
+ final ParameterSetCombination combination) {
this.method = method;
syntax = method.toUriLiteral();
minParameter = minParameters;
@@ -51,7 +52,8 @@ class InfoMethod {
this.combination = combination;
}
- public InfoMethod(final MethodOperator method, final String string, final int minParameters, final int maxParameters, final ParameterSetCombination combination) {
+ public InfoMethod(final MethodOperator method, final String string, final int minParameters, final int maxParameters,
+ final ParameterSetCombination combination) {
this.method = method;
syntax = string;
minParameter = minParameters;
@@ -75,13 +77,14 @@ class InfoMethod {
return maxParameter;
}
- public ParameterSet validateParameterSet(final List<EdmType> actualParameterTypes) throws ExpressionParserInternalError {
+ public ParameterSet validateParameterSet(final List<EdmType> actualParameterTypes)
+ throws ExpressionParserInternalError {
return combination.validate(actualParameterTypes);
}
/**
* Returns the EdmType of the returned value of a Method
- * If a method may have different return types (depending on the input type) null will be returned.
+ * If a method may have different return types (depending on the input type) null will be returned.
*/
public EdmType getReturnType() {
return combination.getReturnType();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java
index ac784d1..de8bf86 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
/**
* Describes a unary operator which is allowed in OData expressions
- *
+ *
*/
class InfoUnaryOperator {
UnaryOperator operator;
@@ -33,7 +33,8 @@ class InfoUnaryOperator {
private String syntax;
ParameterSetCombination combination;
- public InfoUnaryOperator(final UnaryOperator operator, final String category, final ParameterSetCombination combination) {
+ public InfoUnaryOperator(final UnaryOperator operator, final String category,
+ final ParameterSetCombination combination) {
this.operator = operator;
this.category = category;
syntax = operator.toUriLiteral();
@@ -52,31 +53,33 @@ class InfoUnaryOperator {
return operator;
}
- public ParameterSet validateParameterSet(final List<EdmType> actualParameterTypes) throws ExpressionParserInternalError {
+ public ParameterSet validateParameterSet(final List<EdmType> actualParameterTypes)
+ throws ExpressionParserInternalError {
return combination.validate(actualParameterTypes);
}
/**
* Returns the EdmType of the returned value of a Method
- * If a method may have different return types (depending on the input type) null will be returned.
+ * If a method may have different return types (depending on the input type) null will be returned.
*/
/*
- public EdmType getReturnType()
- {
- int parameterCount = allowedParameterTypes.size();
- if (parameterCount == 0)
- return null;
-
- if (parameterCount == 1)
- return allowedParameterTypes.get(0).getReturnType();
-
- //There are more than 1 possible return type, check if they are equal, if not return null.
- EdmType returnType = allowedParameterTypes.get(0).getReturnType();
- for (int i = 1; i < parameterCount; i++)
- if (returnType != allowedParameterTypes.get(i))
- return null;
-
- return returnType;
- }*/
+ * public EdmType getReturnType()
+ * {
+ * int parameterCount = allowedParameterTypes.size();
+ * if (parameterCount == 0)
+ * return null;
+ *
+ * if (parameterCount == 1)
+ * return allowedParameterTypes.get(0).getReturnType();
+ *
+ * //There are more than 1 possible return type, check if they are equal, if not return null.
+ * EdmType returnType = allowedParameterTypes.get(0).getReturnType();
+ * for (int i = 1; i < parameterCount; i++)
+ * if (returnType != allowedParameterTypes.get(i))
+ * return null;
+ *
+ * return returnType;
+ * }
+ */
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InputTypeValidator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InputTypeValidator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InputTypeValidator.java
index 246b769..e3e2d19 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InputTypeValidator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InputTypeValidator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -24,13 +24,15 @@ import org.apache.olingo.odata2.api.edm.EdmType;
public interface InputTypeValidator {
- public EdmType validateParameterSet(List<ParameterSet> allowedParameterTypes, List<EdmType> actualParameterTypes) throws ExpressionParserInternalError;
+ public EdmType validateParameterSet(List<ParameterSet> allowedParameterTypes, List<EdmType> actualParameterTypes)
+ throws ExpressionParserInternalError;
public static class TypePromotionValidator implements InputTypeValidator {
@Override
- public EdmType validateParameterSet(final List<ParameterSet> allowedParameterTypes, final List<EdmType> actualParameterTypes) throws ExpressionParserInternalError {
- //first check for exact parameter combination
+ public EdmType validateParameterSet(final List<ParameterSet> allowedParameterTypes,
+ final List<EdmType> actualParameterTypes) throws ExpressionParserInternalError {
+ // first check for exact parameter combination
for (ParameterSet parameterSet : allowedParameterTypes) {
boolean s = parameterSet.equals(actualParameterTypes, false);
if (s) {
@@ -38,7 +40,7 @@ public interface InputTypeValidator {
}
}
- //first check for parameter combination with promotion
+ // first check for parameter combination with promotion
for (ParameterSet parameterSet : allowedParameterTypes) {
boolean s = parameterSet.equals(actualParameterTypes, true);
if (s) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
index 4289bc5..d1f4b98 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -50,16 +50,21 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
public class JsonVisitor implements ExpressionVisitor {
@Override
- public Object visitFilterExpression(final FilterExpression filterExpression, final String expressionString, final Object expression) {
+ public Object visitFilterExpression(final FilterExpression filterExpression, final String expressionString,
+ final Object expression) {
return expression;
}
@Override
- public Object visitBinary(final BinaryExpression binaryExpression, final BinaryOperator operator, final Object leftSide, final Object rightSide) {
+ public Object visitBinary(final BinaryExpression binaryExpression, final BinaryOperator operator,
+ final Object leftSide, final Object rightSide) {
try {
StringWriter writer = new StringWriter();
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", binaryExpression.getKind().toString()).separator().namedStringValue("operator", operator.toUriLiteral()).separator().namedStringValueRaw("type", getType(binaryExpression)).separator().name("left").unquotedValue(leftSide.toString()).separator().name("right").unquotedValue(rightSide.toString()).endObject();
+ jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", binaryExpression.getKind().toString()).separator()
+ .namedStringValue("operator", operator.toUriLiteral()).separator().namedStringValueRaw("type",
+ getType(binaryExpression)).separator().name("left").unquotedValue(leftSide.toString()).separator().name(
+ "right").unquotedValue(rightSide.toString()).endObject();
writer.flush();
return writer.toString();
} catch (final IOException e) {
@@ -68,11 +73,13 @@ public class JsonVisitor implements ExpressionVisitor {
}
@Override
- public Object visitOrderByExpression(final OrderByExpression orderByExpression, final String expressionString, final List<Object> orders) {
+ public Object visitOrderByExpression(final OrderByExpression orderByExpression, final String expressionString,
+ final List<Object> orders) {
try {
StringWriter writer = new StringWriter();
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", "order collection").separator().name("orders").beginArray();
+ jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", "order collection").separator().name("orders")
+ .beginArray();
boolean first = true;
for (final Object order : orders) {
if (first) {
@@ -91,11 +98,14 @@ public class JsonVisitor implements ExpressionVisitor {
}
@Override
- public Object visitOrder(final OrderExpression orderExpression, final Object filterResult, final SortOrder sortOrder) {
+ public Object visitOrder(final OrderExpression orderExpression, final Object filterResult,
+ final SortOrder sortOrder) {
try {
StringWriter writer = new StringWriter();
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", orderExpression.getKind().toString()).separator().namedStringValueRaw("sortorder", sortOrder.toString()).separator().name("expression").unquotedValue(filterResult.toString()).endObject();
+ jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", orderExpression.getKind().toString()).separator()
+ .namedStringValueRaw("sortorder", sortOrder.toString()).separator().name("expression").unquotedValue(
+ filterResult.toString()).endObject();
writer.flush();
return writer.toString();
} catch (final IOException e) {
@@ -108,7 +118,9 @@ public class JsonVisitor implements ExpressionVisitor {
try {
StringWriter writer = new StringWriter();
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", literal.getKind().toString()).separator().namedStringValueRaw("type", getType(literal)).separator().namedStringValue("value", edmLiteral.getLiteral()).endObject();
+ jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", literal.getKind().toString()).separator()
+ .namedStringValueRaw("type", getType(literal)).separator().namedStringValue("value", edmLiteral.getLiteral())
+ .endObject();
writer.flush();
return writer.toString();
} catch (final IOException e) {
@@ -117,11 +129,14 @@ public class JsonVisitor implements ExpressionVisitor {
}
@Override
- public Object visitMethod(final MethodExpression methodExpression, final MethodOperator method, final List<Object> parameters) {
+ public Object visitMethod(final MethodExpression methodExpression, final MethodOperator method,
+ final List<Object> parameters) {
try {
StringWriter writer = new StringWriter();
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", methodExpression.getKind().toString()).separator().namedStringValueRaw("operator", method.toUriLiteral()).separator().namedStringValueRaw("type", getType(methodExpression)).separator().name("parameters").beginArray();
+ jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", methodExpression.getKind().toString()).separator()
+ .namedStringValueRaw("operator", method.toUriLiteral()).separator().namedStringValueRaw("type",
+ getType(methodExpression)).separator().name("parameters").beginArray();
boolean first = true;
for (Object parameter : parameters) {
if (first) {
@@ -144,7 +159,9 @@ public class JsonVisitor implements ExpressionVisitor {
try {
StringWriter writer = new StringWriter();
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", memberExpression.getKind().toString()).separator().namedStringValueRaw("type", getType(memberExpression)).separator().name("source").unquotedValue(path.toString()).separator().name("path").unquotedValue(property.toString()).endObject();
+ jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", memberExpression.getKind().toString()).separator()
+ .namedStringValueRaw("type", getType(memberExpression)).separator().name("source").unquotedValue(
+ path.toString()).separator().name("path").unquotedValue(property.toString()).endObject();
writer.flush();
return writer.toString();
} catch (final IOException e) {
@@ -153,11 +170,14 @@ public class JsonVisitor implements ExpressionVisitor {
}
@Override
- public Object visitProperty(final PropertyExpression propertyExpression, final String uriLiteral, final EdmTyped edmProperty) {
+ public Object visitProperty(final PropertyExpression propertyExpression, final String uriLiteral,
+ final EdmTyped edmProperty) {
try {
StringWriter writer = new StringWriter();
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", propertyExpression.getKind().toString()).separator().namedStringValue("name", uriLiteral).separator().namedStringValueRaw("type", getType(propertyExpression)).endObject();
+ jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", propertyExpression.getKind().toString())
+ .separator().namedStringValue("name", uriLiteral).separator().namedStringValueRaw("type",
+ getType(propertyExpression)).endObject();
writer.flush();
return writer.toString();
} catch (final IOException e) {
@@ -170,7 +190,9 @@ public class JsonVisitor implements ExpressionVisitor {
try {
StringWriter writer = new StringWriter();
JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
- jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", unaryExpression.getKind().toString()).separator().namedStringValueRaw("operator", operator.toUriLiteral()).separator().namedStringValueRaw("type", getType(unaryExpression)).separator().name("operand").unquotedValue(operand.toString()).endObject();
+ jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", unaryExpression.getKind().toString()).separator()
+ .namedStringValueRaw("operator", operator.toUriLiteral()).separator().namedStringValueRaw("type",
+ getType(unaryExpression)).separator().name("operand").unquotedValue(operand.toString()).endObject();
writer.flush();
return writer.toString();
} catch (final IOException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/LiteralExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/LiteralExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/LiteralExpressionImpl.java
index bc41e28..f08b46b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/LiteralExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/LiteralExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java
index 7bbc278..ae9e6cc 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
[41/59] [abbrv] cleanup of odata fit tests
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProvider.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProvider.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProvider.java
index b2ee1e3..cd46253 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProvider.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.mapping;
@@ -84,9 +84,15 @@ public class MapProvider extends EdmProvider {
key = new Key();
key.setKeys(Arrays.asList(propertyRef));
- property1 = new SimpleProperty().setName(mapping[P1][EDM]).setType(EdmSimpleTypeKind.String).setMapping(new Mapping().setObject(mapping[P1][BACKEND]));
- property2 = new SimpleProperty().setName(mapping[P2][EDM]).setType(EdmSimpleTypeKind.String).setMapping(new Mapping().setObject(mapping[P2][BACKEND]));
- property3 = new SimpleProperty().setName(mapping[P3][EDM]).setType(EdmSimpleTypeKind.String).setMapping(new Mapping().setObject(mapping[P3][BACKEND]));
+ property1 =
+ new SimpleProperty().setName(mapping[P1][EDM]).setType(EdmSimpleTypeKind.String).setMapping(
+ new Mapping().setObject(mapping[P1][BACKEND]));
+ property2 =
+ new SimpleProperty().setName(mapping[P2][EDM]).setType(EdmSimpleTypeKind.String).setMapping(
+ new Mapping().setObject(mapping[P2][BACKEND]));
+ property3 =
+ new SimpleProperty().setName(mapping[P3][EDM]).setType(EdmSimpleTypeKind.String).setMapping(
+ new Mapping().setObject(mapping[P3][BACKEND]));
entityType = new EntityType();
entityType.setName(mapping[ENTITYTYPE][EDM]);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
index e701efd..e668a9d 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.mapping;
@@ -30,11 +30,6 @@ import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
-import org.custommonkey.xmlunit.SimpleNamespaceContext;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
@@ -42,6 +37,10 @@ import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.server.TestServer;
+import org.custommonkey.xmlunit.SimpleNamespaceContext;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.Before;
+import org.junit.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
index cd22356..72ce71b 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
index 0e09fdc..e802b06 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
/**
* Abstract base class for tests employing the reference scenario.
- *
+ *
*/
public class AbstractRefTest extends AbstractFitTest {
@@ -125,11 +125,13 @@ public class AbstractRefTest extends AbstractFitTest {
return response;
}
- protected HttpResponse callUri(final String uri, final String additionalHeader, final String additionalHeaderValue, final HttpStatusCodes expectedStatusCode) throws Exception {
+ protected HttpResponse callUri(final String uri, final String additionalHeader, final String additionalHeaderValue,
+ final HttpStatusCodes expectedStatusCode) throws Exception {
return callUri(ODataHttpMethod.GET, uri, additionalHeader, additionalHeaderValue, null, null, expectedStatusCode);
}
- protected HttpResponse callUri(final String uri, final String additionalHeader, final String additionalHeaderValue) throws Exception {
+ protected HttpResponse callUri(final String uri, final String additionalHeader, final String additionalHeaderValue)
+ throws Exception {
return callUri(ODataHttpMethod.GET, uri, additionalHeader, additionalHeaderValue, null, null, HttpStatusCodes.OK);
}
@@ -155,7 +157,8 @@ public class AbstractRefTest extends AbstractFitTest {
assertNotNull(getBody(response));
}
- protected void deleteUri(final String uri, final HttpStatusCodes expectedStatusCode) throws Exception, AssertionError {
+ protected void deleteUri(final String uri, final HttpStatusCodes expectedStatusCode)
+ throws Exception, AssertionError {
final HttpResponse response = callUri(ODataHttpMethod.DELETE, uri, null, null, null, null, expectedStatusCode);
if (expectedStatusCode != HttpStatusCodes.NO_CONTENT) {
response.getEntity().getContent().close();
@@ -166,18 +169,23 @@ public class AbstractRefTest extends AbstractFitTest {
deleteUri(uri, HttpStatusCodes.NO_CONTENT);
}
- protected HttpResponse postUri(final String uri, final String requestBody, final String requestContentType, final HttpStatusCodes expectedStatusCode) throws Exception {
+ protected HttpResponse postUri(final String uri, final String requestBody, final String requestContentType,
+ final HttpStatusCodes expectedStatusCode) throws Exception {
return callUri(ODataHttpMethod.POST, uri, null, null, requestBody, requestContentType, expectedStatusCode);
}
- protected HttpResponse postUri(final String uri, final String requestBody, final String requestContentType, final String additionalHeader, final String additionalHeaderValue, final HttpStatusCodes expectedStatusCode) throws Exception {
- return callUri(ODataHttpMethod.POST, uri, additionalHeader, additionalHeaderValue, requestBody, requestContentType, expectedStatusCode);
+ protected HttpResponse postUri(final String uri, final String requestBody, final String requestContentType,
+ final String additionalHeader, final String additionalHeaderValue, final HttpStatusCodes expectedStatusCode)
+ throws Exception {
+ return callUri(ODataHttpMethod.POST, uri, additionalHeader, additionalHeaderValue, requestBody, requestContentType,
+ expectedStatusCode);
}
protected void putUri(final String uri,
final String requestBody, final String requestContentType,
final HttpStatusCodes expectedStatusCode) throws Exception {
- final HttpResponse response = callUri(ODataHttpMethod.PUT, uri, null, null, requestBody, requestContentType, expectedStatusCode);
+ final HttpResponse response =
+ callUri(ODataHttpMethod.PUT, uri, null, null, requestBody, requestContentType, expectedStatusCode);
if (expectedStatusCode != HttpStatusCodes.NO_CONTENT) {
response.getEntity().getContent().close();
}
@@ -186,8 +194,10 @@ public class AbstractRefTest extends AbstractFitTest {
protected void putUri(final String uri, final String acceptHeader,
final String requestBody, final String requestContentType,
final HttpStatusCodes expectedStatusCode) throws Exception {
- final HttpResponse response = callUri(ODataHttpMethod.PUT, uri,
- org.apache.olingo.odata2.api.commons.HttpHeaders.ACCEPT, acceptHeader, requestBody, requestContentType, expectedStatusCode);
+ final HttpResponse response =
+ callUri(ODataHttpMethod.PUT, uri,
+ org.apache.olingo.odata2.api.commons.HttpHeaders.ACCEPT, acceptHeader, requestBody, requestContentType,
+ expectedStatusCode);
if (expectedStatusCode != HttpStatusCodes.NO_CONTENT) {
response.getEntity().getContent().close();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
index 48ba3f0..8a88084 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -26,18 +26,17 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.http.HttpResponse;
+import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.api.edm.Edm;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.custommonkey.xmlunit.exceptions.XpathException;
import org.junit.Before;
import org.xml.sax.SAXException;
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
-import org.apache.olingo.odata2.api.edm.Edm;
-
/**
* Abstract base class for tests employing the reference scenario reading or writing XML.
- *
+ *
*/
public class AbstractRefXmlTest extends AbstractRefTest {
@Before
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
index 6bcb8c5..c2fcad0 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -46,7 +46,8 @@ public class BatchTest extends AbstractRefTest {
@Test
public void testSimpleBatch() throws Exception {
String responseBody = execute("/simple.batch");
- assertFalse(responseBody.contains("<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">"));
+ assertFalse(responseBody
+ .contains("<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">"));
assertTrue(responseBody.contains("<edmx:Edmx Version=\"1.0\""));
}
@@ -82,25 +83,24 @@ public class BatchTest extends AbstractRefTest {
HttpResponse response = execute("/batchWithContentIdPart2.batch", "batch_cf90-46e5-1246");
String responseBody = StringHelper.inputStreamToString(response.getEntity().getContent(), true);
- assertContentContainValues(responseBody,
- "{\"d\":{\"EmployeeName\":\"Frederic Fall\"}}",
- "HTTP/1.1 201 Created",
- "Content-Id: employee",
- "Content-Type: application/json;odata=verbose",
- "\"EmployeeId\":\"7\",\"EmployeeName\":\"Employee 7\",",
- "HTTP/1.1 204 No Content",
- "Content-Id: AAA",
- "{\"d\":{\"EmployeeName\":\"Robert Fall\"}}"
- );
-
+ assertContentContainValues(responseBody,
+ "{\"d\":{\"EmployeeName\":\"Frederic Fall\"}}",
+ "HTTP/1.1 201 Created",
+ "Content-Id: employee",
+ "Content-Type: application/json;odata=verbose",
+ "\"EmployeeId\":\"7\",\"EmployeeName\":\"Employee 7\",",
+ "HTTP/1.1 204 No Content",
+ "Content-Id: AAA",
+ "{\"d\":{\"EmployeeName\":\"Robert Fall\"}}");
+
// validate that response for PUT does not contains a Content Type
int indexNoContent = responseBody.indexOf("HTTP/1.1 204 No Content");
int indexBoundary = responseBody.indexOf("--changeset_", indexNoContent);
-
+
int indexContentType = responseBody.indexOf("Content-Type:", indexNoContent);
Assert.assertTrue(indexBoundary < indexContentType);
}
-
+
@Test
public void testErrorBatch() throws Exception {
String responseBody = execute("/error.batch");
@@ -108,12 +108,12 @@ public class BatchTest extends AbstractRefTest {
}
/**
- * Validate that given <code>content</code> contains all <code>values</code> in the given order.
+ * Validate that given <code>content</code> contains all <code>values</code> in the given order.
*
* @param content
* @param containingValues
*/
- private void assertContentContainValues(String content, String ... containingValues) {
+ private void assertContentContainValues(final String content, final String... containingValues) {
int index = -1;
for (String value : containingValues) {
int newIndex = content.indexOf(value, index);
@@ -129,7 +129,8 @@ public class BatchTest extends AbstractRefTest {
return responseBody;
}
- private HttpResponse execute(final String batchResource, String boundary) throws IOException, UnsupportedEncodingException, ClientProtocolException {
+ private HttpResponse execute(final String batchResource, final String boundary) throws IOException,
+ UnsupportedEncodingException, ClientProtocolException {
final HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + "$batch"));
post.setHeader("Content-Type", "multipart/mixed;boundary=" + boundary);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
index e590e1b..d8ccbc4 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -96,7 +96,8 @@ public class ContentNegotiationTest extends AbstractRefTest {
@Test
public void contentTypeServiceDocumentAtomXmlNotAccept() throws Exception {
- final HttpResponse response = callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_ATOM_XML, HttpStatusCodes.NOT_ACCEPTABLE);
+ final HttpResponse response =
+ callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_ATOM_XML, HttpStatusCodes.NOT_ACCEPTABLE);
checkMediaType(response, HttpContentType.APPLICATION_XML);
String body = getBody(response);
assertTrue(body.length() > 100);
@@ -112,7 +113,8 @@ public class ContentNegotiationTest extends AbstractRefTest {
@Test
public void contentTypeServiceDocumentAtomSvcXml() throws Exception {
- final HttpResponse response = callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_ATOM_SVC, HttpStatusCodes.OK);
+ final HttpResponse response =
+ callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_ATOM_SVC, HttpStatusCodes.OK);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_SVC_UTF8);
assertTrue(getBody(response).length() > 100);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
index 2b3f7a8..6b9be91 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -23,11 +23,10 @@ import static org.junit.Assert.assertNotNull;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.ODataServiceVersion;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpHeaders;
+import org.junit.Test;
/**
*
@@ -73,7 +72,8 @@ public class DataServiceVersionTest extends AbstractRefTest {
@Test
public void testDataServiceVersionSetOnEntitySetFail() throws Exception {
- HttpResponse response = callUri("Employees", ODataHttpHeaders.DATASERVICEVERSION, "3.0", HttpStatusCodes.BAD_REQUEST);
+ HttpResponse response =
+ callUri("Employees", ODataHttpHeaders.DATASERVICEVERSION, "3.0", HttpStatusCodes.BAD_REQUEST);
checkVersion(response, ODataServiceVersion.V10);
getBody(response);
response = callUri("$metadata", ODataHttpHeaders.DATASERVICEVERSION, "3.0", HttpStatusCodes.BAD_REQUEST);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
index 2f9be76..4327491 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* Tests employing the reference scenario changing entities in JSON format.
- *
+ *
*/
public class EntryJsonChangeTest extends AbstractRefTest {
@@ -37,9 +37,11 @@ public class EntryJsonChangeTest extends AbstractRefTest {
public void createEntry() throws Exception {
final String requestBody = "{\"Id\":\"99\",\"Name\":\"Building 4\",\"Image\":\"" + PHOTO_DEFAULT_IMAGE + "\","
+ "\"nb_Rooms\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('101')\"}}}";
- final HttpResponse response = postUri("Buildings()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ final HttpResponse response =
+ postUri("Buildings()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
assertFalse(getBody(response).isEmpty());
- assertEquals("{\"d\":{\"Image\":\"" + PHOTO_DEFAULT_IMAGE + "\"}}", getBody(callUri("Buildings('4')/Image?$format=json")));
+ assertEquals("{\"d\":{\"Image\":\"" + PHOTO_DEFAULT_IMAGE + "\"}}",
+ getBody(callUri("Buildings('4')/Image?$format=json")));
checkUri("Buildings('4')/nb_Rooms('101')?$format=json");
postUri("Buildings()", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.BAD_REQUEST);
@@ -48,7 +50,8 @@ public class EntryJsonChangeTest extends AbstractRefTest {
@Test
public void createEntryMinimal() throws Exception {
final String requestBody = "{\"Id\":\"99\"}";
- final HttpResponse response = postUri("Teams()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ final HttpResponse response =
+ postUri("Teams()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
assertFalse(getBody(response).isEmpty());
checkUri("Teams('4')?$format=json");
}
@@ -56,7 +59,8 @@ public class EntryJsonChangeTest extends AbstractRefTest {
@Test
public void createEntryWithNavigation() throws Exception {
final String requestBody = "{\"Id\":\"199\",\"Name\":\"Room 199\"}";
- final HttpResponse response = postUri("Buildings('1')/nb_Rooms()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ final HttpResponse response =
+ postUri("Buildings('1')/nb_Rooms()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
assertFalse(getBody(response).isEmpty());
checkUri("Rooms('104')?$format=json");
assertEquals("1", getBody(callUri("Rooms('104')/nr_Building/Id/$value")));
@@ -67,7 +71,8 @@ public class EntryJsonChangeTest extends AbstractRefTest {
public void createEntryWithLink() throws Exception {
final String requestBody = "{\"Id\":\"99\",\"Name\":\"new room\",\"Seats\":19,\"Version\":42,"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Buildings('1')\"}}}";
- final HttpResponse response = postUri("Rooms()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ final HttpResponse response =
+ postUri("Rooms()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
assertFalse(getBody(response).isEmpty());
checkUri("Rooms('104')/nr_Building?$format=json");
assertEquals("{\"d\":{\"Name\":\"Building 1\"}}", getBody(callUri("Rooms('104')/nr_Building/Name?$format=json")));
@@ -77,7 +82,8 @@ public class EntryJsonChangeTest extends AbstractRefTest {
public void createEntryWithInlineEntry() throws Exception {
final String requestBody = "{\"Id\":\"99\",\"Name\":\"new room\",\"Seats\":19,\"Version\":42,"
+ "\"nr_Building\":{\"Id\":\"9\",\"Name\":\"new building\"}}";
- final HttpResponse response = postUri("Rooms()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ final HttpResponse response =
+ postUri("Rooms()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
assertFalse(getBody(response).isEmpty());
checkUri("Rooms('104')/nr_Building?$format=json");
assertEquals("{\"d\":{\"Name\":\"new building\"}}", getBody(callUri("Rooms('104')/nr_Building/Name?$format=json")));
@@ -90,14 +96,18 @@ public class EntryJsonChangeTest extends AbstractRefTest {
+ " {\"Id\":\"202\",\"Name\":\"Room 202\",\"Seats\":6,\"Version\":3,"
+ " \"nr_Employees\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Employees('5')\"}},"
+ " \"nr_Employees\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Employees('6')\"}}}]}";
- final HttpResponse response = postUri("Buildings()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ final HttpResponse response =
+ postUri("Buildings()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
assertFalse(getBody(response).isEmpty());
checkUri("Buildings('4')?$format=json");
checkUri("Buildings('4')/nb_Rooms('104')?$format=json");
- assertEquals("{\"d\":{\"results\":[]}}", getBody(callUri("Buildings('4')/nb_Rooms('104')/nr_Employees?$format=json")));
+ assertEquals("{\"d\":{\"results\":[]}}",
+ getBody(callUri("Buildings('4')/nb_Rooms('104')/nr_Employees?$format=json")));
assertEquals("{\"d\":{\"Seats\":6}}", getBody(callUri("Buildings('4')/nb_Rooms('105')/Seats?$format=json")));
- assertEquals("{\"d\":{\"EmployeeName\":\"" + EMPLOYEE_5_NAME + "\"}}", getBody(callUri("Buildings('4')/nb_Rooms('105')/nr_Employees('5')/EmployeeName?$format=json")));
- assertEquals("{\"d\":{\"Age\":" + EMPLOYEE_6_AGE + "}}", getBody(callUri("Buildings('4')/nb_Rooms('105')/nr_Employees('6')/Age?$format=json")));
+ assertEquals("{\"d\":{\"EmployeeName\":\"" + EMPLOYEE_5_NAME + "\"}}",
+ getBody(callUri("Buildings('4')/nb_Rooms('105')/nr_Employees('5')/EmployeeName?$format=json")));
+ assertEquals("{\"d\":{\"Age\":" + EMPLOYEE_6_AGE + "}}",
+ getBody(callUri("Buildings('4')/nb_Rooms('105')/nr_Employees('6')/Age?$format=json")));
}
@Test
@@ -108,12 +118,15 @@ public class EntryJsonChangeTest extends AbstractRefTest {
+ "\"Location\":{\"City\":{\"PostalCode\":null,\"CityName\":null},\"Country\":null},"
+ "\"EntryDate\":\"\\/Date(1424242424242)\\/\","
+ "\"ne_Manager\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Managers('1')\"}}}]}]}";
- final HttpResponse response = postUri("Buildings()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ final HttpResponse response =
+ postUri("Buildings()", requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
assertFalse(getBody(response).isEmpty());
checkUri("Buildings('4')");
assertEquals("1", getBody(callUri("Buildings('4')/nb_Rooms('104')/Seats/$value")));
- assertEquals("2015-02-18T06:53:44.242", getBody(callUri("Buildings('4')/nb_Rooms('104')/nr_Employees('7')/EntryDate/$value")));
- assertEquals(MANAGER_NAME, getBody(callUri("Buildings('4')/nb_Rooms('104')/nr_Employees('7')/ne_Manager/EmployeeName/$value")));
+ assertEquals("2015-02-18T06:53:44.242",
+ getBody(callUri("Buildings('4')/nb_Rooms('104')/nr_Employees('7')/EntryDate/$value")));
+ assertEquals(MANAGER_NAME,
+ getBody(callUri("Buildings('4')/nb_Rooms('104')/nr_Employees('7')/ne_Manager/EmployeeName/$value")));
}
@Test
@@ -134,7 +147,8 @@ public class EntryJsonChangeTest extends AbstractRefTest {
final String requestBody = "{\"Location\":"
+ "{\"City\":{\"PostalCode\":\"69124\",\"CityName\":\"" + CITY_1_NAME + "\"},"
+ " \"Country\":\"Germany\"},\"EntryDate\":null}";
- callUri(ODataHttpMethod.PATCH, "Employees('2')", null, null, requestBody, HttpContentType.APPLICATION_JSON, HttpStatusCodes.NO_CONTENT);
+ callUri(ODataHttpMethod.PATCH, "Employees('2')", null, null, requestBody, HttpContentType.APPLICATION_JSON,
+ HttpStatusCodes.NO_CONTENT);
assertEquals(CITY_1_NAME, getBody(callUri("Employees('2')/Location/City/CityName/$value")));
assertEquals("{\"d\":{\"EntryDate\":null}}", getBody(callUri("Employees('2')/EntryDate?$format=json")));
assertEquals(EMPLOYEE_2_NAME, getBody(callUri("Employees('2')/EmployeeName/$value")));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
index 6dea2f0..2aeef99 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -26,11 +26,11 @@ import java.util.List;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
+import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.junit.Test;
import com.google.gson.internal.StringMap;
-import org.apache.olingo.odata2.api.commons.HttpContentType;
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
*
@@ -39,23 +39,26 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
@Test
public void createThreeLevelsDeepInsert() throws Exception {
- String content = "{\"Name\" : \"Room 2\",\"nr_Building\" : {\"Name\" : \"Building 2\",\"nb_Rooms\" : {\"results\" : [{"
- + "\"nr_Employees\" : {\"__deferred\" : {\"uri\" : \"" + getEndpoint() + "Rooms('1')/nr_Employees\""
- + "}},\"nr_Building\" : {\"__deferred\" : {\"uri\" : \"" + getEndpoint() + "/Rooms('1')/nr_Building\""
- + "}}}]}}}";
-
- HttpResponse response = postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ String content =
+ "{\"Name\" : \"Room 2\",\"nr_Building\" : {\"Name\" : \"Building 2\",\"nb_Rooms\" : {\"results\" : [{"
+ + "\"nr_Employees\" : {\"__deferred\" : {\"uri\" : \"" + getEndpoint() + "Rooms('1')/nr_Employees\""
+ + "}},\"nr_Building\" : {\"__deferred\" : {\"uri\" : \"" + getEndpoint() + "/Rooms('1')/nr_Building\""
+ + "}}}]}}}";
+
+ HttpResponse response =
+ postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
String body = getBody(response);
- //Check inline building
+ // Check inline building
StringMap<?> map = getStringMap(body);
map = (StringMap<?>) map.get("nr_Building");
assertNotNull(map);
assertEquals("Building 2", map.get("Name"));
- //Check inline rooms of the inline building
+ // Check inline rooms of the inline building
map = (StringMap<?>) map.get("nb_Rooms");
assertNotNull(map);
@@ -76,7 +79,9 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ "\"Id\":\"2\",\"Name\":\"Building 4\",\"Image\":null,"
+ "\"nb_Rooms\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Buildings('2')/nb_Rooms\"}}}}}";
- HttpResponse response = postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
checkEtag(response, "W/\"2\"");
@@ -114,7 +119,9 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ "\"Id\":\"1\",\"Name\":\"Room 104\",\"Seats\":4,\"Version\":2,"
+ "\"nr_Employees\":[],"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('1')/nr_Building\"}}}}";
- HttpResponse response = postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
checkEtag(response, "W/\"2\"");
@@ -139,7 +146,9 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ "\"Id\":\"1\",\"Name\":\"Room 104\",\"Seats\":4,\"Version\":2,"
+ "\"nr_Employees\":{\"results\":[]},"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('1')/nr_Building\"}}}}";
- HttpResponse response = postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
checkEtag(response, "W/\"2\"");
@@ -174,9 +183,11 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ "\"nr_Employees\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('3')/nr_Employees\"}},"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('3')/nr_Building\"}}}]}}";
- HttpResponse response = postUri("Buildings", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Buildings", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
- //checkEtag(response, "W/\"2\"");
+ // checkEtag(response, "W/\"2\"");
String body = getBody(response);
StringMap<?> map = getStringMap(body);
@@ -195,7 +206,8 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
map = getStringMap(body);
assertEquals("104", map.get("Id"));
assertEquals("Room 2", map.get("Name"));
- response = callUri("Buildings('4')/nb_Rooms('104')/Seats/$value", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
+ response =
+ callUri("Buildings('4')/nb_Rooms('104')/Seats/$value", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
body = getBody(response);
assertEquals("5", body);
@@ -204,7 +216,8 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
map = getStringMap(body);
assertEquals("105", map.get("Id"));
assertEquals("Room 3", map.get("Name"));
- response = callUri("Buildings('4')/nb_Rooms('105')/Seats/$value", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
+ response =
+ callUri("Buildings('4')/nb_Rooms('105')/Seats/$value", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
body = getBody(response);
assertEquals("2", body);
}
@@ -228,12 +241,18 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ "\"nr_Employees\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('3')/nr_Employees\"}},"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('3')/nr_Building\"}}}]}}}";
- HttpResponse response = callUri("Buildings('4')/nb_Rooms('104')/", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.NOT_FOUND);
+ HttpResponse response =
+ callUri("Buildings('4')/nb_Rooms('104')/", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON,
+ HttpStatusCodes.NOT_FOUND);
getBody(response);
- response = callUri("Buildings('4')/nb_Rooms('105')/", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.NOT_FOUND);
+ response =
+ callUri("Buildings('4')/nb_Rooms('105')/", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON,
+ HttpStatusCodes.NOT_FOUND);
getBody(response);
- response = postUri("Buildings", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ response =
+ postUri("Buildings", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
String body = getBody(response);
@@ -263,10 +282,12 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
assertEquals("Room 3", resultMap.get("Name"));
}
}
- response = callUri("Buildings('4')/nb_Rooms('104')/Seats/$value", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
+ response =
+ callUri("Buildings('4')/nb_Rooms('104')/Seats/$value", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
assertEquals("5", getBody(response));
- response = callUri("Buildings('4')/nb_Rooms('105')/Seats/$value", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
+ response =
+ callUri("Buildings('4')/nb_Rooms('105')/Seats/$value", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
assertEquals("2", getBody(response));
}
@@ -293,7 +314,9 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ "\"ImageUrl\": \"" + getEndpoint() + "Employees('1')/$value\"}]},"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('1')/nr_Building\"}}}}";
- HttpResponse response = postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
String body = getBody(response);
@@ -317,7 +340,8 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ "\"Id\":\"1\",\"Name\":\"Room 104\",\"Seats\":4,\"Version\":2,"
+ "\"nr_Employees\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('1')/nr_Employees\"}},"
+ "\"nr_Building\":{\"results\":[]}}}";
- postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.BAD_REQUEST);
+ postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON,
+ HttpStatusCodes.BAD_REQUEST);
}
@Test
@@ -338,7 +362,8 @@ public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ "\"nr_Employees\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('3')/nr_Employees\"}},"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('3')/nr_Building\"}}}]}}}";
- postUri("Buildings", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.BAD_REQUEST);
+ postUri("Buildings", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.BAD_REQUEST);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
index 0d2f37b..ca3d884 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -24,11 +24,11 @@ import static org.junit.Assert.assertNull;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
+import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.junit.Test;
import com.google.gson.internal.StringMap;
-import org.apache.olingo.odata2.api.commons.HttpContentType;
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
*
@@ -44,7 +44,9 @@ public class EntryJsonCreateTest extends AbstractRefJsonTest {
+ "\"nr_Employees\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('1')/nr_Employees\"}},"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('1')/nr_Building\"}}}}";
assertNotNull(content);
- HttpResponse response = postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
String body = getBody(response);
@@ -72,7 +74,9 @@ public class EntryJsonCreateTest extends AbstractRefJsonTest {
+ "\"nr_Employees\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('1')/nr_Employees\"}},"
+ "\"nr_Building\":{\"__deferred\":{\"uri\":\"" + getEndpoint() + "Rooms('1')/nr_Building\"}}}}";
assertNotNull(content);
- HttpResponse response = postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Rooms", content, HttpContentType.APPLICATION_JSON, HttpHeaders.ACCEPT,
+ HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
String body = getBody(response);
@@ -93,7 +97,9 @@ public class EntryJsonCreateTest extends AbstractRefJsonTest {
String content = "{iVBORw0KGgoAAAANSUhEUgAAAB4AAAAwCAIAAACJ9F2zAAAAA}";
assertNotNull(content);
- HttpResponse response = postUri("Employees", content, HttpContentType.TEXT_PLAIN, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Employees", content, HttpContentType.TEXT_PLAIN, HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON,
+ HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_JSON);
String body = getBody(response);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
index 9711fa9..e2bc613 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
@@ -1,33 +1,32 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
import static org.junit.Assert.assertEquals;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.junit.Test;
/**
* Tests employing the reference scenario reading a single entity in JSON format.
- *
+ *
*/
public class EntryJsonReadOnlyTest extends AbstractRefTest {
@@ -114,7 +113,9 @@ public class EntryJsonReadOnlyTest extends AbstractRefTest {
@Test
public void entryWithTwoLevelInline() throws Exception {
- HttpResponse response = callUri("Employees('5')?$expand=ne_Room/nr_Building&$select=Age,ne_Room/Seats,ne_Room/nr_Building/Name&$format=json");
+ HttpResponse response =
+ callUri("Employees('5')?$expand=ne_Room/nr_Building&$select=Age,ne_Room/Seats," +
+ "ne_Room/nr_Building/Name&$format=json");
checkMediaType(response, HttpContentType.APPLICATION_JSON);
assertEquals("{\"d\":{\"__metadata\":{"
+ "\"id\":\"" + getEndpoint() + "Employees('5')\","
@@ -132,7 +133,9 @@ public class EntryJsonReadOnlyTest extends AbstractRefTest {
+ "\"type\":\"RefScenario.Building\"},\"Name\":\"Building 2\"}}}}",
getBody(response));
- response = callUri("Employees('1')?$expand=ne_Room/nr_Building&$select=EntryDate,ne_Manager,ne_Room/*,ne_Room/nr_Building/Name&$format=json");
+ response =
+ callUri("Employees('1')?$expand=ne_Room/nr_Building&$select=EntryDate,ne_Manager,ne_Room/*," +
+ "ne_Room/nr_Building/Name&$format=json");
checkMediaType(response, HttpContentType.APPLICATION_JSON);
assertEquals("{\"d\":{\"__metadata\":{"
+ "\"id\":\"" + getEndpoint() + "Employees('1')\","
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
index 343001e..93616df 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -35,7 +35,7 @@ import org.junit.Test;
/**
* Tests employing the reference scenario changing entities in XML format.
- *
+ *
*/
public class EntryXmlChangeTest extends AbstractRefXmlTest {
@@ -47,7 +47,8 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
.replace("Id>1", "Id>9")
.replace("Team 1", "Team X")
.replaceAll("<link.+?/>", "");
- HttpResponse response = postUri("Teams()", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Teams()", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
assertEquals(getEndpoint() + "Teams('4')", response.getFirstHeader(HttpHeaders.LOCATION).getValue());
assertNull(response.getFirstHeader(HttpHeaders.ETAG));
@@ -98,7 +99,9 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
HttpStatusCodes expectedStatusCode = HttpStatusCodes.CREATED;
String headerName = "Accept";
String headerValue = "application/atom+xml;type=entry";
- HttpResponse response = callUri(ODataHttpMethod.POST, "Teams()", headerName, headerValue, requestBody, requestContentType, expectedStatusCode );
+ HttpResponse response =
+ callUri(ODataHttpMethod.POST, "Teams()", headerName, headerValue, requestBody, requestContentType,
+ expectedStatusCode);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
assertEquals(getEndpoint() + "Teams('4')", response.getFirstHeader(HttpHeaders.LOCATION).getValue());
@@ -148,7 +151,8 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
.replace("Team 1", largeTeamName)
.replaceAll("<link.+?/>", "");
- HttpResponse response = postUri("Teams()", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Teams()", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
assertEquals(getEndpoint() + "Teams('4')", response.getFirstHeader(HttpHeaders.LOCATION).getValue());
assertNull(response.getFirstHeader(HttpHeaders.ETAG));
@@ -163,7 +167,8 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
+ " <content><m:properties><d:Id>99</d:Id></m:properties></content>" + "\n"
+ "</entry>";
- final HttpResponse response = postUri("Teams()", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
+ final HttpResponse response =
+ postUri("Teams()", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
assertEquals(getEndpoint() + "Teams('4')", response.getFirstHeader(HttpHeaders.LOCATION).getValue());
}
@@ -173,7 +178,8 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
getBody(callUri("Employees('7')", HttpStatusCodes.NOT_FOUND));
final String updateBody = "<invalidXml></invalid>";
- final HttpResponse postResult = postUri("Employees", updateBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
+ final HttpResponse postResult =
+ postUri("Employees", updateBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
checkMediaType(postResult, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
assertXpathEvaluatesTo("7", "/atom:entry/m:properties/d:EmployeeId", getBody(postResult));
@@ -194,7 +200,8 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
response = postUri("Container2.Photos", "dummy", HttpContentType.TEXT_PLAIN, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
- assertEquals(getEndpoint() + "Container2.Photos(Id=5,Type='application%2Foctet-stream')", response.getFirstHeader(HttpHeaders.LOCATION).getValue());
+ assertEquals(getEndpoint() + "Container2.Photos(Id=5,Type='application%2Foctet-stream')", response.getFirstHeader(
+ HttpHeaders.LOCATION).getValue());
checkEtag(response, "W/\"5\"");
assertXpathEvaluatesTo("Photo 5", "/atom:entry/m:properties/d:Name", getBody(response));
response = callUri("Container2.Photos(Id=5,Type='application%2Foctet-stream')/$value");
@@ -204,7 +211,8 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
@Test
public void createMediaResourceWithNavigation() throws Exception {
- HttpResponse response = postUri("Teams('1')/nt_Employees", "X", HttpContentType.TEXT_PLAIN, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Teams('1')/nt_Employees", "X", HttpContentType.TEXT_PLAIN, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
assertEquals(getEndpoint() + "Employees('7')", response.getFirstHeader(HttpHeaders.LOCATION).getValue());
assertXpathEvaluatesTo("7", "/atom:entry/m:properties/d:EmployeeId", getBody(response));
@@ -253,12 +261,14 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
+ "<atom:updated>2012-02-29T11:59:59Z</atom:updated>"
+ "</atom:entry>";
- HttpResponse response = postUri("Buildings", buildingWithRooms, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Buildings", buildingWithRooms, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
assertEquals(getEndpoint() + "Buildings('4')", response.getFirstHeader(HttpHeaders.LOCATION).getValue());
final String body = getBody(response);
assertXpathEvaluatesTo("4", "/atom:entry/atom:content/m:properties/d:Id", body);
- assertXpathEvaluatesTo("105", "/atom:entry/atom:link[@rel='" + Edm.NAMESPACE_REL_2007_08 + "nb_Rooms']/m:inline/atom:feed/atom:entry[2]/atom:content/m:properties/d:Id", body);
+ assertXpathEvaluatesTo("105", "/atom:entry/atom:link[@rel='" + Edm.NAMESPACE_REL_2007_08
+ + "nb_Rooms']/m:inline/atom:feed/atom:entry[2]/atom:content/m:properties/d:Id", body);
checkUri("Buildings('4')");
checkUri("Rooms('104')");
checkUri("Buildings('4')/nb_Rooms('104')");
@@ -278,7 +288,9 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
.replace("<d:Age>" + EMPLOYEE_2_AGE + "</d:Age>", "")
.replace(">2003-07-01T00:00:00", " m:null='true'>")
.replaceAll("<link.+?/>", "");
- final HttpResponse response = callUri(ODataHttpMethod.PUT, "Employees('1')", null, null, requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.NO_CONTENT);
+ final HttpResponse response =
+ callUri(ODataHttpMethod.PUT, "Employees('1')", null, null, requestBody,
+ HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.NO_CONTENT);
assertFalse(response.containsHeader(HttpHeaders.LOCATION));
final String body = getBody(callUri("Employees('1')"));
assertXpathEvaluatesTo("Mister X", "/atom:entry/m:properties/d:EmployeeName", body);
@@ -323,7 +335,8 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
public void updateInvalidXml() throws Exception {
final String requestBodyBefore = getBody(callUri("Employees('2')"));
- putUri("Employees('2')", "<invalidXml></invalid>", HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.BAD_REQUEST);
+ putUri("Employees('2')", "<invalidXml></invalid>", HttpContentType.APPLICATION_ATOM_XML_ENTRY,
+ HttpStatusCodes.BAD_REQUEST);
assertEquals(requestBodyBefore, getBody(callUri("Employees('2')")));
}
@@ -345,7 +358,8 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
+ " <d:EntryDate m:null=\"true\"/>" + "\n"
+ " </m:properties>" + "\n"
+ "</entry>";
- callUri(ODataHttpMethod.PATCH, "Employees('2')", null, null, requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.NO_CONTENT);
+ callUri(ODataHttpMethod.PATCH, "Employees('2')", null, null, requestBody,
+ HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.NO_CONTENT);
final String body = getBody(callUri("Employees('2')"));
assertXpathEvaluatesTo(CITY_1_NAME, "/atom:entry/m:properties/d:Location/d:City/d:CityName", body);
assertXpathEvaluatesTo(EMPLOYEE_2_AGE, "/atom:entry/m:properties/d:Age", body);
@@ -357,7 +371,9 @@ public class EntryXmlChangeTest extends AbstractRefXmlTest {
+ " <m:properties><d:Name>Room X</d:Name></m:properties>" + "\n"
+ " </content>" + "\n"
+ "</entry>";
- HttpResponse response = callUri(ODataHttpMethod.MERGE, "Rooms('3')", HttpHeaders.IF_MATCH, "W/\"3\"", requestBody, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.NO_CONTENT);
+ HttpResponse response =
+ callUri(ODataHttpMethod.MERGE, "Rooms('3')", HttpHeaders.IF_MATCH, "W/\"3\"", requestBody,
+ HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.NO_CONTENT);
checkEtag(response, "W/\"3\"");
assertXpathEvaluatesTo("Room X", "/atom:entry/atom:content/m:properties/d:Name", getBody(callUri("Rooms('3')")));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b18130ac/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
index 51bdf14..8d7e436 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
@@ -23,15 +23,14 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.apache.http.HttpResponse;
-import org.junit.Test;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.junit.Test;
/**
* Tests employing the reference scenario changing entities in XML format.
- *
+ *
*/
public class EntryXmlCreateTest extends AbstractRefXmlTest {
@@ -42,7 +41,8 @@ public class EntryXmlCreateTest extends AbstractRefXmlTest {
String content = readFile("room_w_four_inlined_employees.xml");
assertNotNull(content);
- HttpResponse response = postUri("Rooms", content, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
+ HttpResponse response =
+ postUri("Rooms", content, HttpContentType.APPLICATION_ATOM_XML_ENTRY, HttpStatusCodes.CREATED);
checkMediaType(response, HttpContentType.APPLICATION_ATOM_XML_UTF8 + ";type=entry");
assertEquals(getEndpoint() + "Rooms('104')", response.getFirstHeader(HttpHeaders.LOCATION).getValue());
[37/59] [abbrv] git commit: Cleanup of core
Posted by ch...@apache.org.
Cleanup of core
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/a030e42b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/a030e42b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/a030e42b
Branch: refs/heads/master
Commit: a030e42bc3c7fa6a9f351e3a99af75eb55d616e2
Parents: cf4caab
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 14:45:03 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 14:45:03 2013 +0200
----------------------------------------------------------------------
.../olingo/odata2/core/ContentNegotiator.java | 100 ++-
.../apache/olingo/odata2/core/Dispatcher.java | 43 +-
.../olingo/odata2/core/ODataContextImpl.java | 29 +-
.../odata2/core/ODataExceptionWrapper.java | 71 +-
.../odata2/core/ODataPathSegmentImpl.java | 26 +-
.../olingo/odata2/core/ODataRequestHandler.java | 143 ++--
.../olingo/odata2/core/ODataRequestImpl.java | 26 +-
.../olingo/odata2/core/ODataResponseImpl.java | 26 +-
.../apache/olingo/odata2/core/PathInfoImpl.java | 26 +-
.../olingo/odata2/core/batch/AcceptParser.java | 38 +-
.../odata2/core/batch/BatchChangeSetImpl.java | 26 +-
.../core/batch/BatchChangeSetPartImpl.java | 26 +-
.../odata2/core/batch/BatchHandlerImpl.java | 56 +-
.../olingo/odata2/core/batch/BatchHelper.java | 26 +-
.../odata2/core/batch/BatchQueryPartImpl.java | 26 +-
.../odata2/core/batch/BatchRequestParser.java | 72 +-
.../odata2/core/batch/BatchRequestPartImpl.java | 26 +-
.../odata2/core/batch/BatchRequestWriter.java | 50 +-
.../odata2/core/batch/BatchResponseParser.java | 78 +-
.../core/batch/BatchResponsePartImpl.java | 26 +-
.../odata2/core/batch/BatchResponseWriter.java | 32 +-
.../core/batch/BatchSingleResponseImpl.java | 26 +-
.../olingo/odata2/core/commons/ContentType.java | 281 +++---
.../olingo/odata2/core/commons/Decoder.java | 38 +-
.../olingo/odata2/core/commons/Encoder.java | 47 +-
.../olingo/odata2/core/debug/DebugInfo.java | 26 +-
.../olingo/odata2/core/debug/DebugInfoBody.java | 29 +-
.../odata2/core/debug/DebugInfoException.java | 35 +-
.../odata2/core/debug/DebugInfoRequest.java | 26 +-
.../odata2/core/debug/DebugInfoResponse.java | 26 +-
.../odata2/core/debug/DebugInfoRuntime.java | 32 +-
.../olingo/odata2/core/debug/DebugInfoUri.java | 29 +-
.../core/debug/ODataDebugResponseWrapper.java | 31 +-
.../odata2/core/edm/AbstractSimpleType.java | 40 +-
.../org/apache/olingo/odata2/core/edm/Bit.java | 34 +-
.../olingo/odata2/core/edm/EdmBinary.java | 40 +-
.../olingo/odata2/core/edm/EdmBoolean.java | 34 +-
.../apache/olingo/odata2/core/edm/EdmByte.java | 37 +-
.../olingo/odata2/core/edm/EdmDateTime.java | 49 +-
.../odata2/core/edm/EdmDateTimeOffset.java | 50 +-
.../olingo/odata2/core/edm/EdmDecimal.java | 49 +-
.../olingo/odata2/core/edm/EdmDouble.java | 49 +-
.../apache/olingo/odata2/core/edm/EdmGuid.java | 34 +-
.../apache/olingo/odata2/core/edm/EdmImpl.java | 33 +-
.../apache/olingo/odata2/core/edm/EdmInt16.java | 37 +-
.../apache/olingo/odata2/core/edm/EdmInt32.java | 40 +-
.../apache/olingo/odata2/core/edm/EdmInt64.java | 43 +-
.../apache/olingo/odata2/core/edm/EdmNull.java | 34 +-
.../apache/olingo/odata2/core/edm/EdmSByte.java | 34 +-
.../core/edm/EdmSimpleTypeFacadeImpl.java | 33 +-
.../olingo/odata2/core/edm/EdmSingle.java | 43 +-
.../olingo/odata2/core/edm/EdmString.java | 34 +-
.../apache/olingo/odata2/core/edm/EdmTime.java | 34 +-
.../apache/olingo/odata2/core/edm/Uint7.java | 34 +-
.../edm/provider/EdmAnnotationsImplProv.java | 29 +-
.../edm/provider/EdmAssociationEndImplProv.java | 26 +-
.../edm/provider/EdmAssociationImplProv.java | 29 +-
.../provider/EdmAssociationSetEndImplProv.java | 26 +-
.../edm/provider/EdmAssociationSetImplProv.java | 32 +-
.../provider/EdmComplexPropertyImplProv.java | 26 +-
.../edm/provider/EdmComplexTypeImplProv.java | 29 +-
.../core/edm/provider/EdmElementImplProv.java | 32 +-
.../provider/EdmEntityContainerImplProv.java | 42 +-
.../core/edm/provider/EdmEntitySetImplProv.java | 32 +-
.../edm/provider/EdmEntitySetInfoImplProv.java | 29 +-
.../edm/provider/EdmEntityTypeImplProv.java | 31 +-
.../edm/provider/EdmFunctionImportImplProv.java | 29 +-
.../odata2/core/edm/provider/EdmImplProv.java | 26 +-
.../core/edm/provider/EdmNamedImplProv.java | 26 +-
.../provider/EdmNavigationPropertyImplProv.java | 29 +-
.../core/edm/provider/EdmParameterImplProv.java | 29 +-
.../core/edm/provider/EdmPropertyImplProv.java | 29 +-
.../EdmReferentialConstraintImplProv.java | 10 +-
.../EdmReferentialConstraintRoleImplProv.java | 26 +-
.../provider/EdmServiceMetadataImplProv.java | 26 +-
.../edm/provider/EdmSimplePropertyImplProv.java | 26 +-
.../edm/provider/EdmStructuralTypeImplProv.java | 29 +-
.../core/edm/provider/EdmTypedImplProv.java | 29 +-
.../odata2/core/edm/provider/EdmxProvider.java | 38 +-
.../odata2/core/ep/AtomEntityProvider.java | 104 ++-
.../odata2/core/ep/BasicEntityProvider.java | 77 +-
.../core/ep/ContentTypeBasedEntityProvider.java | 56 +-
.../odata2/core/ep/JsonEntityProvider.java | 97 ++-
.../odata2/core/ep/ProviderFacadeImpl.java | 88 +-
.../aggregator/EntityComplexPropertyInfo.java | 32 +-
.../ep/aggregator/EntityInfoAggregator.java | 102 ++-
.../core/ep/aggregator/EntityPropertyInfo.java | 31 +-
.../core/ep/aggregator/EntityTypeMapping.java | 32 +-
.../ep/aggregator/NavigationPropertyInfo.java | 26 +-
.../consumer/AtomServiceDocumentConsumer.java | 108 ++-
.../core/ep/consumer/JsonEntityConsumer.java | 73 +-
.../core/ep/consumer/JsonEntryConsumer.java | 83 +-
.../core/ep/consumer/JsonFeedConsumer.java | 60 +-
.../core/ep/consumer/JsonLinkConsumer.java | 50 +-
.../core/ep/consumer/JsonPropertyConsumer.java | 81 +-
.../consumer/JsonServiceDocumentConsumer.java | 43 +-
.../core/ep/consumer/XmlEntityConsumer.java | 90 +-
.../core/ep/consumer/XmlEntryConsumer.java | 160 ++--
.../core/ep/consumer/XmlFeedConsumer.java | 56 +-
.../core/ep/consumer/XmlLinkConsumer.java | 46 +-
.../core/ep/consumer/XmlMetadataConsumer.java | 144 ++--
.../core/ep/consumer/XmlPropertyConsumer.java | 60 +-
.../odata2/core/ep/entry/EntryMetadataImpl.java | 29 +-
.../odata2/core/ep/entry/MediaMetadataImpl.java | 29 +-
.../odata2/core/ep/entry/ODataEntryImpl.java | 33 +-
.../odata2/core/ep/feed/FeedMetadataImpl.java | 26 +-
.../odata2/core/ep/feed/ODataFeedImpl.java | 26 +-
.../ep/producer/AtomEntryEntityProducer.java | 110 ++-
.../core/ep/producer/AtomFeedProducer.java | 58 +-
.../producer/AtomServiceDocumentProducer.java | 77 +-
.../producer/JsonCollectionEntityProducer.java | 43 +-
.../ep/producer/JsonEntryEntityProducer.java | 70 +-
.../ep/producer/JsonErrorDocumentProducer.java | 41 +-
.../ep/producer/JsonFeedEntityProducer.java | 34 +-
.../ep/producer/JsonLinkEntityProducer.java | 34 +-
.../ep/producer/JsonLinksEntityProducer.java | 37 +-
.../ep/producer/JsonPropertyEntityProducer.java | 56 +-
.../producer/JsonServiceDocumentProducer.java | 36 +-
.../core/ep/producer/TombstoneProducer.java | 55 +-
.../producer/XmlCollectionEntityProducer.java | 31 +-
.../ep/producer/XmlErrorDocumentProducer.java | 29 +-
.../core/ep/producer/XmlLinkEntityProducer.java | 31 +-
.../ep/producer/XmlLinksEntityProducer.java | 31 +-
.../core/ep/producer/XmlMetadataProducer.java | 202 +++--
.../ep/producer/XmlPropertyEntityProducer.java | 56 +-
.../odata2/core/ep/util/CircleStreamBuffer.java | 31 +-
.../olingo/odata2/core/ep/util/FormatJson.java | 28 +-
.../olingo/odata2/core/ep/util/FormatXml.java | 28 +-
.../odata2/core/ep/util/JsonStreamWriter.java | 28 +-
.../olingo/odata2/core/ep/util/JsonUtils.java | 42 +-
.../core/ep/util/XmlMetadataConstants.java | 28 +-
.../odata2/core/exception/MessageService.java | 29 +-
.../core/exception/ODataRuntimeException.java | 28 +-
.../processor/ODataSingleProcessorService.java | 39 +-
.../apache/olingo/odata2/core/rest/MERGE.java | 26 +-
.../core/rest/ODataExceptionMapperImpl.java | 50 +-
.../odata2/core/rest/ODataRedirectLocator.java | 26 +-
.../odata2/core/rest/ODataRootLocator.java | 49 +-
.../odata2/core/rest/ODataSubLocator.java | 32 +-
.../apache/olingo/odata2/core/rest/PATCH.java | 26 +-
.../olingo/odata2/core/rest/RestUtil.java | 45 +-
.../odata2/core/rest/SubLocatorParameter.java | 26 +-
.../odata2/core/rest/app/ODataApplication.java | 36 +-
.../odata2/core/rt/RuntimeDelegateImpl.java | 32 +-
.../odata2/core/servicedocument/AcceptImpl.java | 26 +-
.../core/servicedocument/AtomInfoImpl.java | 29 +-
.../core/servicedocument/CategoriesImpl.java | 26 +-
.../core/servicedocument/CategoryImpl.java | 26 +-
.../core/servicedocument/CollectionImpl.java | 26 +-
.../servicedocument/CommonAttributesImpl.java | 26 +-
.../servicedocument/ExtensionAttributeImpl.java | 26 +-
.../servicedocument/ExtensionElementImpl.java | 26 +-
.../servicedocument/ServiceDocumentImpl.java | 26 +-
.../odata2/core/servicedocument/TitleImpl.java | 26 +-
.../core/servicedocument/WorkspaceImpl.java | 26 +-
.../core/uri/ExpandSelectTreeCreator.java | 49 +-
.../core/uri/ExpandSelectTreeNodeImpl.java | 29 +-
.../odata2/core/uri/KeyPredicateImpl.java | 26 +-
.../core/uri/NavigationPropertySegmentImpl.java | 26 +-
.../odata2/core/uri/NavigationSegmentImpl.java | 26 +-
.../olingo/odata2/core/uri/SelectItemImpl.java | 26 +-
.../odata2/core/uri/SystemQueryOption.java | 26 +-
.../olingo/odata2/core/uri/UriInfoImpl.java | 26 +-
.../olingo/odata2/core/uri/UriParserImpl.java | 71 +-
.../apache/olingo/odata2/core/uri/UriType.java | 37 +-
.../uri/expression/ActualBinaryOperator.java | 26 +-
.../uri/expression/BinaryExpressionImpl.java | 29 +-
.../ExpressionParserInternalError.java | 55 +-
.../uri/expression/FilterExpressionImpl.java | 26 +-
.../core/uri/expression/FilterParser.java | 68 +-
.../expression/FilterParserExceptionImpl.java | 92 +-
.../core/uri/expression/FilterParserImpl.java | 523 +++++++-----
.../core/uri/expression/InfoBinaryOperator.java | 34 +-
.../odata2/core/uri/expression/InfoMethod.java | 39 +-
.../core/uri/expression/InfoUnaryOperator.java | 71 +-
.../core/uri/expression/InputTypeValidator.java | 36 +-
.../odata2/core/uri/expression/JsonVisitor.java | 76 +-
.../uri/expression/LiteralExpressionImpl.java | 26 +-
.../uri/expression/MemberExpressionImpl.java | 26 +-
.../uri/expression/MethodExpressionImpl.java | 28 +-
.../uri/expression/OrderByExpressionImpl.java | 26 +-
.../core/uri/expression/OrderByParser.java | 69 +-
.../core/uri/expression/OrderByParserImpl.java | 37 +-
.../uri/expression/OrderExpressionImpl.java | 26 +-
.../core/uri/expression/ParameterSet.java | 68 +-
.../uri/expression/ParameterSetCombination.java | 39 +-
.../uri/expression/PropertyExpressionImpl.java | 28 +-
.../odata2/core/uri/expression/Token.java | 28 +-
.../odata2/core/uri/expression/TokenKind.java | 36 +-
.../odata2/core/uri/expression/TokenList.java | 40 +-
.../odata2/core/uri/expression/Tokenizer.java | 62 +-
.../core/uri/expression/TokenizerException.java | 65 +-
.../uri/expression/TokenizerExpectError.java | 50 +-
.../uri/expression/TokenizerRTException.java | 28 +-
.../uri/expression/UnaryExpressionImpl.java | 26 +-
.../odata2/core/ContentNegotiatorTest.java | 55 +-
.../olingo/odata2/core/DispatcherTest.java | 82 +-
.../odata2/core/ODataContextImplTest.java | 26 +-
.../odata2/core/ODataExceptionWrapperTest.java | 32 +-
.../core/ODataRequestHandlerValidationTest.java | 212 +++--
.../olingo/odata2/core/ODataResponseTest.java | 26 +-
.../olingo/odata2/core/PathSegmentTest.java | 26 +-
.../odata2/core/batch/AcceptParserTest.java | 32 +-
.../core/batch/BatchRequestParserTest.java | 79 +-
.../core/batch/BatchRequestWriterTest.java | 26 +-
.../core/batch/BatchResponseParserTest.java | 28 +-
.../core/batch/BatchResponseWriterTest.java | 29 +-
.../odata2/core/commons/ContentTypeTest.java | 82 +-
.../olingo/odata2/core/commons/DecoderTest.java | 26 +-
.../olingo/odata2/core/commons/EncoderTest.java | 28 +-
.../odata2/core/debug/DebugInfoBodyTest.java | 26 +-
.../debug/ODataDebugResponseWrapperTest.java | 106 ++-
.../olingo/odata2/core/edm/EdmImplTest.java | 26 +-
.../core/edm/EdmSimpleTypeFacadeTest.java | 48 +-
.../odata2/core/edm/EdmSimpleTypeTest.java | 850 ++++++++++++-------
.../provider/EdmAnnotationsImplProvTest.java | 36 +-
.../provider/EdmAssociationEndImplProvTest.java | 30 +-
.../provider/EdmAssociationImplProvTest.java | 37 +-
.../EdmAssociationSetEndImplProvTest.java | 35 +-
.../provider/EdmAssociationSetImplProvTest.java | 37 +-
.../provider/EdmComplexTypeImplProvTest.java | 26 +-
.../EdmEntityContainerImplProvTest.java | 29 +-
.../provider/EdmEntitySetInfoImplProvTest.java | 26 +-
.../core/edm/provider/EdmEntitySetProvTest.java | 37 +-
.../edm/provider/EdmEntityTypeImplProvTest.java | 29 +-
.../provider/EdmFunctionImportImplProvTest.java | 40 +-
.../core/edm/provider/EdmImplProvTest.java | 26 +-
.../core/edm/provider/EdmMappingTest.java | 39 +-
.../core/edm/provider/EdmNamedImplProvTest.java | 26 +-
.../EdmNavigationPropertyImplProvTest.java | 33 +-
.../edm/provider/EdmPropertyImplProvTest.java | 38 +-
.../EdmReferentialConstraintImplProvTest.java | 26 +-
...dmReferentialConstraintRoleImplProvTest.java | 26 +-
.../EdmServiceMetadataImplProvTest.java | 102 ++-
.../core/edm/provider/EdmxProviderTest.java | 32 +-
.../odata2/core/ep/AbstractProviderTest.java | 38 +-
.../core/ep/AbstractXmlProducerTestHelper.java | 38 +-
.../odata2/core/ep/BasicProviderTest.java | 102 ++-
.../odata2/core/ep/LoadXMLFactoryTest.java | 30 +-
.../ep/ODataEntityProviderPropertiesTest.java | 26 +-
.../olingo/odata2/core/ep/PerformanceTest.java | 32 +-
.../odata2/core/ep/ProviderFacadeImplTest.java | 96 ++-
.../ep/aggregator/EntityInfoAggregatorTest.java | 26 +-
.../core/ep/consumer/AbstractConsumerTest.java | 49 +-
.../AtomServiceDocumentConsumerTest.java | 29 +-
.../core/ep/consumer/JsonEntryConsumerTest.java | 37 +-
.../consumer/JsonEntryDeepInsertEntryTest.java | 43 +-
.../consumer/JsonEntryDeepInsertFeedTest.java | 41 +-
.../core/ep/consumer/JsonFeedConsumerTest.java | 50 +-
.../core/ep/consumer/JsonLinkConsumerTest.java | 26 +-
.../ep/consumer/JsonPropertyConsumerTest.java | 206 +++--
.../JsonServiceDocumentConsumerTest.java | 26 +-
.../consumer/ServiceDocumentConsumerTest.java | 26 +-
.../core/ep/consumer/XmlEntityConsumerTest.java | 677 ++++++++++-----
.../core/ep/consumer/XmlFeedConsumerTest.java | 28 +-
.../core/ep/consumer/XmlLinkConsumerTest.java | 33 +-
.../ep/consumer/XmlMetadataConsumerTest.java | 620 ++++++++++++--
.../ep/consumer/XmlPropertyConsumerTest.java | 104 ++-
.../core/ep/producer/AtomEntryProducerTest.java | 203 +++--
.../core/ep/producer/AtomFeedProducerTest.java | 50 +-
.../AtomServiceDocumentProducerTest.java | 62 +-
.../producer/JsonEntryEntityProducerTest.java | 106 ++-
.../core/ep/producer/JsonErrorProducerTest.java | 33 +-
.../ep/producer/JsonFeedEntityProducerTest.java | 26 +-
.../ep/producer/JsonFunctionImportTest.java | 47 +-
.../ep/producer/JsonLinkEntityProducerTest.java | 26 +-
.../producer/JsonLinksEntityProducerTest.java | 26 +-
.../ep/producer/JsonPropertyProducerTest.java | 62 +-
.../JsonServiceDocumentProducerTest.java | 26 +-
.../odata2/core/ep/producer/MyCallback.java | 44 +-
.../producer/ServiceDocumentProducerTest.java | 29 +-
.../core/ep/producer/TombstoneCallbackImpl.java | 26 +-
.../core/ep/producer/TombstoneProducerTest.java | 88 +-
.../core/ep/producer/XmlErrorProducerTest.java | 36 +-
.../core/ep/producer/XmlExpandProducerTest.java | 163 ++--
.../XmlFeedWithTombstonesProducerTest.java | 53 +-
.../core/ep/producer/XmlFunctionImportTest.java | 59 +-
.../ep/producer/XmlLinkEntityProducerTest.java | 26 +-
.../ep/producer/XmlLinksEntityProducerTest.java | 26 +-
.../ep/producer/XmlMetadataProducerTest.java | 116 ++-
.../ep/producer/XmlPropertyProducerTest.java | 43 +-
.../core/ep/producer/XmlSelectProducerTest.java | 104 ++-
.../core/ep/util/CircleStreamBufferTest.java | 26 +-
.../core/ep/util/JsonStreamWriterTest.java | 26 +-
.../core/exception/MessageReferenceTest.java | 29 +-
.../core/exception/MessageServiceTest.java | 52 +-
.../core/exception/ODataExceptionTest.java | 33 +-
.../exception/ODataMessageTextVerifierTest.java | 40 +-
.../ODataSingleProcessorServiceTest.java | 29 +-
.../rest/ODataErrorHandlerCallbackImpl.java | 29 +-
.../core/rest/ODataExceptionMapperImplTest.java | 73 +-
.../core/rest/ODataServiceFactoryImpl.java | 26 +-
.../odata2/core/rt/RuntimeDelegateTest.java | 26 +-
.../uri/ExpandSelectTreeCreatorImplTest.java | 280 +++---
.../odata2/core/uri/QueryOptionsEnumTest.java | 26 +-
.../olingo/odata2/core/uri/UriInfoTest.java | 36 +-
.../odata2/core/uri/UriParserFacadeTest.java | 26 +-
.../olingo/odata2/core/uri/UriParserTest.java | 63 +-
.../uri/expression/FilterParserImplTool.java | 57 +-
.../core/uri/expression/FilterToJsonTest.java | 38 +-
.../odata2/core/uri/expression/ParserTool.java | 57 +-
.../uri/expression/TestAbapCompatibility.java | 391 +++++----
.../odata2/core/uri/expression/TestBase.java | 26 +-
.../core/uri/expression/TestExceptionTexts.java | 26 +-
.../odata2/core/uri/expression/TestParser.java | 69 +-
.../uri/expression/TestParserExceptions.java | 581 ++++++++-----
.../odata2/core/uri/expression/TestSpec.java | 117 +--
.../core/uri/expression/TestTokenizer.java | 77 +-
.../odata2/core/uri/expression/TokenTool.java | 38 +-
.../odata2/core/uri/expression/VisitorTool.java | 41 +-
310 files changed, 10384 insertions(+), 7416 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
index 8994d57..824cf83 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -28,7 +28,6 @@ import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.exception.ODataNotAcceptableException;
import org.apache.olingo.odata2.api.processor.ODataRequest;
-import org.apache.olingo.odata2.api.uri.UriInfo;
import org.apache.olingo.odata2.core.commons.ContentType;
import org.apache.olingo.odata2.core.uri.UriInfoImpl;
import org.apache.olingo.odata2.core.uri.UriType;
@@ -41,53 +40,59 @@ public class ContentNegotiator {
private static final String URI_INFO_FORMAT_ATOM = "atom";
private static final String URI_INFO_FORMAT_XML = "xml";
static final String DEFAULT_CHARSET = "utf-8";
-
+
/**
- * Do the content negotiation for <code>accept header value</code> based on
- * requested content type (in HTTP accept header from {@link ODataRequest})
- * in combination with uri information from {@link UriInfo}
- * and from given supported content types (via <code>supportedContentTypes</code>).
+ * Do the content negotiation for <code>accept header value</code> based on
+ * requested content type (in HTTP accept header from {@link ODataRequest})
+ * in combination with uri information from {@link org.apache.olingo.odata2.api.uri.UriInfo} and from given supported
+ * content types (via
+ * <code>supportedContentTypes</code>).
*
* @param request specific request
* @param uriInfo specific uri information
* @param supportedContentTypes list of supported content types
- * @return best fitting content type or <code>NULL</code> if content type is not set and for given {@link UriInfo} is ignored
+ * @return best fitting content type or <code>NULL</code> if content type is not set and for given
+ * {@link org.apache.olingo.odata2.api.uri.UriInfo} is
+ * ignored
* @throws ODataException if no supported content type was found
* @throws IllegalArgumentException if one of the input parameter is <code>NULL</code>
*/
- public ContentType doContentNegotiation(ODataRequest odataRequest, UriInfoImpl uriInfo, List<String> supportedContentTypes) throws ODataException {
+ public ContentType doContentNegotiation(final ODataRequest odataRequest, final UriInfoImpl uriInfo,
+ final List<String> supportedContentTypes) throws ODataException {
validateNotNull(odataRequest, uriInfo, supportedContentTypes);
- if(uriInfo.isCount()) {
+ if (uriInfo.isCount()) {
return ContentType.TEXT_PLAIN_CS_UTF_8;
- } else if(uriInfo.isValue()) {
- if(uriInfo.getUriType() == UriType.URI5 || uriInfo.getUriType() == UriType.URI4) {
- return ContentType.TEXT_PLAIN_CS_UTF_8;
+ } else if (uriInfo.isValue()) {
+ if (uriInfo.getUriType() == UriType.URI5 || uriInfo.getUriType() == UriType.URI4) {
+ return ContentType.TEXT_PLAIN_CS_UTF_8;
}
return doContentNegotiationForAcceptHeader(Arrays.asList("*/*"), ContentType.create(supportedContentTypes));
- }
-
+ }
+
if (uriInfo.getFormat() == null) {
- return doContentNegotiationForAcceptHeader(odataRequest.getAcceptHeaders(), ContentType.create(supportedContentTypes));
+ return doContentNegotiationForAcceptHeader(odataRequest.getAcceptHeaders(), ContentType
+ .create(supportedContentTypes));
} else {
return doContentNegotiationForFormat(uriInfo, ContentType.createAsCustom(supportedContentTypes));
}
}
- private void validateNotNull(ODataRequest odataRequest, UriInfoImpl uriInfo, List<String> supportedContentTypes) {
- if(uriInfo == null) {
+ private void validateNotNull(final ODataRequest odataRequest, final UriInfoImpl uriInfo,
+ final List<String> supportedContentTypes) {
+ if (uriInfo == null) {
throw new IllegalArgumentException("Parameter uriInfo MUST NOT be null.");
}
- if(odataRequest == null) {
+ if (odataRequest == null) {
throw new IllegalArgumentException("Parameter odataRequest MUST NOT be null.");
}
- if(supportedContentTypes == null) {
+ if (supportedContentTypes == null) {
throw new IllegalArgumentException("Parameter supportedContentTypes MUST NOT be null.");
}
}
-
- private ContentType doContentNegotiationForFormat(final UriInfoImpl uriInfo, final List<ContentType> supportedContentTypes) throws ODataException {
+ private ContentType doContentNegotiationForFormat(final UriInfoImpl uriInfo,
+ final List<ContentType> supportedContentTypes) throws ODataException {
validateFormatQuery(uriInfo);
ContentType formatContentType = mapFormat(uriInfo);
formatContentType = ensureCharset(formatContentType);
@@ -98,7 +103,8 @@ public class ContentNegotiator {
}
}
- throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_CONTENT_TYPE.addContent(uriInfo.getFormat()));
+ throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_CONTENT_TYPE.addContent(uriInfo
+ .getFormat()));
}
/**
@@ -122,9 +128,9 @@ public class ContentNegotiator {
if (uriInfo.getUriType() == UriType.URI0) {
// special handling for serviceDocument uris (UriType.URI0)
return ContentType.APPLICATION_ATOM_SVC;
- } else if(uriInfo.getUriType() == UriType.URI1) {
- return ContentType.APPLICATION_ATOM_XML_FEED;
- } else if(uriInfo.getUriType()==UriType.URI2) {
+ } else if (uriInfo.getUriType() == UriType.URI1) {
+ return ContentType.APPLICATION_ATOM_XML_FEED;
+ } else if (uriInfo.getUriType() == UriType.URI2) {
return ContentType.APPLICATION_ATOM_XML_ENTRY;
}
} else if (URI_INFO_FORMAT_JSON.equals(format)) {
@@ -134,11 +140,13 @@ public class ContentNegotiator {
return ContentType.createAsCustom(format);
}
- private ContentType doContentNegotiationForAcceptHeader(final List<String> acceptHeaderContentTypes, final List<ContentType> supportedContentTypes) throws ODataException {
+ private ContentType doContentNegotiationForAcceptHeader(final List<String> acceptHeaderContentTypes,
+ final List<ContentType> supportedContentTypes) throws ODataException {
return contentNegotiation(extractAcceptHeaders(acceptHeaderContentTypes), supportedContentTypes);
}
- private List<ContentType> extractAcceptHeaders(final List<String> acceptHeaderValues) throws ODataBadRequestException {
+ private List<ContentType> extractAcceptHeaders(final List<String> acceptHeaderValues)
+ throws ODataBadRequestException {
final List<ContentType> mediaTypes = new ArrayList<ContentType>();
if (acceptHeaderValues != null) {
for (final String mediaType : acceptHeaderValues) {
@@ -154,7 +162,8 @@ public class ContentNegotiator {
return mediaTypes;
}
- ContentType contentNegotiation(final List<ContentType> acceptedContentTypes, final List<ContentType> supportedContentTypes) throws ODataException {
+ ContentType contentNegotiation(final List<ContentType> acceptedContentTypes,
+ final List<ContentType> supportedContentTypes) throws ODataException {
final Set<ContentType> setSupported = new HashSet<ContentType>(supportedContentTypes);
if (acceptedContentTypes.isEmpty()) {
@@ -171,12 +180,13 @@ public class ContentNegotiator {
}
}
- throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_ACCEPT_HEADER.addContent(acceptedContentTypes.toString()));
+ throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_ACCEPT_HEADER
+ .addContent(acceptedContentTypes.toString()));
}
- private ContentType ensureCharset(ContentType contentType) {
- if(ContentType.APPLICATION_ATOM_XML.isCompatible(contentType)
- || ContentType.APPLICATION_ATOM_SVC.isCompatible(contentType)
+ private ContentType ensureCharset(final ContentType contentType) {
+ if (ContentType.APPLICATION_ATOM_XML.isCompatible(contentType)
+ || ContentType.APPLICATION_ATOM_SVC.isCompatible(contentType)
|| ContentType.APPLICATION_XML.isCompatible(contentType)) {
return contentType.receiveWithCharsetParameter(DEFAULT_CHARSET);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
index f0db8af..5809bfd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.core.uri.UriInfoImpl;
/**
* Request dispatching according to URI type and HTTP method.
- *
+ *
*/
public class Dispatcher {
@@ -60,7 +60,8 @@ public class Dispatcher {
this.serviceFactory = serviceFactory;
}
- public ODataResponse dispatch(final ODataHttpMethod method, final UriInfoImpl uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse dispatch(final ODataHttpMethod method, final UriInfoImpl uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
switch (uriInfo.getUriType()) {
case URI0:
if (method == ODataHttpMethod.GET) {
@@ -100,10 +101,12 @@ public class Dispatcher {
case GET:
return service.getEntityComplexPropertyProcessor().readEntityComplexProperty(uriInfo, contentType);
case PUT:
- return service.getEntityComplexPropertyProcessor().updateEntityComplexProperty(uriInfo, content, requestContentType, false, contentType);
+ return service.getEntityComplexPropertyProcessor().updateEntityComplexProperty(uriInfo, content,
+ requestContentType, false, contentType);
case PATCH:
case MERGE:
- return service.getEntityComplexPropertyProcessor().updateEntityComplexProperty(uriInfo, content, requestContentType, true, contentType);
+ return service.getEntityComplexPropertyProcessor().updateEntityComplexProperty(uriInfo, content,
+ requestContentType, true, contentType);
default:
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
@@ -121,9 +124,11 @@ public class Dispatcher {
case PATCH:
case MERGE:
if (uriInfo.isValue()) {
- return service.getEntitySimplePropertyValueProcessor().updateEntitySimplePropertyValue(uriInfo, content, requestContentType, contentType);
+ return service.getEntitySimplePropertyValueProcessor().updateEntitySimplePropertyValue(uriInfo, content,
+ requestContentType, contentType);
} else {
- return service.getEntitySimplePropertyProcessor().updateEntitySimpleProperty(uriInfo, content, requestContentType, contentType);
+ return service.getEntitySimplePropertyProcessor().updateEntitySimpleProperty(uriInfo, content,
+ requestContentType, contentType);
}
case DELETE:
if (uriInfo.isValue()) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
index a820742..aba98ee 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -219,7 +219,8 @@ public class ODataContextImpl implements ODataContext {
@Override
public String toString() {
- return className + "." + methodName + ": duration: " + (timeStopped - timeStarted) + ", memory: " + (memoryStopped - memoryStarted);
+ return className + "." + methodName + ": duration: " + (timeStopped - timeStarted) + ", memory: "
+ + (memoryStopped - memoryStarted);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
index 38abe1d..4d4fad8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -70,7 +70,8 @@ public class ODataExceptionWrapper {
private final ODataErrorContext errorContext = new ODataErrorContext();
private final URI requestUri;
- public ODataExceptionWrapper(final ODataContext context, final Map<String, String> queryParameters, final List<String> acceptHeaderContentTypes) {
+ public ODataExceptionWrapper(final ODataContext context, final Map<String, String> queryParameters,
+ final List<String> acceptHeaderContentTypes) {
contentType = getContentType(queryParameters, acceptHeaderContentTypes).toContentTypeString();
messageLocale = MessageService.getSupportedLocale(getLanguages(context), DEFAULT_RESPONSE_LOCALE);
httpRequestHeaders = context.getRequestHeaders();
@@ -83,7 +84,8 @@ public class ODataExceptionWrapper {
}
}
- public ODataExceptionWrapper(final UriInfo uriInfo, final HttpHeaders httpHeaders, final ServletConfig servletConfig, final HttpServletRequest servletRequest) {
+ public ODataExceptionWrapper(final UriInfo uriInfo, final HttpHeaders httpHeaders, final ServletConfig servletConfig,
+ final HttpServletRequest servletRequest) {
contentType = getContentType(uriInfo, httpHeaders).toContentTypeString();
messageLocale = MessageService.getSupportedLocale(getLanguages(httpHeaders), DEFAULT_RESPONSE_LOCALE);
httpRequestHeaders = httpHeaders.getRequestHeaders();
@@ -111,7 +113,7 @@ public class ODataExceptionWrapper {
} else {
oDataResponse = EntityProvider.writeErrorDocument(errorContext);
}
- if(!oDataResponse.containsHeader(org.apache.olingo.odata2.api.commons.HttpHeaders.CONTENT_TYPE)) {
+ if (!oDataResponse.containsHeader(org.apache.olingo.odata2.api.commons.HttpHeaders.CONTENT_TYPE)) {
oDataResponse = ODataResponse.fromResponse(oDataResponse).contentHeader(contentType).build();
}
return oDataResponse;
@@ -231,7 +233,8 @@ public class ODataExceptionWrapper {
}
}
- private ContentType getContentType(final Map<String, String> queryParameters, final List<String> acceptHeaderContentTypes) {
+ private ContentType getContentType(final Map<String, String> queryParameters,
+ final List<String> acceptHeaderContentTypes) {
ContentType contentType = getContentTypeByUriInfo(queryParameters);
if (contentType == null) {
contentType = getContentTypeByAcceptHeader(acceptHeaderContentTypes);
@@ -247,8 +250,9 @@ public class ODataExceptionWrapper {
if (DOLLAR_FORMAT_JSON.equals(contentTypeString)) {
contentType = ContentType.APPLICATION_JSON;
} else {
- //Any format mentioned in the $format parameter other than json results in an application/xml content type for error messages
- //due to the OData V2 Specification
+ // Any format mentioned in the $format parameter other than json results in an application/xml content type
+ // for error messages
+ // due to the OData V2 Specification
contentType = ContentType.APPLICATION_XML;
}
}
@@ -261,10 +265,13 @@ public class ODataExceptionWrapper {
if (ContentType.isParseable(acceptContentType)) {
ContentType convertedContentType = ContentType.create(acceptContentType);
if (convertedContentType.isWildcard()
- || ContentType.APPLICATION_XML.equals(convertedContentType) || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
- || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType) || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
+ || ContentType.APPLICATION_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_XML;
- } else if (ContentType.APPLICATION_JSON.equals(convertedContentType) || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
+ } else if (ContentType.APPLICATION_JSON.equals(convertedContentType)
+ || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_JSON;
}
}
@@ -289,8 +296,8 @@ public class ODataExceptionWrapper {
if (DOLLAR_FORMAT_JSON.equals(contentTypeString)) {
contentType = ContentType.APPLICATION_JSON;
} else {
- //Any format mentioned in the $format parameter other than json results in an application/xml content type
- //for error messages due to the OData V2 Specification.
+ // Any format mentioned in the $format parameter other than json results in an application/xml content type
+ // for error messages due to the OData V2 Specification.
contentType = ContentType.APPLICATION_XML;
}
}
@@ -303,10 +310,13 @@ public class ODataExceptionWrapper {
if (ContentType.isParseable(type.toString())) {
ContentType convertedContentType = ContentType.create(type.toString());
if (convertedContentType.isWildcard()
- || ContentType.APPLICATION_XML.equals(convertedContentType) || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
- || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType) || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
+ || ContentType.APPLICATION_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_XML;
- } else if (ContentType.APPLICATION_JSON.equals(convertedContentType) || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
+ } else if (ContentType.APPLICATION_JSON.equals(convertedContentType)
+ || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_JSON;
}
}
@@ -314,14 +324,17 @@ public class ODataExceptionWrapper {
return ContentType.APPLICATION_XML;
}
- private ODataErrorCallback getErrorHandlerCallbackFromContext(final ODataContext context) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+ private ODataErrorCallback getErrorHandlerCallbackFromContext(final ODataContext context)
+ throws ClassNotFoundException, InstantiationException, IllegalAccessException {
ODataErrorCallback callback = null;
ODataServiceFactory serviceFactory = context.getServiceFactory();
callback = serviceFactory.getCallback(ODataErrorCallback.class);
return callback;
}
- private ODataErrorCallback getErrorHandlerCallbackFromServletConfig(final ServletConfig servletConfig, final HttpServletRequest servletRequest) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+ private ODataErrorCallback getErrorHandlerCallbackFromServletConfig(final ServletConfig servletConfig,
+ final HttpServletRequest servletRequest) throws InstantiationException, IllegalAccessException,
+ ClassNotFoundException {
ODataErrorCallback callback = null;
final String factoryClassName = servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL);
if (factoryClassName != null) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
index 48948ac..94de51d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
index 9d02912..d9dc33a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -69,7 +69,8 @@ public class ODataRequestHandler {
private final ODataService service;
private final ODataContext context;
- public ODataRequestHandler(final ODataServiceFactory factory, final ODataService service, final ODataContext context) {
+ public ODataRequestHandler(final ODataServiceFactory factory, final ODataService service,
+ final ODataContext context) {
serviceFactory = factory;
this.service = service;
this.context = context;
@@ -103,44 +104,52 @@ public class ODataRequestHandler {
final ODataHttpMethod method = request.getMethod();
validateMethodAndUri(method, uriInfo);
- if (method == ODataHttpMethod.POST || method == ODataHttpMethod.PUT || method == ODataHttpMethod.PATCH || method == ODataHttpMethod.MERGE) {
+ if (method == ODataHttpMethod.POST || method == ODataHttpMethod.PUT || method == ODataHttpMethod.PATCH
+ || method == ODataHttpMethod.MERGE) {
checkRequestContentType(uriInfo, request.getContentType());
}
List<String> supportedContentTypes = getSupportedContentTypes(uriInfo, method);
- ContentType acceptContentType = new ContentNegotiator().doContentNegotiation(request, uriInfo, supportedContentTypes);
+ ContentType acceptContentType =
+ new ContentNegotiator().doContentNegotiation(request, uriInfo, supportedContentTypes);
timingHandle2 = context.startRuntimeMeasurement("Dispatcher", "dispatch");
- odataResponse = dispatcher.dispatch(method, uriInfo, request.getBody(), request.getContentType(), acceptContentType.toContentTypeString());
+ odataResponse =
+ dispatcher.dispatch(method, uriInfo, request.getBody(), request.getContentType(), acceptContentType
+ .toContentTypeString());
context.stopRuntimeMeasurement(timingHandle2);
-
ODataResponseBuilder extendedResponse = ODataResponse.fromResponse(odataResponse);
final UriType uriType = uriInfo.getUriType();
- final String location = (method == ODataHttpMethod.POST && (uriType == UriType.URI1 || uriType == UriType.URI6B)) ? odataResponse.getIdLiteral() : null;
+ final String location =
+ (method == ODataHttpMethod.POST && (uriType == UriType.URI1 || uriType == UriType.URI6B)) ? odataResponse
+ .getIdLiteral() : null;
final HttpStatusCodes s = getStatusCode(odataResponse, method, uriType);
extendedResponse = extendedResponse.idLiteral(location).status(s);
-
+
if (!odataResponse.containsHeader(ODataHttpHeaders.DATASERVICEVERSION)) {
extendedResponse = extendedResponse.header(ODataHttpHeaders.DATASERVICEVERSION, serverDataServiceVersion);
}
- if(!HttpStatusCodes.NO_CONTENT.equals(s) && !odataResponse.containsHeader(HttpHeaders.CONTENT_TYPE)) {
+ if (!HttpStatusCodes.NO_CONTENT.equals(s) && !odataResponse.containsHeader(HttpHeaders.CONTENT_TYPE)) {
extendedResponse.header(HttpHeaders.CONTENT_TYPE, acceptContentType.toContentTypeString());
}
-
-
+
odataResponse = extendedResponse.build();
} catch (final Exception e) {
exception = e;
- odataResponse = new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders()).wrapInExceptionResponse(e);
+ odataResponse =
+ new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders())
+ .wrapInExceptionResponse(e);
}
context.stopRuntimeMeasurement(timingHandle);
final String debugValue = getDebugValue(context, request.getQueryParameters());
- return debugValue == null ? odataResponse : new ODataDebugResponseWrapper(context, odataResponse, uriInfo, exception, debugValue).wrapResponse();
+ return debugValue == null ? odataResponse : new ODataDebugResponseWrapper(context, odataResponse, uriInfo,
+ exception, debugValue).wrapResponse();
}
- private HttpStatusCodes getStatusCode(ODataResponse odataResponse, final ODataHttpMethod method, final UriType uriType) {
+ private HttpStatusCodes getStatusCode(final ODataResponse odataResponse, final ODataHttpMethod method,
+ final UriType uriType) {
if (odataResponse.getStatus() == null) {
if (method == ODataHttpMethod.POST) {
if (uriType == UriType.URI9) {
@@ -159,25 +168,29 @@ public class ODataRequestHandler {
}
return odataResponse.getStatus();
}
-
+
private String getServerDataServiceVersion() throws ODataException {
return service.getVersion() == null ? ODataServiceVersion.V20 : service.getVersion();
}
- private static void validateDataServiceVersion(final String serverDataServiceVersion, final String requestDataServiceVersion) throws ODataException {
+ private static void validateDataServiceVersion(final String serverDataServiceVersion,
+ final String requestDataServiceVersion) throws ODataException {
if (requestDataServiceVersion != null) {
try {
final boolean isValid = ODataServiceVersion.validateDataServiceVersion(requestDataServiceVersion);
if (!isValid || ODataServiceVersion.isBiggerThan(requestDataServiceVersion, serverDataServiceVersion)) {
- throw new ODataBadRequestException(ODataBadRequestException.VERSIONERROR.addContent(requestDataServiceVersion.toString()));
+ throw new ODataBadRequestException(ODataBadRequestException.VERSIONERROR.addContent(requestDataServiceVersion
+ .toString()));
}
} catch (final IllegalArgumentException e) {
- throw new ODataBadRequestException(ODataBadRequestException.PARSEVERSIONERROR.addContent(requestDataServiceVersion), e);
+ throw new ODataBadRequestException(ODataBadRequestException.PARSEVERSIONERROR
+ .addContent(requestDataServiceVersion), e);
}
}
}
- private static void validateMethodAndUri(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
+ private static void validateMethodAndUri(final ODataHttpMethod method, final UriInfoImpl uriInfo)
+ throws ODataException {
validateUriMethod(method, uriInfo);
checkFunctionImport(method, uriInfo);
if (method != ODataHttpMethod.GET) {
@@ -211,20 +224,23 @@ public class ODataRequestHandler {
case URI2:
case URI6A:
case URI7A:
- if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+ if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE
+ && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
break;
case URI3:
- if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+ if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.PATCH
+ && method != ODataHttpMethod.MERGE) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
break;
case URI4:
case URI5:
- if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+ if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE
+ && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
} else if (method == ODataHttpMethod.DELETE && !uriInfo.isValue()) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
@@ -248,7 +264,7 @@ public class ODataRequestHandler {
if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
} else {
- if(uriInfo.getFormat() != null) {
+ if (uriInfo.getFormat() != null) {
// throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
throw new ODataBadRequestException(ODataBadRequestException.INVALID_SYNTAX);
}
@@ -260,17 +276,22 @@ public class ODataRequestHandler {
}
}
- private static void checkFunctionImport(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
- if (uriInfo.getFunctionImport() != null && uriInfo.getFunctionImport().getHttpMethod() != null && !uriInfo.getFunctionImport().getHttpMethod().equals(method.toString())) {
+ private static void checkFunctionImport(final ODataHttpMethod method, final UriInfoImpl uriInfo)
+ throws ODataException {
+ if (uriInfo.getFunctionImport() != null && uriInfo.getFunctionImport().getHttpMethod() != null
+ && !uriInfo.getFunctionImport().getHttpMethod().equals(method.toString())) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
}
- private static void checkNotGetSystemQueryOptions(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
+ private static void checkNotGetSystemQueryOptions(final ODataHttpMethod method, final UriInfoImpl uriInfo)
+ throws ODataException {
switch (uriInfo.getUriType()) {
case URI1:
case URI6B:
- if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null || uriInfo.getTop() != null || !uriInfo.getExpand().isEmpty() || !uriInfo.getSelect().isEmpty()) {
+ if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null
+ || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null
+ || uriInfo.getTop() != null || !uriInfo.getExpand().isEmpty() || !uriInfo.getSelect().isEmpty()) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
break;
@@ -308,7 +329,9 @@ public class ODataRequestHandler {
break;
case URI7B:
- if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null || uriInfo.getTop() != null) {
+ if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null
+ || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null
+ || uriInfo.getTop() != null) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
break;
@@ -350,7 +373,8 @@ public class ODataRequestHandler {
}
private static void checkProperty(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
- if ((uriInfo.getUriType() == UriType.URI4 || uriInfo.getUriType() == UriType.URI5) && (isPropertyKey(uriInfo) || method == ODataHttpMethod.DELETE && !isPropertyNullable(getProperty(uriInfo)))) {
+ if ((uriInfo.getUriType() == UriType.URI4 || uriInfo.getUriType() == UriType.URI5)
+ && (isPropertyKey(uriInfo) || method == ODataHttpMethod.DELETE && !isPropertyNullable(getProperty(uriInfo)))) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
}
@@ -370,13 +394,13 @@ public class ODataRequestHandler {
/**
* <p>Checks if <code>content type</code> is a valid request content type for the given {@link UriInfoImpl}.</p>
- * <p>If the combination of <code>content type</code> and {@link UriInfoImpl}
- * is not valid, an {@link ODataUnsupportedMediaTypeException} is thrown.</p>
+ * <p>If the combination of <code>content type</code> and {@link UriInfoImpl} is not valid, an
+ * {@link ODataUnsupportedMediaTypeException} is thrown.</p>
* @param uriInfo information about request URI
* @param contentType request content type
* @throws ODataException in the case of an error during {@link UriInfoImpl} access;
- * if the combination of <code>content type</code> and {@link UriInfoImpl}
- * is invalid, as {@link ODataUnsupportedMediaTypeException}
+ * if the combination of <code>content type</code> and {@link UriInfoImpl} is invalid, as
+ * {@link ODataUnsupportedMediaTypeException}
*/
private void checkRequestContentType(final UriInfoImpl uriInfo, final String contentType) throws ODataException {
Class<? extends ODataProcessor> processorFeature = Dispatcher.mapUriTypeToProcessorFeature(uriInfo);
@@ -389,7 +413,7 @@ public class ODataRequestHandler {
// Adjust processor feature.
if (processorFeature == EntitySetProcessor.class) {
- processorFeature = uriInfo.getTargetEntitySet().getEntityType().hasStream() ? EntityMediaProcessor.class : // A media resource can have any type.
+ processorFeature = uriInfo.getTargetEntitySet().getEntityType().hasStream() ? EntityMediaProcessor.class :
EntityProcessor.class; // The request must contain a single entity!
} else if (processorFeature == EntityLinksProcessor.class) {
processorFeature = EntityLinkProcessor.class; // The request must contain a single link!
@@ -397,25 +421,30 @@ public class ODataRequestHandler {
final ContentType parsedContentType = ContentType.parse(contentType);
if (parsedContentType == null || parsedContentType.hasWildcard()) {
- throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED.addContent(parsedContentType));
+ throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED
+ .addContent(parsedContentType));
}
// Get list of supported content types based on processor feature.
- final List<ContentType> supportedContentTypes = processorFeature == EntitySimplePropertyValueProcessor.class ? getSupportedContentTypes(getProperty(uriInfo)) : getSupportedContentTypes(processorFeature);
+ final List<ContentType> supportedContentTypes =
+ processorFeature == EntitySimplePropertyValueProcessor.class ? getSupportedContentTypes(getProperty(uriInfo))
+ : getSupportedContentTypes(processorFeature);
if (!hasMatchingContentType(parsedContentType, supportedContentTypes)) {
- throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED.addContent(parsedContentType));
+ throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED
+ .addContent(parsedContentType));
}
}
/**
- * Checks if the given list of {@link ContentType}s contains a matching {@link ContentType}
- * for the given <code>contentType</code> parameter.
+ * Checks if the given list of {@link ContentType}s contains a matching {@link ContentType} for the given
+ * <code>contentType</code> parameter.
* @param contentType for which a matching content type is searched
* @param allowedContentTypes list against which is checked for possible matching {@link ContentType}s
* @return <code>true</code> if a matching content type is in given list, otherwise <code>false</code>
*/
- private static boolean hasMatchingContentType(final ContentType contentType, final List<ContentType> allowedContentTypes) {
+ private static boolean hasMatchingContentType(final ContentType contentType,
+ final List<ContentType> allowedContentTypes) {
final ContentType requested = contentType.receiveWithCharsetParameter(ContentNegotiator.DEFAULT_CHARSET);
if (requested.getODataFormat() == ODataFormat.CUSTOM || requested.getODataFormat() == ODataFormat.MIME) {
return requested.hasCompatible(allowedContentTypes);
@@ -424,10 +453,13 @@ public class ODataRequestHandler {
}
private static List<ContentType> getSupportedContentTypes(final EdmProperty property) throws EdmException {
- return property.getType() == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance() ? Arrays.asList(property.getMimeType() == null ? ContentType.WILDCARD : ContentType.create(property.getMimeType())) : Arrays.asList(ContentType.TEXT_PLAIN, ContentType.TEXT_PLAIN_CS_UTF_8);
+ return property.getType() == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance() ? Arrays.asList(property
+ .getMimeType() == null ? ContentType.WILDCARD : ContentType.create(property.getMimeType())) : Arrays.asList(
+ ContentType.TEXT_PLAIN, ContentType.TEXT_PLAIN_CS_UTF_8);
}
- private List<String> getSupportedContentTypes(final UriInfoImpl uriInfo, ODataHttpMethod method) throws ODataException {
+ private List<String> getSupportedContentTypes(final UriInfoImpl uriInfo, final ODataHttpMethod method)
+ throws ODataException {
Class<? extends ODataProcessor> processorFeature = Dispatcher.mapUriTypeToProcessorFeature(uriInfo);
if (ODataHttpMethod.POST.equals(method)) {
UriType uriType = uriInfo.getUriType();
@@ -438,7 +470,8 @@ public class ODataRequestHandler {
return service.getSupportedContentTypes(processorFeature);
}
- private List<ContentType> getSupportedContentTypes(final Class<? extends ODataProcessor> processorFeature) throws ODataException {
+ private List<ContentType> getSupportedContentTypes(final Class<? extends ODataProcessor> processorFeature)
+ throws ODataException {
return ContentType.createAsCustom(service.getSupportedContentTypes(processorFeature));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
index d1ff73e..dd3173b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
index 3131dd3..f332726 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
index 301d6f0..85000cc 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
index 53a5b96..d56e13e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -39,9 +39,12 @@ public class AcceptParser {
private static final String REG_EX_QUALITY_FACTOR = "q=((?:1\\.0{0,3})|(?:0\\.[0-9]{0,2}[1-9]))";
private static final String REG_EX_OPTIONAL_WHITESPACE = "\\s?";
private static final Pattern REG_EX_ACCEPT = Pattern.compile("([a-z\\*]+/[a-z0-9\\+\\*\\-=;\\s]+)");
- private static final Pattern REG_EX_ACCEPT_WITH_Q_FACTOR = Pattern.compile(REG_EX_ACCEPT + "(?:;" + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
- private static final Pattern REG_EX_ACCEPT_LANGUAGES = Pattern.compile("((?:(?:[a-z]{1,8})|(?:\\*))\\-?(?:[a-zA-Z]{1,8})?)");
- private static final Pattern REG_EX_ACCEPT_LANGUAGES_WITH_Q_FACTOR = Pattern.compile(REG_EX_ACCEPT_LANGUAGES + "(?:;" + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
+ private static final Pattern REG_EX_ACCEPT_WITH_Q_FACTOR = Pattern.compile(REG_EX_ACCEPT + "(?:;"
+ + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
+ private static final Pattern REG_EX_ACCEPT_LANGUAGES = Pattern
+ .compile("((?:(?:[a-z]{1,8})|(?:\\*))\\-?(?:[a-zA-Z]{1,8})?)");
+ private static final Pattern REG_EX_ACCEPT_LANGUAGES_WITH_Q_FACTOR = Pattern.compile(REG_EX_ACCEPT_LANGUAGES + "(?:;"
+ + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
private static final double QUALITY_PARAM_FACTOR = 0.001;
@@ -116,7 +119,8 @@ public class AcceptParser {
} else {
String acceptLanguage = acceptLanguageScanner.next();
acceptLanguageScanner.close();
- throw new BatchException(BatchException.INVALID_ACCEPT_LANGUAGE_HEADER.addContent(acceptLanguage), BAD_REQUEST);
+ throw new BatchException(BatchException.INVALID_ACCEPT_LANGUAGE_HEADER.addContent(acceptLanguage),
+ BAD_REQUEST);
}
} else {
String acceptLanguage = acceptLanguageScanner.next();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java
index 2db859c..2a0c1ce 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
index 9546017..6adcf63 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;