You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ko...@apache.org on 2014/03/10 17:16:16 UTC
[1/2] [OLINGO-63] Uri Parser: add Documentation II
Repository: incubator-olingo-odata4
Updated Branches:
refs/heads/master b18f01ba0 -> 23aa96e97
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java
index 1026b0c..69166fc 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java
@@ -1,27 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Represents the system query option $levels when used inside $expand
+ * For example: http://.../Employees?$expand=Model.Manager/DirectReports($levels=3)
+ */
public interface LevelsExpandOption {
+ /**
+ * @return Levels was max
+ */
boolean isMax();
+ /**
+ * @return Value of $levels
+ */
int getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.java
index 856cc43..e7f7037 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,14 +20,21 @@ package org.apache.olingo.server.api.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
+/**
+ * Represents a single orderby information
+ * For example: http://.../Employees?$orderby=Name
+ */
public interface OrderByItem {
/**
- * Returns the sort order of the orderBy item
+ * Returns the sort order of the orderby item
* @return if false (default) the sort order is ascending, if true the sort order is descending
*/
boolean isDescending();
+ /**
+ * @return Expression which is used to order the items
+ */
Expression getExpression();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.java
index 1752747..4612f21 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,8 +20,15 @@ package org.apache.olingo.server.api.uri.queryoption;
import java.util.List;
+/**
+ * Represents the system query option $orderby
+ * For example: http://.../Employees?$orderby=Name, Age desc
+ */
public interface OrderByOption extends SystemQueryOption {
+ /**
+ * @return List of single orders used in $orderby
+ */
List<OrderByItem> getOrders();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java
index 72cef7b..860eaa6 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java
@@ -1,27 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Super interface used for any query option
+ */
public interface QueryOption {
+ /**
+ * @return Name of query option
+ */
public String getName();
+ /**
+ * @return Value of query option
+ */
public String getText();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java
index 17716b7..ae608f2 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java
@@ -1,27 +1,34 @@
-/*
+/*******************************************************************************
* 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ ******************************************************************************/
package org.apache.olingo.server.api.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.search.SearchExpression;
+/**
+ * Represents the system query option $search
+ * For example: http://.../entitySet?$search=SearchString
+ */
public interface SearchOption extends SystemQueryOption {
+ /**
+ * @return Search expression tree created from the $search value (see {@link SearchExpression})
+ */
SearchExpression getSearchExpression();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.java
index 16c551f..6ee25ec 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,16 +22,36 @@ import org.apache.olingo.commons.api.edm.EdmType;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.server.api.uri.UriInfoResource;
+/**
+ * Represents a single select item information
+ * For example: http://.../Employees?select=name,age
+ */
public interface SelectItem {
+ /**
+ * @return A star is used as select item
+ */
boolean isStar();
+ /**
+ * @return Namespace and star is used as select item in order to select operations
+ */
boolean isAllOperationsInSchema();
+ /**
+ * @return Namespace when a star is used in combination with an namespace
+ */
FullQualifiedName getAllOperationsInSchemaNameSpace();
+ /**
+ * @return A {@link UriInfoResource} object containing the resource path segments to be selected
+ */
UriInfoResource getResourcePath();
+ /**
+ * @return Before resource path segments which should be selected a type filter may be used.
+ * For example: ...Suppliers?$select=Namespace.PreferredSupplier/AccountRepresentative
+ */
EdmType getStartTypeFilter();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.java
index bb878f5..18ee432 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,8 +20,15 @@ package org.apache.olingo.server.api.uri.queryoption;
import java.util.List;
+/**
+ * Represents the system query option $select
+ * For example: http://.../entitySet?select=name,age
+ */
public interface SelectOption extends SystemQueryOption {
+ /**
+ * @return A list of select items used in $select
+ */
List<SelectItem> getSelectItems();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java
index 1156bc4..ecf94c7 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java
@@ -1,25 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Represents the system query option $skip
+ * For example: http://.../entitySet?$skip=10
+ */
public interface SkipOption extends SystemQueryOption {
- String getValue();
+ /**
+ * @return Value of $skip
+ */
+ int getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java
index c0d6cc6..f0cc0f8 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java
@@ -1,25 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Represents the system query option $skiptoken
+ * For example: http://.../entitySet?$skiptoken=abv
+ */
public interface SkipTokenOption extends SystemQueryOption {
+ /**
+ * @return Value of $skiptoken
+ */
String getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SupportedQueryOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SupportedQueryOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SupportedQueryOptions.java
deleted file mode 100644
index b29c5e5..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SupportedQueryOptions.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri.queryoption;
-
-public enum SupportedQueryOptions {
- FILTER("$filter"),
- FORMAT("$format"),
- EXPAND("$expand"),
- ID("$id"),
- COUNT("$count"),
- ORDERBY("$orderby"),
- SEARCH("$search"),
- SELECT("$select"),
- SKIP("$skip"),
- SKIPTOKEN("$skiptoken"),
- TOP("$top"),
- LEVELS("$level");
-
- String syntax;
-
- private SupportedQueryOptions(final String syntax) {
- this.syntax = syntax;
- }
-
- @Override
- public String toString() {
- return syntax;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOption.java
index a34f16c..2d3cd0d 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOption.java
@@ -1,25 +1,30 @@
-/*
+/*
* 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Super interface used for any system query option
+ */
public interface SystemQueryOption extends QueryOption {
- SupportedQueryOptions getKind();
-
+ /**
+ * @return Kind of system query option
+ */
+ SystemQueryOptionKind getKind();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOptionKind.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOptionKind.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOptionKind.java
new file mode 100644
index 0000000..95fd172
--- /dev/null
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SystemQueryOptionKind.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.api.uri.queryoption;
+
+
+/**
+ * Defining the supported system query options
+ */
+
+public enum SystemQueryOptionKind {
+
+ /**
+ * See {@link FilterOption}<br>
+ */
+ FILTER("$filter"),
+
+ /**
+ * See {@link FormatOption}<br>
+ */
+ FORMAT("$format"),
+
+ /**
+ * See {@link ExpandOption}<br>
+ */
+ EXPAND("$expand"),
+
+ /**
+ * See {@link IdOption}<br>
+ */
+ ID("$id"),
+
+ /**
+ * See {@link CountOption}<br>
+ */
+ COUNT("$count"),
+
+ /**
+ * See {@link OrderByOption}<br>
+ */
+ ORDERBY("$orderby"),
+
+ /**
+ * See {@link SearchOption}<br>
+ */
+ SEARCH("$search"),
+
+ /**
+ * See {@link SelectOption}<br>
+ */
+ SELECT("$select"),
+
+ /**
+ * See {@link SkipOption}<br>
+ */
+ SKIP("$skip"),
+
+ /**
+ * See {@link SkipTokenOption}<br>
+ */
+ SKIPTOKEN("$skiptoken"),
+
+ /**
+ * See {@link TopOption}<br>
+ */
+ TOP("$top"),
+
+ /**
+ * See {@link LevelsExpandOption}<br>
+ */
+ LEVELS("$level");
+
+ String syntax;
+
+ private SystemQueryOptionKind(final String syntax) {
+ this.syntax = syntax;
+ }
+
+ @Override
+ public String toString() {
+ return syntax;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/TopOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/TopOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/TopOption.java
index 26ca27b..9e782e5 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/TopOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/TopOption.java
@@ -1,25 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Represents the system query option $top
+ * For example: http://.../entitySet?$top=10
+ */
public interface TopOption extends SystemQueryOption {
- String getValue();
+ /**
+ * @return Value of $top
+ */
+ int getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java
index d808a96..a04b55f 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java
@@ -44,7 +44,7 @@ import org.apache.olingo.server.api.uri.queryoption.SearchOption;
import org.apache.olingo.server.api.uri.queryoption.SelectOption;
import org.apache.olingo.server.api.uri.queryoption.SkipOption;
import org.apache.olingo.server.api.uri.queryoption.SkipTokenOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
import org.apache.olingo.server.api.uri.queryoption.TopOption;
import org.apache.olingo.server.core.uri.queryoption.CountOptionImpl;
import org.apache.olingo.server.core.uri.queryoption.CustomQueryOptionImpl;
@@ -248,27 +248,27 @@ public class UriInfoImpl implements UriInfo {
public UriInfoImpl setSystemQueryOption(final SystemQueryOptionImpl systemOption) {
- if (systemOption.getKind() == SupportedQueryOptions.EXPAND) {
+ if (systemOption.getKind() == SystemQueryOptionKind.EXPAND) {
expandOption = (ExpandOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.FILTER) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.FILTER) {
filterOption = (FilterOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.FORMAT) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.FORMAT) {
formatOption = (FormatOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.ID) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.ID) {
idOption = (IdOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.COUNT) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.COUNT) {
inlineCountOption = (CountOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.ORDERBY) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.ORDERBY) {
orderByOption = (OrderByOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.SEARCH) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.SEARCH) {
searchOption = (SearchOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.SELECT) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.SELECT) {
selectOption = (SelectOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.SKIP) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.SKIP) {
skipOption = (SkipOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.SKIPTOKEN) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.SKIPTOKEN) {
skipTokenOption = (SkipTokenOptionImpl) systemOption;
- } else if (systemOption.getKind() == SupportedQueryOptions.TOP) {
+ } else if (systemOption.getKind() == SystemQueryOptionKind.TOP) {
topOption = (TopOptionImpl) systemOption;
}
return this;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
index 8425381..ac2eada 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
@@ -217,7 +217,7 @@ public class Parser {
SkipOptionImpl inlineCountOption = new SkipOptionImpl();
inlineCountOption.setName(option.name);
inlineCountOption.setText(option.value);
- inlineCountOption.setValue(option.value);
+ inlineCountOption.setValue(Integer.parseInt(option.value));
context.contextUriInfo.setSystemQueryOption(inlineCountOption);
} else if (option.name.equals("$skiptoken")) {
SkipTokenOptionImpl inlineCountOption = new SkipTokenOptionImpl();
@@ -229,7 +229,7 @@ public class Parser {
TopOptionImpl inlineCountOption = new TopOptionImpl();
inlineCountOption.setName(option.name);
inlineCountOption.setText(option.value);
- inlineCountOption.setValue(option.value);
+ inlineCountOption.setValue(Integer.parseInt(option.value));
context.contextUriInfo.setSystemQueryOption(inlineCountOption);
} else if (option.name.equals("$count")) {
// todo create CountOption
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
index 40b2a68..138e4c7 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
@@ -2010,7 +2010,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> {
String text = ctx.children.get(2).getText();
- return skiptoken.setValue(text).setText(text);
+ return skiptoken.setValue(Integer.parseInt(text)).setText(text);
}
@Override
@@ -2058,7 +2058,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> {
String text = ctx.children.get(2).getText();
- return top.setValue(text).setText(text);
+ return top.setValue(Integer.parseInt(text)).setText(text);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java
index 5926081..0ec6644 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java
@@ -19,14 +19,14 @@
package org.apache.olingo.server.core.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.CountOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class CountOptionImpl extends SystemQueryOptionImpl implements CountOption {
private boolean count;
public CountOptionImpl() {
- setKind(SupportedQueryOptions.COUNT);
+ setKind(SystemQueryOptionKind.COUNT);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java
index 905336b..0fa3314 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java
@@ -31,7 +31,7 @@ import org.apache.olingo.server.api.uri.queryoption.OrderByOption;
import org.apache.olingo.server.api.uri.queryoption.SearchOption;
import org.apache.olingo.server.api.uri.queryoption.SelectOption;
import org.apache.olingo.server.api.uri.queryoption.SkipOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
import org.apache.olingo.server.api.uri.queryoption.TopOption;
import org.apache.olingo.server.core.uri.queryoption.expression.MemberImpl;
@@ -55,23 +55,23 @@ public class ExpandItemImpl implements ExpandItem {
public ExpandItemImpl setSystemQueryOption(final SystemQueryOptionImpl sysItem) {
- if (sysItem.getKind() == SupportedQueryOptions.EXPAND) {
+ if (sysItem.getKind() == SystemQueryOptionKind.EXPAND) {
expandOption = (ExpandOptionImpl) sysItem;
- } else if (sysItem.getKind() == SupportedQueryOptions.FILTER) {
+ } else if (sysItem.getKind() == SystemQueryOptionKind.FILTER) {
filterOption = (FilterOptionImpl) sysItem;
- } else if (sysItem.getKind() == SupportedQueryOptions.COUNT) {
+ } else if (sysItem.getKind() == SystemQueryOptionKind.COUNT) {
inlineCountOption = (CountOptionImpl) sysItem;
- } else if (sysItem.getKind() == SupportedQueryOptions.ORDERBY) {
+ } else if (sysItem.getKind() == SystemQueryOptionKind.ORDERBY) {
orderByOption = (OrderByOptionImpl) sysItem;
- } else if (sysItem.getKind() == SupportedQueryOptions.SEARCH) {
+ } else if (sysItem.getKind() == SystemQueryOptionKind.SEARCH) {
searchOption = (SearchOptionImpl) sysItem;
- } else if (sysItem.getKind() == SupportedQueryOptions.SELECT) {
+ } else if (sysItem.getKind() == SystemQueryOptionKind.SELECT) {
selectOption = (SelectOptionImpl) sysItem;
- } else if (sysItem.getKind() == SupportedQueryOptions.SKIP) {
+ } else if (sysItem.getKind() == SystemQueryOptionKind.SKIP) {
skipOption = (SkipOptionImpl) sysItem;
- } else if (sysItem.getKind() == SupportedQueryOptions.TOP) {
+ } else if (sysItem.getKind() == SystemQueryOptionKind.TOP) {
topOption = (TopOptionImpl) sysItem;
- } else if (sysItem.getKind() == SupportedQueryOptions.LEVELS) {
+ } else if (sysItem.getKind() == SystemQueryOptionKind.LEVELS) {
levelsExpandOption = (LevelsExpandOption) sysItem;
}
return this;
@@ -116,7 +116,7 @@ public class ExpandItemImpl implements ExpandItem {
}
@Override
- public CountOption getInlineCountOption() {
+ public CountOption getCountOption() {
return inlineCountOption;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java
index 2389964..9a08a37 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java
@@ -23,14 +23,14 @@ import java.util.List;
import org.apache.olingo.server.api.uri.queryoption.ExpandItem;
import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class ExpandOptionImpl extends SystemQueryOptionImpl implements ExpandOption {
List<ExpandItemImpl> expandItems = new ArrayList<ExpandItemImpl>();
public ExpandOptionImpl() {
- setKind(SupportedQueryOptions.EXPAND);
+ setKind(SystemQueryOptionKind.EXPAND);
}
public void addExpandItem(final ExpandItemImpl expandItem) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java
index 47cf8a5..816db6c 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java
@@ -19,7 +19,7 @@
package org.apache.olingo.server.core.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.FilterOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
import org.apache.olingo.server.core.uri.queryoption.expression.ExpressionImpl;
public class FilterOptionImpl extends SystemQueryOptionImpl implements FilterOption {
@@ -27,7 +27,7 @@ public class FilterOptionImpl extends SystemQueryOptionImpl implements FilterOpt
private ExpressionImpl expression;
public FilterOptionImpl() {
- setKind(SupportedQueryOptions.FILTER);
+ setKind(SystemQueryOptionKind.FILTER);
}
public FilterOptionImpl setExpression(final ExpressionImpl expression) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java
index ef8aa8e..7088602 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java
@@ -19,13 +19,13 @@
package org.apache.olingo.server.core.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.FormatOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class FormatOptionImpl extends SystemQueryOptionImpl implements FormatOption {
private String value;
public FormatOptionImpl() {
- setKind(SupportedQueryOptions.FORMAT);
+ setKind(SystemQueryOptionKind.FORMAT);
}
public FormatOptionImpl setFormat(final String value) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java
index 7738d54..ddc6d08 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java
@@ -19,13 +19,13 @@
package org.apache.olingo.server.core.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.IdOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class IdOptionImpl extends SystemQueryOptionImpl implements IdOption {
private String value;
public IdOptionImpl() {
- setKind(SupportedQueryOptions.ID);
+ setKind(SystemQueryOptionKind.ID);
}
public IdOptionImpl setValue(final String value) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java
index c568350..d02ab00 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java
@@ -19,14 +19,14 @@
package org.apache.olingo.server.core.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.LevelsExpandOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class LevelsOptionImpl extends SystemQueryOptionImpl implements LevelsExpandOption {
private boolean isMax;
private int value;
public LevelsOptionImpl() {
- setKind(SupportedQueryOptions.LEVELS);
+ setKind(SystemQueryOptionKind.LEVELS);
}
public LevelsOptionImpl setValue(final int value) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java
index 66eeb41..3996c06 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java
@@ -23,14 +23,14 @@ import java.util.List;
import org.apache.olingo.server.api.uri.queryoption.OrderByItem;
import org.apache.olingo.server.api.uri.queryoption.OrderByOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class OrderByOptionImpl extends SystemQueryOptionImpl implements OrderByOption {
private List<OrderByItemImpl> orders = new ArrayList<OrderByItemImpl>();
public OrderByOptionImpl() {
- setKind(SupportedQueryOptions.ORDERBY);
+ setKind(SystemQueryOptionKind.ORDERBY);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java
index f1c7739..add4cc6 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java
@@ -19,14 +19,14 @@
package org.apache.olingo.server.core.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.SearchOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
import org.apache.olingo.server.api.uri.queryoption.search.SearchExpression;
// TODO planned: support $search
public class SearchOptionImpl extends SystemQueryOptionImpl implements SearchOption {
public SearchOptionImpl() {
- setKind(SupportedQueryOptions.SEARCH);
+ setKind(SystemQueryOptionKind.SEARCH);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java
index aa19d2e..5dbe9d3 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java
@@ -23,14 +23,14 @@ import java.util.List;
import org.apache.olingo.server.api.uri.queryoption.SelectItem;
import org.apache.olingo.server.api.uri.queryoption.SelectOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class SelectOptionImpl extends SystemQueryOptionImpl implements SelectOption {
private List<SelectItemImpl> selectItems;
public SelectOptionImpl() {
- setKind(SupportedQueryOptions.SELECT);
+ setKind(SystemQueryOptionKind.SELECT);
}
public SelectOptionImpl setSelectItems(final List<SelectItemImpl> selectItems) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipOptionImpl.java
index 6ec7e63..7969410 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipOptionImpl.java
@@ -19,21 +19,21 @@
package org.apache.olingo.server.core.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.SkipOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class SkipOptionImpl extends SystemQueryOptionImpl implements SkipOption {
- private String value;
+ private int value;
public SkipOptionImpl() {
- setKind(SupportedQueryOptions.SKIP);
+ setKind(SystemQueryOptionKind.SKIP);
}
@Override
- public String getValue() {
+ public int getValue() {
return value;
}
- public SkipOptionImpl setValue(final String value) {
+ public SkipOptionImpl setValue(final int value) {
this.value = value;
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipTokenOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipTokenOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipTokenOptionImpl.java
index d58d5d7..6890244 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipTokenOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SkipTokenOptionImpl.java
@@ -19,13 +19,13 @@
package org.apache.olingo.server.core.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.SkipTokenOption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
public class SkipTokenOptionImpl extends SystemQueryOptionImpl implements SkipTokenOption {
private String skipTokenValue;
public SkipTokenOptionImpl() {
- setKind(SupportedQueryOptions.SKIPTOKEN);
+ setKind(SystemQueryOptionKind.SKIPTOKEN);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SystemQueryOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SystemQueryOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SystemQueryOptionImpl.java
index a01b320..24d1c48 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SystemQueryOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SystemQueryOptionImpl.java
@@ -18,19 +18,19 @@
*/
package org.apache.olingo.server.core.uri.queryoption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
import org.apache.olingo.server.api.uri.queryoption.SystemQueryOption;
public class SystemQueryOptionImpl extends QueryOptionImpl implements SystemQueryOption {
- private SupportedQueryOptions kind;
+ private SystemQueryOptionKind kind;
@Override
- public SupportedQueryOptions getKind() {
+ public SystemQueryOptionKind getKind() {
return kind;
}
- void setKind(final SupportedQueryOptions kind) {
+ void setKind(final SystemQueryOptionKind kind) {
this.kind = kind;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/TopOptionImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/TopOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/TopOptionImpl.java
index 5000d0e..4085a29 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/TopOptionImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/TopOptionImpl.java
@@ -18,23 +18,23 @@
*/
package org.apache.olingo.server.core.uri.queryoption;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
import org.apache.olingo.server.api.uri.queryoption.TopOption;
-/* TODO implement */
+
public class TopOptionImpl extends SystemQueryOptionImpl implements TopOption {
- private String value;
+ private int value;
public TopOptionImpl() {
- setKind(SupportedQueryOptions.TOP);
+ setKind(SystemQueryOptionKind.TOP);
}
@Override
- public String getValue() {
+ public int getValue() {
return value;
}
- public TopOptionImpl setValue(final String value) {
+ public TopOptionImpl setValue(final int value) {
this.value = value;
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java
index 452a5b0..84217df 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.server.api.uri.UriInfoResource;
-import org.apache.olingo.server.api.uri.queryoption.SupportedQueryOptions;
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
import org.apache.olingo.server.core.edm.provider.EdmProviderImpl;
import org.apache.olingo.server.core.testutil.EdmTechTestProvider;
import org.apache.olingo.server.core.uri.UriInfoImpl;
@@ -95,7 +95,7 @@ public class QueryOptionTest {
assertEquals(expand, option.getExpandOption());
assertEquals(filter, option.getFilterOption());
- assertEquals(inlinecount, option.getInlineCountOption());
+ assertEquals(inlinecount, option.getCountOption());
assertEquals(orderby, option.getOrderByOption());
assertEquals(search, option.getSearchOption());
assertEquals(select, option.getSelectOption());
@@ -135,7 +135,7 @@ public class QueryOptionTest {
@Test
public void testExpandOptionImpl() {
ExpandOptionImpl option = new ExpandOptionImpl();
- assertEquals(SupportedQueryOptions.EXPAND, option.getKind());
+ assertEquals(SystemQueryOptionKind.EXPAND, option.getKind());
ExpandItemImpl item1 = new ExpandItemImpl();
ExpandItemImpl item2 = new ExpandItemImpl();
@@ -148,7 +148,7 @@ public class QueryOptionTest {
@Test
public void testFilterOptionImpl() {
FilterOptionImpl option = new FilterOptionImpl();
- assertEquals(SupportedQueryOptions.FILTER, option.getKind());
+ assertEquals(SystemQueryOptionKind.FILTER, option.getKind());
AliasImpl expression = new AliasImpl();
@@ -159,7 +159,7 @@ public class QueryOptionTest {
@Test
public void testFormatOptionImpl() {
FormatOptionImpl option = new FormatOptionImpl();
- assertEquals(SupportedQueryOptions.FORMAT, option.getKind());
+ assertEquals(SystemQueryOptionKind.FORMAT, option.getKind());
option.setFormat("A");
@@ -169,7 +169,7 @@ public class QueryOptionTest {
@Test
public void testIdOptionImpl() {
IdOptionImpl option = new IdOptionImpl();
- assertEquals(SupportedQueryOptions.ID, option.getKind());
+ assertEquals(SystemQueryOptionKind.ID, option.getKind());
option.setValue("A");
@@ -179,7 +179,7 @@ public class QueryOptionTest {
@Test
public void testInlineCountImpl() {
CountOptionImpl option = new CountOptionImpl();
- assertEquals(SupportedQueryOptions.COUNT, option.getKind());
+ assertEquals(SystemQueryOptionKind.COUNT, option.getKind());
assertEquals(false, option.getValue());
option.setValue(true);
@@ -189,7 +189,7 @@ public class QueryOptionTest {
@Test
public void testLevelsExpandOptionImpl() {
LevelsOptionImpl option = new LevelsOptionImpl();
- assertEquals(SupportedQueryOptions.LEVELS, option.getKind());
+ assertEquals(SystemQueryOptionKind.LEVELS, option.getKind());
assertEquals(0, option.getValue());
option.setValue(1);
@@ -239,7 +239,7 @@ public class QueryOptionTest {
@Test
public void testSearchOptionImpl() {
SearchOptionImpl option = new SearchOptionImpl();
- assertEquals(SupportedQueryOptions.SEARCH, option.getKind());
+ assertEquals(SystemQueryOptionKind.SEARCH, option.getKind());
// TODO $search is not supported yet
}
@@ -267,7 +267,7 @@ public class QueryOptionTest {
@Test
public void testSelectOptionImpl() {
SelectOptionImpl option = new SelectOptionImpl();
- assertEquals(SupportedQueryOptions.SELECT, option.getKind());
+ assertEquals(SystemQueryOptionKind.SELECT, option.getKind());
SelectItemImpl item0 = new SelectItemImpl();
SelectItemImpl item1 = new SelectItemImpl();
@@ -285,16 +285,16 @@ public class QueryOptionTest {
@Test
public void testSkipOptionImpl() {
SkipOptionImpl option = new SkipOptionImpl();
- assertEquals(SupportedQueryOptions.SKIP, option.getKind());
+ assertEquals(SystemQueryOptionKind.SKIP, option.getKind());
- option.setValue("A");
- assertEquals("A", option.getValue());
+ option.setValue(10);
+ assertEquals(10, option.getValue());
}
@Test
public void testSkipTokenOptionImpl() {
SkipTokenOptionImpl option = new SkipTokenOptionImpl();
- assertEquals(SupportedQueryOptions.SKIPTOKEN, option.getKind());
+ assertEquals(SystemQueryOptionKind.SKIPTOKEN, option.getKind());
option.setValue("A");
assertEquals("A", option.getValue());
@@ -304,8 +304,8 @@ public class QueryOptionTest {
public void testSystemQueryOptionImpl() {
SystemQueryOptionImpl option = new SystemQueryOptionImpl();
- option.setKind(SupportedQueryOptions.EXPAND);
- assertEquals(SupportedQueryOptions.EXPAND, option.getKind());
+ option.setKind(SystemQueryOptionKind.EXPAND);
+ assertEquals(SystemQueryOptionKind.EXPAND, option.getKind());
assertEquals("$expand", option.getName());
}
@@ -313,9 +313,9 @@ public class QueryOptionTest {
@Test
public void testTopOptionImpl() {
TopOptionImpl option = new TopOptionImpl();
- assertEquals(SupportedQueryOptions.TOP, option.getKind());
+ assertEquals(SystemQueryOptionKind.TOP, option.getKind());
- option.setValue("A");
- assertEquals("A", option.getValue());
+ option.setValue(11);
+ assertEquals(11, option.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
index c26d52e..21df8bb 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
@@ -163,7 +163,7 @@ public class ExpandValidator implements Validator {
}
public ExpandValidator isInlineCountText(final String text) {
- QueryOptionImpl option = (QueryOptionImpl) expandItem.getInlineCountOption();
+ QueryOptionImpl option = (QueryOptionImpl) expandItem.getCountOption();
assertEquals(text, option.getText());
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java
new file mode 100644
index 0000000..b4333a4
--- /dev/null
+++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java
@@ -0,0 +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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ******************************************************************************/
+package org.apache.olingo.odata4.server.api.uri.queryoption;
+
+import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
+
+/**
+ * Represents an alias value defined as query option
+ * For example:
+ * http://.../?filter=@value eq name&@value='test'
+ */
+public interface AliasQueryOption extends QueryOption {
+
+ /**
+ * @return Value of the alias
+ */
+ public Expression getValue();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java
new file mode 100644
index 0000000..3a2eded
--- /dev/null
+++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java
@@ -0,0 +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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ******************************************************************************/
+package org.apache.olingo.odata4.server.api.uri.queryoption;
+
+import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
+import org.apache.olingo.odata4.server.api.uri.queryoption.search.SearchExpression;
+
+/**
+ * Represents the system query option $filter
+ * For example: http://.../entitySet?$filter=name eq 'tester'
+ */
+public interface FilterOption extends SystemQueryOption {
+
+ /**
+ * @return Expression tree created from the filter value (see {@link Expression})
+ */
+ Expression getExpression();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java
new file mode 100644
index 0000000..b19f044
--- /dev/null
+++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java
@@ -0,0 +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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ******************************************************************************/
+package org.apache.olingo.odata4.server.api.uri.queryoption;
+
+import org.apache.olingo.odata4.server.api.uri.queryoption.search.SearchExpression;
+
+/**
+ * Represents the system query option $search
+ * For example: http://.../entitySet?$search=SearchString
+ */
+public interface SearchOption extends SystemQueryOption {
+
+ /**
+ * @return Search expression tree created from the $search value (see {@link SearchExpression})
+ */
+ SearchExpression getSearchExpression();
+
+}
[2/2] git commit: [OLINGO-63] Uri Parser: add Documentation II
Posted by ko...@apache.org.
[OLINGO-63] Uri Parser: add Documentation II
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/23aa96e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/23aa96e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/23aa96e9
Branch: refs/heads/master
Commit: 23aa96e973988b583b6dfecd12dafdaa3ca83293
Parents: b18f01b
Author: Sven Kobler <sv...@sap.com>
Authored: Mon Mar 10 16:06:10 2014 +0100
Committer: Sven Kobler <sv...@sap.com>
Committed: Mon Mar 10 17:15:06 2014 +0100
----------------------------------------------------------------------
.../apache/olingo/server/api/uri/UriInfo.java | 20 ++--
.../olingo/server/api/uri/UriInfoAll.java | 19 ++--
.../olingo/server/api/uri/UriInfoBatch.java | 16 ++--
.../olingo/server/api/uri/UriInfoCrossjoin.java | 16 ++--
.../olingo/server/api/uri/UriInfoEntityId.java | 16 ++--
.../olingo/server/api/uri/UriInfoKind.java | 44 ++++-----
.../olingo/server/api/uri/UriInfoMetadata.java | 16 ++--
.../olingo/server/api/uri/UriInfoResource.java | 34 +++----
.../olingo/server/api/uri/UriInfoService.java | 16 ++--
.../olingo/server/api/uri/UriParameter.java | 28 +++---
.../olingo/server/api/uri/UriResource.java | 22 ++---
.../server/api/uri/UriResourceAction.java | 16 ++--
.../api/uri/UriResourceComplexProperty.java | 18 ++--
.../olingo/server/api/uri/UriResourceCount.java | 16 ++--
.../server/api/uri/UriResourceEntitySet.java | 18 ++--
.../server/api/uri/UriResourceFunction.java | 17 ++--
.../olingo/server/api/uri/UriResourceIt.java | 18 ++--
.../olingo/server/api/uri/UriResourceKind.java | 82 ++++++++--------
.../server/api/uri/UriResourceLambdaAll.java | 16 ++--
.../server/api/uri/UriResourceLambdaAny.java | 16 ++--
.../api/uri/UriResourceLambdaVariable.java | 17 ++--
.../server/api/uri/UriResourceNavigation.java | 18 ++--
.../server/api/uri/UriResourcePartTyped.java | 16 ++--
.../api/uri/UriResourcePrimitiveProperty.java | 16 ++--
.../server/api/uri/UriResourceProperty.java | 16 ++--
.../olingo/server/api/uri/UriResourceRef.java | 17 ++--
.../olingo/server/api/uri/UriResourceRoot.java | 18 ++--
.../server/api/uri/UriResourceSingleton.java | 17 ++--
.../olingo/server/api/uri/UriResourceValue.java | 16 ++--
.../api/uri/queryoption/AliasQueryOption.java | 26 ++++--
.../server/api/uri/queryoption/CountOption.java | 24 +++--
.../api/uri/queryoption/CustomQueryOption.java | 21 +++--
.../uri/queryoption/ExceptionVisitExpand.java | 16 ++--
.../server/api/uri/queryoption/ExpandItem.java | 65 +++++++++++--
.../api/uri/queryoption/ExpandOption.java | 23 +++--
.../api/uri/queryoption/FilterOption.java | 25 +++--
.../api/uri/queryoption/FormatOption.java | 22 +++--
.../server/api/uri/queryoption/IdOption.java | 23 +++--
.../api/uri/queryoption/LevelsExpandOption.java | 26 ++++--
.../server/api/uri/queryoption/OrderByItem.java | 25 +++--
.../api/uri/queryoption/OrderByOption.java | 23 +++--
.../server/api/uri/queryoption/QueryOption.java | 25 +++--
.../api/uri/queryoption/SearchOption.java | 25 +++--
.../server/api/uri/queryoption/SelectItem.java | 36 +++++--
.../api/uri/queryoption/SelectOption.java | 23 +++--
.../server/api/uri/queryoption/SkipOption.java | 25 +++--
.../api/uri/queryoption/SkipTokenOption.java | 23 +++--
.../uri/queryoption/SupportedQueryOptions.java | 45 ---------
.../api/uri/queryoption/SystemQueryOption.java | 25 +++--
.../uri/queryoption/SystemQueryOptionKind.java | 98 ++++++++++++++++++++
.../server/api/uri/queryoption/TopOption.java | 25 +++--
.../olingo/server/core/uri/UriInfoImpl.java | 24 ++---
.../olingo/server/core/uri/parser/Parser.java | 4 +-
.../core/uri/parser/UriParseTreeVisitor.java | 4 +-
.../core/uri/queryoption/CountOptionImpl.java | 4 +-
.../core/uri/queryoption/ExpandItemImpl.java | 22 ++---
.../core/uri/queryoption/ExpandOptionImpl.java | 4 +-
.../core/uri/queryoption/FilterOptionImpl.java | 4 +-
.../core/uri/queryoption/FormatOptionImpl.java | 4 +-
.../core/uri/queryoption/IdOptionImpl.java | 4 +-
.../core/uri/queryoption/LevelsOptionImpl.java | 4 +-
.../core/uri/queryoption/OrderByOptionImpl.java | 4 +-
.../core/uri/queryoption/SearchOptionImpl.java | 4 +-
.../core/uri/queryoption/SelectOptionImpl.java | 4 +-
.../core/uri/queryoption/SkipOptionImpl.java | 10 +-
.../uri/queryoption/SkipTokenOptionImpl.java | 4 +-
.../uri/queryoption/SystemQueryOptionImpl.java | 8 +-
.../core/uri/queryoption/TopOptionImpl.java | 12 +--
.../core/uri/queryoption/QueryOptionTest.java | 38 ++++----
.../core/uri/testutil/ExpandValidator.java | 2 +-
.../api/uri/queryoption/AliasQueryOption.java | 35 +++++++
.../api/uri/queryoption/FilterOption.java | 34 +++++++
.../api/uri/queryoption/SearchOption.java | 34 +++++++
73 files changed, 942 insertions(+), 609 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
index 7fbc2d1..41d9c6c 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
@@ -1,24 +1,23 @@
-/*
+/*
* 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri;
-
/**
* Object acting as general access to URI information extracted from the request URI. Depending on
* the URI info kind different interfaces are used to provide access to that information. </p>
@@ -27,7 +26,7 @@ package org.apache.olingo.server.api.uri;
public interface UriInfo extends
UriInfoService, UriInfoAll, UriInfoBatch, UriInfoCrossjoin,
UriInfoEntityId, UriInfoMetadata, UriInfoResource {
-
+
public UriInfoKind getKind();
public UriInfoService asUriInfoService();
@@ -44,5 +43,4 @@ public interface UriInfo extends
public UriInfoResource asUriInfoResource();
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
index 5845ad4..d76eb55 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri;
-
/**
- * Used for URI info kind {@link UriInfoKind#all} to describe URIs like
+ * Used for URI info kind {@link UriInfoKind#all} to describe URIs like
* http://.../serviceroot/$all
*/
public interface UriInfoAll {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
index d4debad..3d31838 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
index 15a42bb..1352486 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
index 2bac67c..b1159ff 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
index ec86fd9..bb13374 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,46 +22,46 @@ package org.apache.olingo.server.api.uri;
* Defining the various info kinds
*/
public enum UriInfoKind {
-
+
/**
* Class: {@link UriInfoAll}<br>
- * URI: http://.../serviceroot/$all
+ * URI: http://.../serviceroot/$all
*/
all,
-
+
/**
* Class: {@link UriInfoBatch}<br>
- * URI: http://.../serviceroot/$batch
+ * URI: http://.../serviceroot/$batch
*/
batch,
-
+
/**
* Class: {@link UriInfoCrossjoin}<br>
- * URI: http://.../serviceroot/$crossjoin
+ * URI: http://.../serviceroot/$crossjoin
*/
crossjoin,
-
+
/**
* Class: {@link UriInfoEntityId}<br>
- * URI: http://.../serviceroot/$entity(...)
+ * URI: http://.../serviceroot/$entity(...)
*/
entityId,
-
+
/**
* Class: {@link UriInfoMetadata}<br>
- * URI: http://.../serviceroot/$metadata...
+ * URI: http://.../serviceroot/$metadata...
*/
metadata,
-
+
/**
* Class: {@link UriInfoResource}<br>
- * URI: http://.../serviceroot/entitySet
+ * URI: http://.../serviceroot/entitySet
*/
resource,
-
+
/**
* Class: {@link UriInfoService}<br>
- * URI: http://.../serviceroot
+ * URI: http://.../serviceroot
*/
service;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
index 49cf905..8906a64 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
index a7f759e..cc3077a 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -58,7 +58,7 @@ public interface UriInfoResource {
* @return Object containing information of the $format option
*/
FormatOption getFormatOption();
-
+
/**
* @return Object containing information of the $id option
*/
@@ -98,20 +98,20 @@ public interface UriInfoResource {
* @return Object containing information of the $top option
*/
TopOption getTopOption();
-
+
/**
- * The path segments behind the service root define which resources are
+ * The path segments behind the service root define which resources are
* requested by that URI. This may be entities/functions/actions and more.
- * Each segments information (name, key predicates, function parameters, ...) is
+ * Each segments information (name, key predicates, function parameters, ...) is
* stored within an resource object dedicated for that segment type.</p>
- * For example: the URI http://.../serviceroot/entitySet(1)/Adresse will
- * have 2 ResourceParts:<br>
- * - The first one of type {@link UriResourceEntitySet}
- * containing the name of the entity set and also the key predicate information.<br>
+ * For example: the URI http://.../serviceroot/entitySet(1)/Adresse will
+ * have 2 ResourceParts:<br>
+ * - The first one of type {@link UriResourceEntitySet} containing the name of the entity set and also the key
+ * predicate information.<br>
* - The second one of type {@link UriResourceComplexProperty} containing the name of
* the accessed complex property
*
- * @return List of resource parts.
+ * @return List of resource parts.
*/
List<UriResource> getUriResourceParts();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
index ab2ccb6..137a986 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
index 669c4dd..4fa27bc 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,32 +21,32 @@ package org.apache.olingo.server.api.uri;
import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
/**
- * Represents an function parameter or key predicate when used in the URI.
+ * Represents an function parameter or key predicate when used in the URI.
*/
public interface UriParameter {
/**
- * @return Alias name if the parameters values is an alias, otherwise null
+ * @return Alias name if the parameters values is an alias, otherwise null
*/
public String getAlias();
/**
- * @return Text of the parameters value
+ * @return Text of the parameters value
*/
public String getText();
/**
- * @return If the parameters value is a expression and expression is returned, otherwise null
+ * @return If the parameters value is a expression and expression is returned, otherwise null
*/
public Expression getExression();
/**
- * @return Name of the parameter
+ * @return Name of the parameter
*/
public String getName();
/**
- * @return Name of the referenced property when referential constrains are used
+ * @return Name of the referenced property when referential constrains are used
*/
public String getRefencedProperty();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
index 9d22435..468b15c 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
@@ -1,31 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri;
/**
- * Super interface for all objects representing resource parts.
- * See {@link UriInfoResource} for details.
+ * Super interface for all objects representing resource parts.
+ * See {@link UriInfoResource} for details.
*/
public interface UriResource {
/**
- * @return Kind of the resource part
+ * @return Kind of the resource part
*/
UriResourceKind getKind();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
index ee2ddcb..1cdc521 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
index 72affe8..5a1f0ae 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -34,7 +34,7 @@ public interface UriResourceComplexProperty extends UriResourceProperty {
/**
* Behind a complex property may be a type filter
* E.g. http://.../serviceroot/entityset(1)/complexproperty/namespace.complextype
- * @return Type filter if found, otherwise null
+ * @return Type filter if found, otherwise null
*/
EdmComplexType getComplexTypeFilter();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
index ef68b4b..ba77d2c 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
index d3ef52e..d0fd554 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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.commons.api.edm.EdmType;
* For example: http://.../serviceroot/entityset(1)
*/
public interface UriResourceEntitySet extends UriResourcePartTyped {
-
+
/**
* @return Entity set used in the resource path
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
index a4da5ee..7ead9d6 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -47,7 +47,6 @@ public interface UriResourceFunction extends UriResourcePartTyped {
*/
List<UriParameter> getKeyPredicates();
-
/**
* @return List of function parameters
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
index 8854f8c..c61ce19 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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.commons.api.edm.EdmType;
/**
* Class indicating the $it reference. $it may be used within expression to
- * refer to the last EDM object referenced in the resource path.
+ * refer to the last EDM object referenced in the resource path.
*/
public interface UriResourceIt extends UriResourcePartTyped {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
index 6cecce7..9e65dc1 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,94 +22,94 @@ package org.apache.olingo.server.api.uri;
* Defining the various resource part types
*/
public enum UriResourceKind {
-
+
/**
* Class: {@link UriResourceAction}<br>
- * URI: http://.../serviceroot/action()
+ * URI: http://.../serviceroot/action()
*/
- action,
-
+ action,
+
/**
* Class: {@link UriResourceComplexProperty}<br>
- * URI: http://.../serviceroot/entityset(1)/complexproperty()
+ * URI: http://.../serviceroot/entityset(1)/complexproperty()
*/
complexProperty,
-
+
/**
* Class: {@link UriResourceCount}<br>
- * URI: http://.../serviceroot/entityset/$count
+ * URI: http://.../serviceroot/entityset/$count
*/
- count,
-
+ count,
+
/**
* Class: {@link UriResourceEntitySet}<br>
- * URI: http://.../serviceroot/entityset
+ * URI: http://.../serviceroot/entityset
*/
- entitySet,
-
+ entitySet,
+
/**
* Class: {@link UriResourceFunction}<br>
- * URI: http://.../serviceroot/functionimport(P1=1,P2='a')
+ * URI: http://.../serviceroot/functionimport(P1=1,P2='a')
*/
function,
-
+
/**
* Class: {@link UriResourceIt}<br>
- * URI: http://.../serviceroot/entityset?$filter=$it/property
+ * URI: http://.../serviceroot/entityset?$filter=$it/property
*/
it,
-
+
/**
* Class: {@link UriResourceLambdaAll}<br>
- * URI: http://.../serviceroot/entityset/all(...)
+ * URI: http://.../serviceroot/entityset/all(...)
*/
lambdaAll,
-
+
/**
* Class: {@link UriResourceLambdaAny}<br>
- * URI: http://.../serviceroot/entityset/any(...)
+ * URI: http://.../serviceroot/entityset/any(...)
*/
lambdaAny,
-
+
/**
* Class: {@link UriResourceLambdaVariable}<br>
- * URI: http://.../serviceroot/entityset/listofstring/any(d: 'string' eq d)
+ * URI: http://.../serviceroot/entityset/listofstring/any(d: 'string' eq d)
*/
lambdaVariable,
-
+
/**
* Class: {@link UriResourceNavigation}<br>
- * URI: http://.../serviceroot/entityset(1)/navProperty
+ * URI: http://.../serviceroot/entityset(1)/navProperty
*/
navigationProperty,
-
+
/**
* Class: {@link UriResourceRef}<br>
- * URI: http://.../serviceroot/entityset/$ref
+ * URI: http://.../serviceroot/entityset/$ref
*/
ref,
-
+
/**
* Class: {@link UriResourceRoot}<br>
- * URI: http://.../serviceroot/entityset(1)?$filter=property eq $root/singleton/configstring
+ * URI: http://.../serviceroot/entityset(1)?$filter=property eq $root/singleton/configstring
*/
root,
-
+
/**
* Class: {@link UriResourceProperty}<br>
- * URI: http://.../serviceroot/entityset(1)/property
+ * URI: http://.../serviceroot/entityset(1)/property
*/
primitiveProperty,
-
+
/**
* Class: {@link UriResourceSingleton}<br>
- * URI: http://.../serviceroot/singleton
+ * URI: http://.../serviceroot/singleton
*/
singleton,
-
+
/**
* Class: {@link UriResourceValue}<br>
- * URI: http://.../serviceroot/entityset(1)/property/$value
+ * URI: http://.../serviceroot/entityset(1)/property/$value
*/
value,
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
index 6fa218d..328d59b 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java
index 57b127b..2d1408d 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java
index b846010..db60dd4 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -24,7 +24,6 @@ package org.apache.olingo.server.api.uri;
*/
public interface UriResourceLambdaVariable extends UriResourcePartTyped {
-
/**
* @return Name of the lambda variable
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java
index 16f8786..1e43639 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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.commons.api.edm.EdmType;
* For example: http://.../serviceroot/entityset(1)/navProperty
*/
public interface UriResourceNavigation extends UriResourcePartTyped {
-
+
/**
* @return Navigation property
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.java
index 4652817..0b624f2 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.java
index 7f4265c..dccd8d4 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.java
index 72af9cf..c9f7f85 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java
index d5af947..7051028 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java
@@ -1,24 +1,23 @@
-/*
+/*
* 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri;
-
/**
* Used to describe an $ref used within an resource path
* For example: http://.../serviceroot/entityset/$ref
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.java
index ebd3e47..3ce942e 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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.server.api.uri;
/**
* Class indicating the $root reference. $root may be used within expressions to
* refer to the current OData service
- * For example: http://.../serviceroot/entityset(1)?$filter=property eq $root/singleton/configstring
+ * For example: http://.../serviceroot/entityset(1)?$filter=property eq $root/singleton/configstring
*/
public interface UriResourceRoot extends UriResource {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.java
index b523962..89004cc 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -37,7 +37,6 @@ public interface UriResourceSingleton extends UriResourcePartTyped {
*/
EdmEntityType getEntityType();
-
/**
* @return Type filter
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.java
index aa92dfd..e879b80 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java
index 24fb1f2..842d0c5 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java
@@ -1,27 +1,35 @@
-/*
+/*******************************************************************************
* 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ ******************************************************************************/
package org.apache.olingo.server.api.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
+/**
+ * Represents an alias value defined as query option
+ * For example:
+ * http://.../?filter=@value eq name&@value='test'
+ */
public interface AliasQueryOption extends QueryOption {
+ /**
+ * @return Value of the alias
+ */
public Expression getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java
index 7ffef9e..4d78b77 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java
@@ -1,25 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Represents the system query option $count
+ * For example:
+ * http://.../entitySet?$count=true
+ */
public interface CountOption extends SystemQueryOption {
+ /**
+ * @return Value of $count
+ */
boolean getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java
index 0d2d7fc..cd01e17 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java
@@ -1,23 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Represents a custom query option
+ * For example:
+ * http://.../entitySet?myOption=true
+ */
public interface CustomQueryOption extends QueryOption {
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExceptionVisitExpand.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExceptionVisitExpand.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExceptionVisitExpand.java
index 084b387..cd6f452 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExceptionVisitExpand.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExceptionVisitExpand.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * 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-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
index d15c4b8..6954831 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,33 +21,78 @@ package org.apache.olingo.server.api.uri.queryoption;
import org.apache.olingo.commons.api.edm.EdmType;
import org.apache.olingo.server.api.uri.UriInfoResource;
+/**
+ * Represents a single resource path which should be expanded with using the system query option $expand
+ * For example: http://.../entitySet?$expand=Products($filter=DiscontinuedDate eq null)
+ */
public interface ExpandItem {
+ /**
+ * @return Information of the option $level when used within $expand
+ */
LevelsExpandOption getLevelsOption();
+ /**
+ * @return Information of the option $filter when used within $expand
+ */
FilterOption getFilterOption();
+ /**
+ * @return Information of the option $search when used within $expand
+ */
SearchOption getSearchOption();
+ /**
+ * @return Information of the option $orderby when used within $expand
+ */
OrderByOption getOrderByOption();
+ /**
+ * @return Information of the option $skip when used within $expand
+ */
SkipOption getSkipOption();
+ /**
+ * @return Information of the option $top when used within $expand
+ */
TopOption getTopOption();
- CountOption getInlineCountOption();
+ /**
+ * @return Information of the option $count when used within $expand
+ */
+ CountOption getCountOption();
+ /**
+ * @return Information of the option $select when used within $expand
+ */
SelectOption getSelectOption();
+ /**
+ * @return Information of the option $expand when used within $expand
+ */
ExpandOption getExpandOption();
+ /**
+ * @return A {@link UriInfoResource} object containing the resource path segments to be expanded
+ */
UriInfoResource getResourcePath();
+ /**
+ * @return A star is used within $expand.
+ * For example: ...?$expand=*
+ */
boolean isStar();
+ /**
+ * @return A $ref is used within $expand.
+ * For example: ...?$expand=$ref
+ */
boolean isRef();
+ /**
+ * @return Before resource path segments which should be expanded a type filter may be used.
+ * For example: ...persons?$expand=namespace.managertype/team
+ */
EdmType getStartTypeFilter();
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.java
index db5b6ea..634802d 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,8 +20,15 @@ package org.apache.olingo.server.api.uri.queryoption;
import java.util.List;
+/**
+ * Represents the system query option $expand
+ * For example: http://.../entitySet?$expand=Products,Customers
+ */
public interface ExpandOption extends SystemQueryOption {
+ /**
+ * @return A list of resource paths which should be expanded
+ */
List<ExpandItem> getExpandItems();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java
index 0da541a..9ba1496 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java
@@ -1,26 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ ******************************************************************************/
package org.apache.olingo.server.api.uri.queryoption;
import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
+/**
+ * Represents the system query option $filter
+ * For example: http://.../entitySet?$filter=name eq 'tester'
+ */
public interface FilterOption extends SystemQueryOption {
+ /**
+ * @return Expression tree created from the filter value (see {@link Expression})
+ */
Expression getExpression();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java
index e2f6d0a..0efb0d4 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java
@@ -1,25 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Represents the system query option $format
+ * For example: http://.../entitySet?$format=json
+ */
public interface FormatOption extends SystemQueryOption {
- // TODO planned: define best representation for format to enable plugging in custom formats
+ // TODO planned: define best representation for format to enable user defined formats
String getFormat();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/23aa96e9/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java
index 7ef8d71..89b18b1 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java
@@ -1,25 +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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.server.api.uri.queryoption;
+/**
+ * Represents the system query option $id when using a entity-id to resolve the entity
+ * For example: http://.../$entity?$id=Products(0)
+ */
public interface IdOption extends SystemQueryOption {
+ /**
+ * @return Value of $id
+ */
String getValue();
}