[OLINGO-170] Moved provider and implementation to server module

This commit is contained in:
Christian Amend 2014-02-18 16:48:53 +01:00
parent e8a63a58e9
commit e8dccaf0ce
190 changed files with 1054 additions and 979 deletions

View File

@ -18,8 +18,6 @@
******************************************************************************/
package org.apache.olingo.odata4.client.api;
import org.apache.olingo.odata4.commons.api.edm.Edm;
import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
//TODO: Exceptionhandling
public abstract class ODataConsumer {
@ -44,7 +42,4 @@ public abstract class ODataConsumer {
}
return instance;
}
public abstract Edm createEdm(EdmProvider provider);
}

View File

@ -19,15 +19,7 @@
package org.apache.olingo.odata4.client.core;
import org.apache.olingo.odata4.client.api.ODataConsumer;
import org.apache.olingo.odata4.commons.api.edm.Edm;
import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
import org.apache.olingo.odata4.commons.core.ODataCommonsCoreImpl;
public class ODataConsumerImpl extends ODataConsumer {
@Override
public Edm createEdm(final EdmProvider provider) {
return new ODataCommonsCoreImpl().createEdm(provider);
}
}

View File

@ -18,24 +18,16 @@
******************************************************************************/
package org.apache.olingo.odata4.client.core;
import static org.junit.Assert.assertNotNull;
import org.apache.olingo.odata4.client.api.ODataConsumer;
import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
import org.junit.Before;
import org.junit.Test;
public class ODataConsumerTest {
private ODataConsumer consumer;
@Before
public void before() {
consumer = ODataConsumer.create();
}
@Test
public void edmtest() {
EdmProvider provider = null;
consumer.createEdm(provider);
public void before() {
ODataConsumer consumer = ODataConsumer.create();
assertNotNull(consumer);
}
}

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.exception;
package org.apache.olingo.odata4.commons.api;
public class ODataApplicationException extends Exception {
private static final long serialVersionUID = 1L;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.exception;
package org.apache.olingo.odata4.commons.api;
public class ODataException extends Exception {
private static final long serialVersionUID = 1L;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.exception;
package org.apache.olingo.odata4.commons.api;
public class ODataNotImplementedException extends ODataException {

View File

@ -20,8 +20,6 @@ package org.apache.olingo.odata4.commons.api.edm;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
/**
* Entity Data Model (EDM) <p>Interface representing a Entity Data Model as described in the Conceptual Schema
* Definition.

View File

@ -18,7 +18,6 @@
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm;
import java.util.List;
/**
* A CSDL NavigationProperty element

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.commons.api.edm;
/**
* A full qualified name of any element in the EDM consists of a name and a namespace.

View File

@ -1,31 +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.odata4.commons.core;
import org.apache.olingo.odata4.commons.api.edm.Edm;
import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
import org.apache.olingo.odata4.commons.core.edm.provider.EdmProviderImpl;
public class ODataCommonsCoreImpl {
public Edm createEdm(final EdmProvider provider) {
return new EdmProviderImpl(provider);
}
}

View File

@ -19,7 +19,7 @@
package org.apache.olingo.odata4.commons.core.edm;
import org.apache.olingo.odata4.commons.api.edm.EdmException;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class ActionMapKey {
private final FullQualifiedName actionName;

View File

@ -31,7 +31,7 @@ import org.apache.olingo.odata4.commons.api.edm.EdmEnumType;
import org.apache.olingo.odata4.commons.api.edm.EdmFunction;
import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata;
import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public abstract class EdmImpl implements Edm {

View File

@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.EdmException;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class FunctionMapKey {

View File

@ -20,7 +20,7 @@ package org.apache.olingo.odata4.commons.core.edm.primitivetype;
import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
/**
* Abstract implementation of the EDM primitive-type interface.

View File

@ -19,7 +19,7 @@
package org.apache.olingo.odata4.commons.core.edm.primitivetype;
import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
//TODO: Should we delete this typekind and use a facade?
public enum EdmPrimitiveTypeKind {

View File

@ -23,7 +23,7 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.fail;
import org.apache.olingo.odata4.commons.api.edm.EdmException;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.junit.Test;
public class ActionMapKeyTest {

View File

@ -39,7 +39,7 @@ import org.apache.olingo.odata4.commons.api.edm.EdmEnumType;
import org.apache.olingo.odata4.commons.api.edm.EdmFunction;
import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata;
import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.junit.Before;
import org.junit.Test;

View File

@ -39,7 +39,7 @@ import org.apache.olingo.odata4.commons.api.edm.EdmEnumType;
import org.apache.olingo.odata4.commons.api.edm.EdmFunction;
import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata;
import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.junit.Before;
import org.junit.Test;

View File

@ -24,7 +24,7 @@ import static org.junit.Assert.assertNotSame;
import java.util.ArrayList;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.junit.Test;
public class FunctionMapKeyTest {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;

View File

@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class ActionImport extends OperationImport {
private FullQualifiedName action;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
public class AliasInfo {
private String namespace;

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class Annotation {
private FullQualifiedName term;
// Target should be a target path

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public abstract class BindingTarget {
protected String name;

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class ComplexType extends StructuralType {
@Override

View File

@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.exception.ODataException;
import org.apache.olingo.odata4.commons.api.ODataException;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public abstract class EdmProvider {

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class EntityContainer {
private String name;

View File

@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class EntityContainerInfo {
private FullQualifiedName containerName;

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class EntitySet extends BindingTarget {
private boolean includeInServiceDocument;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
//TODO: Do we really need this class?
public class EntitySetPath {

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class EntityType extends StructuralType {
private List<PropertyRef> key;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.EdmMember;

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class EnumType {
private String name;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
//TODO: Expression implementation
public class Expression {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;

View File

@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class FunctionImport extends OperationImport {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.EdmMapping;

View File

@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.constants.EdmOnDelete;
public class NavigationProperty {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
public class NavigationPropertyBinding {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
public abstract class OperationImport {

View File

@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class Parameter {

View File

@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class Property {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
public class PropertyRef {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
public class ReferentialConstraint {

View File

@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class ReturnType {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class Singleton extends BindingTarget {
@Override

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public abstract class StructuralType {
protected String name;

View File

@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class Target {

View File

@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import java.util.List;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class Term {
private String name;
private FullQualifiedName type;

View File

@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm.provider;
package org.apache.olingo.odata4.server.api.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
public class TypeDefinition {

View File

@ -24,7 +24,7 @@ import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption;
public interface UriInfoMetadata {
public FormatOption getFormatOption();
public String getFragment() ;
public String getFragment();
}

View File

@ -29,7 +29,7 @@ public interface UriParameter {
public Expression getExression();
public String getName();
public String getRefencedProperty();
}

View File

@ -19,10 +19,10 @@
package org.apache.olingo.odata4.server.api.uri;
public interface UriResource {
UriResourceKind getKind();
@Override
String toString();
}

View File

@ -21,7 +21,7 @@ package org.apache.olingo.odata4.server.api.uri;
import org.apache.olingo.odata4.commons.api.edm.EdmAction;
import org.apache.olingo.odata4.commons.api.edm.EdmActionImport;
public interface UriResourceAction extends UriResourcePartTyped {
public interface UriResourceAction extends UriResourcePartTyped {
EdmAction getAction();

View File

@ -21,7 +21,7 @@ package org.apache.olingo.odata4.server.api.uri;
import org.apache.olingo.odata4.commons.api.edm.EdmComplexType;
public interface UriResourceComplexProperty extends UriResourceProperty {
EdmComplexType getComplexType();
EdmComplexType getComplexTypeFilter();

View File

@ -22,9 +22,9 @@ import org.apache.olingo.odata4.commons.api.edm.EdmType;
/**
* Class indicating the $it reference. $it may be used within filter to
* refer to the last EDM object reference in the resource path. Since $it is
* optional in some cases ( e.g. first member expressions) the {@link #isExplicitIt()}
* method can be used to check if $it was explicitly noted in the URI
* refer to the last EDM object reference in the resource path. Since $it is
* optional in some cases ( e.g. first member expressions) the {@link #isExplicitIt()} method can be used to check if
* $it was explicitly noted in the URI
*/
public interface UriResourceIt extends UriResourcePartTyped {

View File

@ -21,5 +21,5 @@ package org.apache.olingo.odata4.server.api.uri;
public enum UriResourceKind {
action, complexProperty, count, entitySet, function, it, lambdaAll, lambdaAny,
lambdaVariable, navigationProperty, ref, root, primitiveProperty, singleton, startingTypeFilter, value,
lambdaVariable, navigationProperty, ref, root, primitiveProperty, singleton, startingTypeFilter, value,
}

View File

@ -21,10 +21,9 @@ package org.apache.olingo.odata4.server.api.uri;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
public interface UriResourceLambdaAll extends UriResourcePartTyped {
public String getLamdaVariable();
public Expression getExpression();
}
}

View File

@ -21,9 +21,9 @@ package org.apache.olingo.odata4.server.api.uri;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
public interface UriResourceLambdaAny extends UriResourcePartTyped {
public String getLamdaVariable();
public Expression getExpression();
}

View File

@ -18,9 +18,8 @@
******************************************************************************/
package org.apache.olingo.odata4.server.api.uri;
public interface UriResourceLambdaRef extends UriResourcePartTyped {
public String getVariableText();
public String getVariableText();
}

View File

@ -32,5 +32,5 @@ public interface UriResourceNavigation extends UriResourcePartTyped {
EdmType getTypeFilterOnCollection();
EdmType getTypeFilterOnEntry();
}

View File

@ -22,11 +22,11 @@ package org.apache.olingo.odata4.server.api.uri;
import org.apache.olingo.odata4.commons.api.edm.EdmType;
public interface UriResourcePartTyped extends UriResource {
EdmType getType();
boolean isCollection();
String toString(boolean includeFilters);
}

View File

@ -21,7 +21,7 @@ package org.apache.olingo.odata4.server.api.uri;
import org.apache.olingo.odata4.commons.api.edm.EdmProperty;
public interface UriResourceProperty extends UriResourcePartTyped {
EdmProperty getProperty();
}

View File

@ -28,5 +28,5 @@ public interface UriResourceSingleton extends UriResourcePartTyped {
EdmEntityType getEntityType();
EdmEntityType getEntityTypeFilter();
}

View File

@ -25,5 +25,5 @@ public interface UriResourceStartingTypeFilter extends UriResourcePartTyped {
EdmType getTypeFilterOnCollection();
EdmType getTypeFilterOnEntry();
}

View File

@ -21,7 +21,7 @@ package org.apache.olingo.odata4.server.api.uri.queryoption;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
public interface AliasQueryOption extends QueryOption {
public Expression getValue();
}

View File

@ -20,6 +20,6 @@ package org.apache.olingo.odata4.server.api.uri.queryoption;
public class ExceptionVisitExpand extends Exception {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
}

View File

@ -21,7 +21,7 @@ package org.apache.olingo.odata4.server.api.uri.queryoption;
import java.util.List;
public interface ExpandOption extends SystemQueryOption {
List<ExpandItem> getExpandItems();
}

View File

@ -21,6 +21,6 @@ package org.apache.olingo.odata4.server.api.uri.queryoption;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
public interface FilterOption extends SystemQueryOption {
Expression getExpression();
}

View File

@ -19,7 +19,7 @@
package org.apache.olingo.odata4.server.api.uri.queryoption;
public interface FormatOption extends SystemQueryOption {
// TODO Select best representation for format
String getFormat();
}

View File

@ -19,7 +19,7 @@
package org.apache.olingo.odata4.server.api.uri.queryoption;
public interface IdOption extends SystemQueryOption {
String getValue();
}

View File

@ -19,7 +19,7 @@
package org.apache.olingo.odata4.server.api.uri.queryoption;
public interface InlineCountOption extends SystemQueryOption {
boolean getValue();
}

View File

@ -23,5 +23,5 @@ public interface QueryOption {
public String getName();
public String getText();
}

View File

@ -23,5 +23,5 @@ import org.apache.olingo.odata4.server.api.uri.queryoption.search.SearchExpressi
public interface SearchOption extends SystemQueryOption {
SearchExpression getSearchExpression();
}

View File

@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata4.server.api.uri.queryoption;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.apache.olingo.odata4.server.api.uri.UriInfoResource;
public interface SelectItem {
@ -30,5 +30,5 @@ public interface SelectItem {
FullQualifiedName getAllOperationsInSchemaNameSpace();
UriInfoResource getResourceInfo();
}

View File

@ -19,7 +19,7 @@
package org.apache.olingo.odata4.server.api.uri.queryoption;
public interface TopOption extends SystemQueryOption {
String getValue();
}

View File

@ -18,8 +18,8 @@
******************************************************************************/
package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
public interface AliasExpression extends Expression {
public interface AliasExpression extends Expression {
public String getParameterName();
}

View File

@ -25,6 +25,7 @@ import org.apache.olingo.odata4.commons.api.edm.EdmEnumType;
public interface Enumeration extends Expression {
public List<String> getValues();
public EdmEnumType getType();
}

View File

@ -20,9 +20,9 @@ package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
import java.util.List;
import org.apache.olingo.odata4.commons.api.ODataApplicationException;
import org.apache.olingo.odata4.commons.api.edm.EdmEnumType;
import org.apache.olingo.odata4.commons.api.edm.EdmType;
import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException;
import org.apache.olingo.odata4.server.api.uri.UriInfoResource;
public interface ExpressionVisitor<T> {
@ -35,8 +35,8 @@ public interface ExpressionVisitor<T> {
T visitMethodCall(SupportedMethodCalls methodCall, List<T> parameters)
throws ExceptionVisitExpression, ODataApplicationException;
T visitLambdaExpression(String functionText,String variableText, Expression expression)
T visitLambdaExpression(String functionText, String variableText, Expression expression)
throws ExceptionVisitExpression, ODataApplicationException;
T visitLiteral(String literal) throws ExceptionVisitExpression, ODataApplicationException;
@ -50,7 +50,7 @@ public interface ExpressionVisitor<T> {
T visitLambdaReference(String variableText) throws ExceptionVisitExpression, ODataApplicationException;
T visitEnum(EdmEnumType type, List<String> enumValues) throws ExceptionVisitExpression, ODataApplicationException;
T visitConstant(SupportedConstants kind) throws ExceptionVisitExpression, ODataApplicationException;
}

View File

@ -26,7 +26,7 @@ public interface Member extends Expression {
public UriInfoResource getPath();
public EdmType getType();
public boolean isCollection();
}

View File

@ -19,8 +19,8 @@
package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
public enum SupportedBinaryOperators {
//enum
// enum
HAS("has"),
// multiplicative
MUL("mul"), DIV("div"), MOD("mod"),

View File

@ -19,11 +19,11 @@
package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
public enum SupportedConstants {
TRUE("true"),
FALSE("false"),
NULL("null");
private String syntax;
private SupportedConstants(final String syntax) {

View File

@ -46,7 +46,7 @@ public enum SupportedMethodCalls {
public static SupportedMethodCalls get(final String method) {
for (SupportedMethodCalls op : SupportedMethodCalls.values()) {
if (op.toString().equals(method )) {
if (op.toString().equals(method)) {
return op;
}
}

View File

@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException;
import org.apache.olingo.odata4.commons.api.ODataApplicationException;
public interface VisitableExression {
@ -27,7 +27,7 @@ public interface VisitableExression {
* each expression used as node in an expression tree. The implementations should
* behave as follows:
* <li>Call accept on all sub nodes and store the returned Objects which are of the generic type T
* <li>Call the appropriate method on the {@link ExpressionVisitor} instance and provide the stored return objects
* <li>Call the appropriate method on the {@link ExpressionVisitor} instance and provide the stored return objects
* to that instance
* <li>Return the object which should be passed to the processing algorithm of the parent expression node
* <br>

View File

@ -25,5 +25,5 @@ public interface SearchBinary extends SearchExpression {
SearchExpression getLeftOperand();
SearchExpression getRightOperand();
}

View File

@ -19,7 +19,7 @@
package org.apache.olingo.odata4.server.api.uri.queryoption.search;
public interface SearchTerm extends SearchExpression {
String getSearchTerm();
}

View File

@ -19,7 +19,7 @@
package org.apache.olingo.odata4.server.api.uri.queryoption.search;
public interface SearchUnary {
SearchExpression getOperand();
}

View File

@ -27,7 +27,7 @@ public enum SupportedSearchBinaryOperators {
private SupportedSearchBinaryOperators(final String syntax) {
this.syntax = syntax;
}
@Override
public String toString() {
return syntax;
@ -42,5 +42,4 @@ public enum SupportedSearchBinaryOperators {
return null;
}
}

View File

@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.EdmAction;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind;
import org.apache.olingo.odata4.commons.api.edm.provider.Action;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.server.api.edm.provider.Action;
public class EdmActionImpl extends EdmOperationImpl implements EdmAction {

View File

@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.EdmAction;
import org.apache.olingo.odata4.commons.api.edm.EdmActionImport;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.odata4.commons.api.edm.provider.ActionImport;
import org.apache.olingo.odata4.server.api.edm.provider.ActionImport;
public class EdmActionImportImpl extends EdmOperationImportImpl implements EdmActionImport {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import java.util.List;
@ -24,9 +24,9 @@ import org.apache.olingo.odata4.commons.api.edm.EdmBindingTarget;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityType;
import org.apache.olingo.odata4.commons.api.edm.EdmException;
import org.apache.olingo.odata4.commons.api.edm.provider.BindingTarget;
import org.apache.olingo.odata4.commons.api.edm.provider.NavigationPropertyBinding;
import org.apache.olingo.odata4.commons.api.edm.provider.Target;
import org.apache.olingo.odata4.server.api.edm.provider.BindingTarget;
import org.apache.olingo.odata4.server.api.edm.provider.NavigationPropertyBinding;
import org.apache.olingo.odata4.server.api.edm.provider.Target;
public abstract class EdmBindingTargetImpl extends EdmNamedImpl implements EdmBindingTarget {

View File

@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.EdmComplexType;
import org.apache.olingo.odata4.commons.api.edm.EdmException;
import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind;
import org.apache.olingo.odata4.commons.api.edm.provider.ComplexType;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.server.api.edm.provider.ComplexType;
public class EdmComplexTypeImpl extends EdmStructuralTypeImpl implements EdmComplexType {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.EdmElement;

View File

@ -16,25 +16,25 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import java.util.HashMap;
import java.util.Map;
import org.apache.olingo.odata4.commons.api.ODataException;
import org.apache.olingo.odata4.commons.api.edm.EdmActionImport;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet;
import org.apache.olingo.odata4.commons.api.edm.EdmException;
import org.apache.olingo.odata4.commons.api.edm.EdmFunctionImport;
import org.apache.olingo.odata4.commons.api.edm.EdmSingleton;
import org.apache.olingo.odata4.commons.api.edm.provider.ActionImport;
import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
import org.apache.olingo.odata4.commons.api.edm.provider.EntityContainerInfo;
import org.apache.olingo.odata4.commons.api.edm.provider.EntitySet;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.provider.FunctionImport;
import org.apache.olingo.odata4.commons.api.edm.provider.Singleton;
import org.apache.olingo.odata4.commons.api.exception.ODataException;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.apache.olingo.odata4.server.api.edm.provider.ActionImport;
import org.apache.olingo.odata4.server.api.edm.provider.EdmProvider;
import org.apache.olingo.odata4.server.api.edm.provider.EntityContainerInfo;
import org.apache.olingo.odata4.server.api.edm.provider.EntitySet;
import org.apache.olingo.odata4.server.api.edm.provider.FunctionImport;
import org.apache.olingo.odata4.server.api.edm.provider.Singleton;
public class EdmEntityContainerImpl extends EdmNamedImpl implements EdmEntityContainer {

View File

@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet;
import org.apache.olingo.odata4.commons.api.edm.provider.EntitySet;
import org.apache.olingo.odata4.server.api.edm.provider.EntitySet;
public class EdmEntitySetImpl extends EdmBindingTargetImpl implements EdmEntitySet {

View File

@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import java.net.URI;
import org.apache.olingo.odata4.commons.api.edm.EdmEntitySetInfo;
import org.apache.olingo.odata4.commons.api.edm.EdmException;
import org.apache.olingo.odata4.commons.api.edm.provider.EntityContainer;
import org.apache.olingo.odata4.commons.api.edm.provider.EntitySet;
import org.apache.olingo.odata4.server.api.edm.provider.EntityContainer;
import org.apache.olingo.odata4.server.api.edm.provider.EntitySet;
public class EdmEntitySetInfoImpl implements EdmEntitySetInfo {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import java.util.ArrayList;
import java.util.HashMap;
@ -26,10 +26,10 @@ import org.apache.olingo.odata4.commons.api.edm.EdmEntityType;
import org.apache.olingo.odata4.commons.api.edm.EdmException;
import org.apache.olingo.odata4.commons.api.edm.EdmKeyPropertyRef;
import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind;
import org.apache.olingo.odata4.commons.api.edm.provider.EntityType;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.provider.PropertyRef;
import org.apache.olingo.odata4.server.api.edm.provider.EntityType;
import org.apache.olingo.odata4.server.api.edm.provider.PropertyRef;
public class EdmEntityTypeImpl extends EdmStructuralTypeImpl implements EdmEntityType {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.commons.core.edm.provider;
package org.apache.olingo.odata4.server.core.edm.provider;
import java.util.ArrayList;
import java.util.List;
@ -25,11 +25,11 @@ import org.apache.olingo.odata4.commons.api.edm.EdmEnumType;
import org.apache.olingo.odata4.commons.api.edm.EdmMember;
import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind;
import org.apache.olingo.odata4.commons.api.edm.provider.EnumType;
import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmInt64;
import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind;
import org.apache.olingo.odata4.server.api.edm.provider.EnumType;
public class EdmEnumImpl extends EdmNamedImpl implements EdmEnumType {

Some files were not shown because too many files have changed in this diff Show More