You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2013/09/24 14:43:00 UTC
[33/51] [partial] Refactored project structure
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
deleted file mode 100644
index 5570f67..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
+++ /dev/null
@@ -1,36 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmElement is the base interface for {@link EdmParameter} and {@link EdmProperty} and provides
- * the information by which facets further specialize the usage of the type.
- *
- */
-public interface EdmElement extends EdmMappable, EdmTyped {
-
- /**
- * Get the facet information for an element
- *
- * @return {@link EdmFacets}
- * @throws EdmException
- */
- EdmFacets getFacets() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
deleted file mode 100644
index b953680..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
+++ /dev/null
@@ -1,63 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * A CSDL EntityContainer element
- *
- * <p>EdmEntityContainer hold the information of EntitySets, FunctionImports and AssociationSets contained
- *
- */
-public interface EdmEntityContainer extends EdmNamed {
-
- /**
- * @return <b>boolean</b> true if this is the default container
- */
- boolean isDefaultEntityContainer();
-
- /**
- * Get contained EntitySet by name
- *
- * @param name
- * @return {@link EdmEntitySet}
- * @throws EdmException
- */
- EdmEntitySet getEntitySet(String name) throws EdmException;
-
- /**
- * Get contained FunctionImport by name
- *
- * @param name
- * @return {@link EdmFunctionImport}
- * @throws EdmException
- */
- EdmFunctionImport getFunctionImport(String name) throws EdmException;
-
- /**
- * Get contained AssociationSet by providing the source entity set and the navigation property
- *
- * @param sourceEntitySet of type {@link EdmEntitySet}
- * @param navigationProperty of type {@link EdmNavigationProperty}
- * @return {@link EdmAssociationSet}
- * @throws EdmException
- */
- EdmAssociationSet getAssociationSet(EdmEntitySet sourceEntitySet, EdmNavigationProperty navigationProperty)
- throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
deleted file mode 100644
index f097be5..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
+++ /dev/null
@@ -1,53 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * A CSDL EntitySet element
- * <p>EdmEntitySet is the container for entity type instances as described in the OData protocol.
- *
- */
-public interface EdmEntitySet extends EdmMappable, EdmNamed {
-
- /**
- * Get the entity type
- *
- * @return {@link EdmEntityType}
- * @throws EdmException
- */
- EdmEntityType getEntityType() throws EdmException;
-
- /**
- * Get the related entity set by providing the navigation property
- *
- * @param navigationProperty of type {@link EdmNavigationProperty}
- * @return {@link EdmEntitySet}
- * @throws EdmException
- */
- EdmEntitySet getRelatedEntitySet(EdmNavigationProperty navigationProperty) throws EdmException;
-
- /**
- * Get the entity container the entity set is contained in
- *
- * @return {@link EdmEntityContainer}
- * @throws EdmException
- */
- EdmEntityContainer getEntityContainer() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
deleted file mode 100644
index d18e3f5..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
+++ /dev/null
@@ -1,53 +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.odata2.api.edm;
-
-import java.net.URI;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * Objects of this class contain information about one entity set inside the EntityDataModel.
- *
- *
- */
-public interface EdmEntitySetInfo {
-
- /**
- * @return the entity container name which contains this entity set.
- */
- public String getEntityContainerName();
-
- /**
- * @return the entity set name
- */
- public String getEntitySetName();
-
- /**
- * @return true if this entity set is contained inside the default container
- */
- public boolean isDefaultEntityContainer();
-
- /**
- * We use a {@link URI} object here to ensure the right encoding. If a string representation is needed the
- * toASCIIString() method can be used.
- * @return the uri to this entity set e.g. "Employees"
- */
- public URI getEntitySetUri();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
deleted file mode 100644
index 6f1a907..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
+++ /dev/null
@@ -1,71 +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.odata2.api.edm;
-
-import java.util.List;
-
-/**
- * <p>A CSDL EntityType element.</p>
- * <p>EdmEntityType holds a set of related information like {@link EdmSimpleType} properties and {@link EdmComplexType}
- * properties and in addition to a {@link EdmComplexType complex type} it provides information about key properties,
- * customizable feed mappings and {@link EdmNavigationProperty navigation properties}.
- *
- * @org.apache.olingo.odata2.DoNotImplement
- */
-public interface EdmEntityType extends EdmStructuralType {
-
- /**
- * Gets all key property names.
- * @return collection of key property names of type List<String>
- * @throws EdmException
- */
- List<String> getKeyPropertyNames() throws EdmException;
-
- /**
- * Get all key properties as list of {@link EdmProperty}.
- * @return collection of key properties of type List<EdmProperty>
- * @throws EdmException
- */
- List<EdmProperty> getKeyProperties() throws EdmException;
-
- /**
- * Indicates if the entity type is treated as Media Link Entry
- * with associated Media Resource.
- * @return <code>true</code> if the entity type is a Media Link Entry
- * @throws EdmException
- */
- boolean hasStream() throws EdmException;
-
- @Override
- EdmEntityType getBaseType() throws EdmException;
-
- /**
- * Gets the Customizable Feed Mappings of the entity type.
- * @return {@link EdmCustomizableFeedMappings}
- * @throws EdmException
- */
- EdmCustomizableFeedMappings getCustomizableFeedMappings() throws EdmException;
-
- /**
- * Gets all navigation property names.
- * @return collection of navigation properties of type List<String>
- * @throws EdmException
- */
- List<String> getNavigationPropertyNames() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
deleted file mode 100644
index 5c828cc..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
+++ /dev/null
@@ -1,52 +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.odata2.api.edm;
-
-import org.apache.olingo.odata2.api.exception.MessageReference;
-import org.apache.olingo.odata2.api.exception.ODataMessageException;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * An exception for problems regarding the Entity Data Model.
- *
- */
-public class EdmException extends ODataMessageException {
-
- private static final long serialVersionUID = 1L;
-
- public static final MessageReference COMMON = createMessageReference(EdmException.class, "COMMON");
- public static final MessageReference PROVIDERPROBLEM = createMessageReference(EdmException.class, "PROVIDERPROBLEM");
-
- public EdmException(final MessageReference messageReference) {
- super(messageReference);
- }
-
- public EdmException(final MessageReference messageReference, final Throwable cause) {
- super(messageReference, cause);
- }
-
- public EdmException(final MessageReference messageReference, final String errorCode) {
- super(messageReference, errorCode);
- }
-
- public EdmException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
- super(messageReference, cause, errorCode);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
deleted file mode 100644
index 6832fb6..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
+++ /dev/null
@@ -1,91 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * <p>A Facet is an element defined in CSDL that provides information
- * that specializes the usage of a type.</p>
- *
- */
-public interface EdmFacets {
-
- /**
- * Get the information if the type in use is nullable
- *
- * @return <code>true</code> if the type in use is nullable
- */
- Boolean isNullable();
-
- /**
- * Get the default value of the type in use
- *
- * @return a default value of the type in use as String
- */
- String getDefaultValue();
-
- /**
- * Get the maximum length of the type in use
- *
- * @return the maximum length of the type in use as Integer
- */
- Integer getMaxLength();
-
- /**
- * Get the information if the type in has a fixed length
- *
- * @return <code>true</code> if the type in use has a fixed length
- */
- Boolean isFixedLength();
-
- /**
- * Get the precision of the type in use
- *
- * @return the precision of the type in use as Integer
- */
- Integer getPrecision();
-
- /**
- * Get the scale of the type in use
- *
- * @return the scale of the type in use as Integer
- */
- Integer getScale();
-
- /**
- * Get the information if UNICODE or ASCII characters are used. Default is UNICODE.
- *
- * @return <code>true</code> if UNICODE characters are used
- */
- Boolean isUnicode();
-
- /**
- * Get the sorting sequence to be used.
- *
- * @return the sorting sequence as String
- */
- String getCollation();
-
- /**
- * Get the information if the value of the type in use should be used for optimistic concurrency checks.
- *
- * @return {@link EdmConcurrencyMode}
- */
- EdmConcurrencyMode getConcurrencyMode();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
deleted file mode 100644
index 6b5fa4f..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
+++ /dev/null
@@ -1,78 +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.odata2.api.edm;
-
-import java.util.Collection;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * A CSDL FunctionImport element
- *
- * EdmFunctionImport can be used model functions which have input parameters, an associated HTTP Method
- * and a return type which can be of different kinds:
- *
- * <li>{@link EdmSimpleType} or a collection of simple types
- * <li>{@link EdmEntityType} or a collection of entity types
- * <li>{@link EdmEntitySet}
- *
- */
-public interface EdmFunctionImport extends EdmMappable, EdmNamed {
-
- /**
- * Get the parameter by name
- * @param name
- * @return {@link EdmParameter}
- * @throws EdmException
- */
- EdmParameter getParameter(String name) throws EdmException;
-
- /**
- * Get all parameter names
- * @return collection of parameter names of type Collection<String>
- * @throws EdmException
- */
- Collection<String> getParameterNames() throws EdmException;
-
- /**
- * Get the edm entity set
- * @return {@link EdmEntitySet}
- * @throws EdmException
- */
- EdmEntitySet getEntitySet() throws EdmException;
-
- /**
- * Get the HTTP Method
- * @return HTTP Method as String
- * @throws EdmException
- */
- String getHttpMethod() throws EdmException;
-
- /**
- * @return {@link EdmTyped}
- * @throws EdmException
- */
- EdmTyped getReturnType() throws EdmException;
-
- /**
- * Get the entity container the function import is contained in
- * @return {@link EdmEntityContainer}
- * @throws EdmException
- */
- EdmEntityContainer getEntityContainer() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
deleted file mode 100644
index e788d76..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
+++ /dev/null
@@ -1,66 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * <p>Representation of a simple-typed literal</p>
- * <p>The literal is in default representation. The URI representation differs
- * from the default representation mainly in the additional presence of type
- * indicators (prefixes or suffixes, respectively); since the type information
- * is stored here separately, the default representation is more appropriate.
- * Should the URI representation be needed, it can be re-created by calling {@link EdmSimpleType#toUriLiteral}.</p>
- *
- * @see EdmLiteralKind
- */
-public final class EdmLiteral {
- private final EdmSimpleType type;
- private final String literal;
-
- /**
- * Creates an {@link EdmLiteral} object out of the simple type and the literal string.
- * @param type {@link EdmSimpleType} simple type
- * @param literal String literal in default (<em>not</em> URI) representation
- */
- public EdmLiteral(final EdmSimpleType type, final String literal) {
- this.type = type;
- this.literal = literal;
- }
-
- /**
- * Gets the simple type of the literal.
- * @return {@link EdmSimpleType} object
- */
- public EdmSimpleType getType() {
- return type;
- }
-
- /**
- * Gets the literal String.
- * @return {@link String} literal in default (<em>not</em> URI) representation
- */
- public String getLiteral() {
- return literal;
- }
-
- @Override
- public String toString() {
- return "type=" + type + ", literal=" + literal;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
deleted file mode 100644
index 0d21f52..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
+++ /dev/null
@@ -1,53 +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.odata2.api.edm;
-
-import org.apache.olingo.odata2.api.exception.MessageReference;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * Exception for violation of the OData URI construction rules, resulting in a 400 Bad Request response
- *
- */
-public class EdmLiteralException extends EdmException {
-
- private static final long serialVersionUID = 1L;
-
- public static final MessageReference NOTEXT = createMessageReference(EdmLiteralException.class, "NOTEXT");
- public static final MessageReference LITERALFORMAT = createMessageReference(EdmLiteralException.class,
- "LITERALFORMAT");
- public static final MessageReference UNKNOWNLITERAL = createMessageReference(EdmLiteralException.class,
- "UNKNOWNLITERAL");
-
- public EdmLiteralException(final MessageReference MessageReference) {
- super(MessageReference);
- }
-
- public EdmLiteralException(final MessageReference messageReference, final Throwable cause) {
- super(messageReference, cause);
- }
-
- public EdmLiteralException(final MessageReference MessageReference, final String errorCode) {
- super(MessageReference, errorCode);
- }
-
- public EdmLiteralException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
- super(messageReference, cause, errorCode);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
deleted file mode 100644
index b4d34a0..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
+++ /dev/null
@@ -1,29 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmLiteralKind indicates the format of an EDM literal.
- *
- */
-public enum EdmLiteralKind {
-
- DEFAULT, URI, JSON;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
deleted file mode 100644
index 9d14e16..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
+++ /dev/null
@@ -1,35 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmMappable can be applied to CSDL elements to associate additional information.
- *
- */
-public interface EdmMappable {
-
- /**
- * Get mapping information applied to an EDM element
- *
- * @return {@link EdmMapping}
- * @throws EdmException
- */
- EdmMapping getMapping() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
deleted file mode 100644
index 750b407..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
+++ /dev/null
@@ -1,48 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmMapping holds custom mapping information which can be applied to a CSDL element.
- *
- */
-public interface EdmMapping {
-
- /**
- * Get the mapping value
- *
- * @return mapping name as String
- */
- String getInternalName();
-
- /**
- * Get the mapping name for mime type lookup
- *
- * @return mapping name as String
- */
- String getMimeType();
-
- /**
- * Get the set object for this mapping
- *
- * @return {@link Object} object
- */
- Object getObject();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
deleted file mode 100644
index e38ffb2..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
+++ /dev/null
@@ -1,64 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * <p>EdmMultiplicity indicates the number of entity type instances
- * an association end can relate to:
- * <dl>
- * <dt>0..1</dt><dd>one or none</dd>
- * <dt> 1</dt><dd>exactly one</dd>
- * <dt> *</dt><dd>many</dd>
- * </dl></p>
- *
- */
-public enum EdmMultiplicity {
-
- ZERO_TO_ONE("0..1"), MANY("*"), ONE("1");
-
- private final String literal;
-
- private EdmMultiplicity(final String literal) {
- this.literal = literal;
- }
-
- /**
- * Gets the multiplicity for a given name.
- * @param literal
- * @return {@link EdmMultiplicity}
- */
- public static EdmMultiplicity fromLiteral(final String literal) {
- for (final EdmMultiplicity edmMultiplicity : EdmMultiplicity.values()) {
- if (edmMultiplicity.toString().equals(literal)) {
- return edmMultiplicity;
- }
- }
- throw new IllegalArgumentException("Invalid literal " + literal);
- }
-
- /**
- * Returns the OData literal form of this multiplicity.
- * @return the OData literal form of this multiplicity
- */
- @Override
- public String toString() {
- return literal;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
deleted file mode 100644
index 22ca834..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
+++ /dev/null
@@ -1,33 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmName is the base interface for nearly all CSDL constructs.
- *
- */
-public interface EdmNamed {
-
- /**
- * @return name as String
- * @throws EdmException
- */
- String getName() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
deleted file mode 100644
index 293c009..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
+++ /dev/null
@@ -1,53 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * A CSDL NavigationProperty element
- *
- * <p>EdmNavigationProperty allows navigation from one entity type to another via a relationship.
- *
- */
-public interface EdmNavigationProperty extends EdmTyped, EdmMappable {
-
- /**
- * Get the relationship of the navigation property
- *
- * @return {@link EdmAssociation}
- * @throws EdmException
- */
- EdmAssociation getRelationship() throws EdmException;
-
- /**
- * Get the from role of the navigation property
- *
- * @return from role as String
- * @throws EdmException
- */
- String getFromRole() throws EdmException;
-
- /**
- * Get the to role of the navigation property
- *
- * @return to role as String
- * @throws EdmException
- */
- String getToRole() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
deleted file mode 100644
index fc1d6b2..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
+++ /dev/null
@@ -1,30 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * A CSDL FunctionImportParameter element
- * <p>EdmParameter defines a function import parameter (which is used as input parameter). FunctionImports are described
- * in {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport} or in the OData protocol.
- *
- */
-public interface EdmParameter extends EdmElement {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
deleted file mode 100644
index a81367b..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
+++ /dev/null
@@ -1,51 +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.odata2.api.edm;
-
-/**
- * A CSDL Property element
- * <p>EdmProperty defines a simple type or a complex type.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface EdmProperty extends EdmElement {
-
- /**
- * Get customizable feed mappings for this property
- *
- * @return {@link EdmCustomizableFeedMappings}
- * @throws EdmException
- */
- EdmCustomizableFeedMappings getCustomizableFeedMappings() throws EdmException;
-
- /**
- * Get the related mime type for the property
- *
- * @return mime type as String
- * @throws EdmException
- */
- String getMimeType() throws EdmException;
-
- /**
- * Get the info if the property is a simple property
- *
- * @return true, if it is a simple property
- */
- boolean isSimple();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java
deleted file mode 100644
index ffe51c6..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraint.java
+++ /dev/null
@@ -1,41 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * A CSDL ReferentialConstraint element
- *
- */
-public interface EdmReferentialConstraint {
-
- /**
- * Get the principal end element
- * @return {@link EdmReferentialConstraintRole}
- * @throws EdmException
- */
- public EdmReferentialConstraintRole getPrincipal() throws EdmException;
-
- /**
- * Get the dependent end element
- * @return {@link EdmReferentialConstraintRole}
- * @throws EdmException
- */
- public EdmReferentialConstraintRole getDependent() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java
deleted file mode 100644
index c7b8a31..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmReferentialConstraintRole.java
+++ /dev/null
@@ -1,41 +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.odata2.api.edm;
-
-import java.util.List;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * <p>EdmReferentialConstraintRole indicates the role of the association end
- *
- */
-public interface EdmReferentialConstraintRole {
-
- /**
- * Get the role
- * @return a role as String
- */
- public String getRole();
-
- /**
- * Get the properties
- * @return a list of names of the properties
- */
- public List<String> getPropertyRefNames();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
deleted file mode 100644
index 9b5b770..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
+++ /dev/null
@@ -1,52 +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.odata2.api.edm;
-
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * This interface gives access to the metadata of a service, the calculated Data Service Version and an info list of all
- * entity sets inside this EntityDataModel.
- *
- *
- */
-public interface EdmServiceMetadata {
-
- /**
- * @return {@link InputStream} containing the metadata document
- * @throws ODataException
- */
- InputStream getMetadata() throws ODataException;
-
- /**
- * @return <b>String</b> data service version of this service
- * @throws ODataException
- */
- String getDataServiceVersion() throws ODataException;
-
- /**
- * @return a list of {@link EdmEntitySetInfo} objects of all entity sets in this data model
- * @throws ODataException
- */
- List<EdmEntitySetInfo> getEntitySetInfos() throws ODataException;;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
deleted file mode 100644
index 99da498..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
+++ /dev/null
@@ -1,163 +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.odata2.api.edm;
-
-/**
- * <p>EdmSimpleType is a primitive type as defined in the Entity Data Model (EDM).</p>
- * <p>There are methods to convert EDM simple types from and to Java objects, respectively.
- * The following Java types are supported:
- * <table frame="hsides" rules="groups">
- * <thead>
- * <tr><th>EDM simple type</th><th>Java types</th></tr>
- * </thead>
- * <tbody>
- * <tr><td>Binary</td><td>byte[], {@link Byte}[]</td></tr>
- * <tr><td>Boolean</td><td>{@link Boolean}</td></tr>
- * <tr><td>Byte</td><td>{@link Short}, {@link Byte}, {@link Integer}, {@link Long}</td></tr>
- * <tr><td>DateTime</td><td>{@link java.util.Calendar}, {@link java.util.Date}, {@link Long}</td></tr>
- * <tr><td>DateTimeOffset</td><td>{@link java.util.Calendar}, {@link java.util.Date}, {@link Long}</td></tr>
- * <tr><td>Decimal</td><td>{@link java.math.BigDecimal}, {@link java.math.BigInteger}, {@link Double}, {@link Float},
- * {@link Byte}, {@link Short}, {@link Integer}, {@link Long}</td></tr>
- * <tr><td>Double</td><td>{@link Double}, {@link Float}, {@link java.math.BigDecimal}, {@link Byte}, {@link Short},
- * {@link Integer}, {@link Long}</td></tr>
- * <tr><td>Guid</td><td>{@link java.util.UUID}</td></tr>
- * <tr><td>Int16</td><td>{@link Short}, {@link Byte}, {@link Integer}, {@link Long}</td></tr>
- * <tr><td>Int32</td><td>{@link Integer}, {@link Byte}, {@link Short}, {@link Long}</td></tr>
- * <tr><td>Int64</td><td>{@link Long}, {@link Byte}, {@link Short}, {@link Integer}, {@link java.math.BigInteger}
- * </td></tr>
- * <tr><td>SByte</td><td>{@link Byte}, {@link Short}, {@link Integer}, {@link Long}</td></tr>
- * <tr><td>Single</td><td>{@link Float}, {@link Double}, {@link java.math.BigDecimal}, {@link Byte}, {@link Short},
- * {@link Integer}, {@link Long}</td></tr>
- * <tr><td>String</td><td>{@link String}</td></tr>
- * <tr><td>Time</td><td>{@link java.util.Calendar}, {@link java.util.Date}, {@link Long}</td></tr>
- * </tbody>
- * </table></p>
- * <p>The first Java type is the default type for the respective EDM simple type.</p>
- * <p>For all EDM simple types, the {@link EdmFacets facet} <code>Nullable</code> is
- * taken into account.
- * For <code>Binary</code>, <code>MaxLength</code> is also applicable.
- * For <code>String</code>, the facets <code>MaxLength</code> and <code>Unicode</code>
- * are also considered.
- * The EDM simple types <code>DateTime</code>, <code>DateTimeOffset</code>, and
- * <code>Time</code> can have a <code>Precision</code> facet.
- * <code>Decimal</code> can have the facets <code>Precision</code> and <code>Scale</code>.</p>
- * <p>
- * <table frame="box" rules="all">
- * <thead>
- * <tr><th>EDM simple type</th><th>Parsing details</th></tr>
- * </thead>
- * <tbody>
- * <tr><td><b>DateTimeOffset</b></td>
- * <td>
- * When an time string is parsed to an according <code>EdmDateTimeOffset</code> object it is assumed that this time
- * string represents the local time with a timezone set.
- * <br/>
- * As an example, when the following time string <code>"2012-02-29T15:33:00-04:00"</code> is parsed it is assumed that
- * we have the local time ("15:33:00") which is in a timezone with an offset from UTC of "-04:00".
- * Hence the result is a calendar object within the local time (which is "15:33:00") and the according timezone offset
- * ("-04:00") which then results in the UTC time of "19:33:00+00:00" ("15:33:00" - "-04:00" -> "19:33:00 UTC").
- * <br/>
- * As further explanation about our date time handling I reference to the following ISO specification: ISO 8601 -
- * http://en.wikipedia.org/wiki/ISO_8601 and the copied section:
- * Time_offsets_from_UTC - http://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC
- * <blockquote>>
- * The following times all refer to the same moment: "18:30Z", "22:30+04:00", and "15:00-03:30". Nautical time zone
- * letters are not used with the exception of Z.
- * To calculate UTC time one has to subtract the offset from the local time, e.g. for "15:00-03:30" do 15:00 - (-03:30)
- * to get 18:30 UTC.
- * </blockquote>
- * <em>The behavior of our ABAP OData Library and Microsoft examples is the same as described above.</em>
- * </td>
- * </tr>
- * </tbody>
- * </table></p>
- * </p>
- *
- * @org.apache.olingo.odata2.DoNotImplement
- */
-public interface EdmSimpleType extends EdmType {
-
- public static final String EDM_NAMESPACE = "Edm";
- public static final String SYSTEM_NAMESPACE = "System";
-
- /**
- * Checks type compatibility.
- *
- * @param simpleType the {@link EdmSimpleType} to be tested for compatibility
- * @return <code>true</code> if the provided type is compatible to this type
- */
- public boolean isCompatible(EdmSimpleType simpleType);
-
- /**
- * Returns the default Java type for this EDM simple type as described in
- * the documentation of {@link EdmSimpleType}.
- * @return the default Java type
- */
- public Class<?> getDefaultType();
-
- /**
- * Validates literal value.
- *
- * @param value the literal value
- * @param literalKind the kind of literal representation of value
- * @param facets additional constraints for parsing (optional)
- * @return <code>true</code> if the validation is successful
- * @see EdmLiteralKind
- * @see EdmFacets
- */
- public boolean validate(String value, EdmLiteralKind literalKind, EdmFacets facets);
-
- /**
- * Converts literal representation of value to system data type.
- *
- * @param value the literal representation of value
- * @param literalKind the kind of literal representation of value
- * @param facets additional constraints for parsing (optional)
- * @param returnType the class of the returned value; it must be one of the
- * list in the documentation of {@link EdmSimpleType}
- * @return the value as an instance of the class the parameter <code>returnType</code> indicates
- * @see EdmLiteralKind
- * @see EdmFacets
- */
- public <T> T valueOfString(String value, EdmLiteralKind literalKind, EdmFacets facets, Class<T> returnType)
- throws EdmSimpleTypeException;
-
- /**
- * <p>Converts system data type to literal representation of value.</p>
- * <p>Returns <code>null</code> if value is <code>null</code>
- * and the facets allow the <code>null</code> value.</p>
- *
- * @param value the Java value as Object; its type must be one of the list
- * in the documentation of {@link EdmSimpleType}
- * @param literalKind the requested kind of literal representation
- * @param facets additional constraints for formatting (optional)
- * @return literal representation as String
- * @see EdmLiteralKind
- * @see EdmFacets
- */
- public String valueToString(Object value, EdmLiteralKind literalKind, EdmFacets facets) throws EdmSimpleTypeException;
-
- /**
- * Converts default literal representation to URI literal representation.
- *
- * @param literal the literal in default representation
- * @return URI literal representation as String
- */
- public String toUriLiteral(String literal) throws EdmSimpleTypeException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
deleted file mode 100644
index 771623c..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
+++ /dev/null
@@ -1,73 +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.odata2.api.edm;
-
-import org.apache.olingo.odata2.api.exception.MessageReference;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * Exception for parsing errors with {@link EdmSimpleType}s
- *
- */
-public class EdmSimpleTypeException extends EdmException {
-
- private static final long serialVersionUID = 1L;
-
- public static final MessageReference COMMON = createMessageReference(EdmSimpleTypeException.class, "COMMON");
-
- public static final MessageReference LITERAL_KIND_MISSING = createMessageReference(EdmSimpleTypeException.class,
- "LITERAL_KIND_MISSING");
- public static final MessageReference LITERAL_KIND_NOT_SUPPORTED = createMessageReference(
- EdmSimpleTypeException.class, "LITERAL_KIND_NOT_SUPPORTED");
-
- public static final MessageReference LITERAL_NULL_NOT_ALLOWED = createMessageReference(EdmSimpleTypeException.class,
- "LITERAL_NULL_NOT_ALLOWED");
- public static final MessageReference LITERAL_ILLEGAL_CONTENT = createMessageReference(EdmSimpleTypeException.class,
- "LITERAL_ILLEGAL_CONTENT");
- public static final MessageReference LITERAL_FACETS_NOT_MATCHED = createMessageReference(
- EdmSimpleTypeException.class, "LITERAL_FACETS_NOT_MATCHED");
- public static final MessageReference LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE = createMessageReference(
- EdmSimpleTypeException.class, "LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE");
-
- public static final MessageReference VALUE_TYPE_NOT_SUPPORTED = createMessageReference(EdmSimpleTypeException.class,
- "VALUE_TYPE_NOT_SUPPORTED");
- public static final MessageReference VALUE_NULL_NOT_ALLOWED = createMessageReference(EdmSimpleTypeException.class,
- "VALUE_NULL_NOT_ALLOWED");
- public static final MessageReference VALUE_ILLEGAL_CONTENT = createMessageReference(EdmSimpleTypeException.class,
- "VALUE_ILLEGAL_CONTENT");
- public static final MessageReference VALUE_FACETS_NOT_MATCHED = createMessageReference(EdmSimpleTypeException.class,
- "VALUE_FACETS_NOT_MATCHED");
-
- public EdmSimpleTypeException(final MessageReference messageReference) {
- super(messageReference);
- }
-
- public EdmSimpleTypeException(final MessageReference messageReference, final Throwable cause) {
- super(messageReference, cause);
- }
-
- public EdmSimpleTypeException(final MessageReference messageReference, final String errorCode) {
- super(messageReference, errorCode);
- }
-
- public EdmSimpleTypeException(final MessageReference messageReference, final Throwable cause,
- final String errorCode) {
- super(messageReference, cause, errorCode);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
deleted file mode 100644
index 82a82b8..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
+++ /dev/null
@@ -1,46 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * This facade is used as a hook into the core implementation.
- *
- */
-public interface EdmSimpleTypeFacade {
-
- /**
- * IMPORTANT: Use {@link EdmSimpleTypeKind} parseUriLiteral for the implementation.
- * <p>This method definition is used only inside the core of this library.
- * @param uriLiteral
- * @return the parsed literal
- * @throws EdmLiteralException
- */
- public EdmLiteral parseUriLiteral(final String uriLiteral) throws EdmLiteralException;
-
- /**
- * IMPORTANT: Use {@link EdmSimpleTypeKind#getEdmSimpleTypeInstance()} for the application development.
- *
- * <p>This method definition is used only inside the core of this library.</p>
- *
- * @param typeKind for which an instance is requested
- * @return an instance of the corresponding {@link EdmSimpleType} to given {@link EdmSimpleTypeKind}
- */
- public EdmSimpleType getEdmSimpleTypeInstance(final EdmSimpleTypeKind typeKind);
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
deleted file mode 100644
index efd83d8..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
+++ /dev/null
@@ -1,90 +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.odata2.api.edm;
-
-import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmSimpleTypeKind holds all EdmSimpleTypes defined as primitive type in the Entity Data Model (EDM).
- *
- */
-public enum EdmSimpleTypeKind {
-
- Binary, Boolean, Byte, DateTime, DateTimeOffset, Decimal, Double, Guid, Int16, Int32, Int64, SByte, Single, String,
- Time, Null;
-
- /**
- * Returns the {@link FullQualifiedName} for this SimpleTypeKind.
- * @return {@link FullQualifiedName}
- */
- public FullQualifiedName getFullQualifiedName() {
- return new FullQualifiedName(EdmSimpleType.EDM_NAMESPACE, toString());
- }
-
- /**
- * Returns an instance for this {@link EdmSimpleTypeKind} in the form of {@link EdmSimpleType}.
- * @return {@link EdmSimpleType} instance
- */
- public EdmSimpleType getEdmSimpleTypeInstance() {
- return SimpleTypeFacadeHolder.instance.getEdmSimpleTypeInstance(this);
- }
-
- /**
- * <p>Parses a URI literal and determines its EDM simple type on the way.</p>
- * <p>If the literal is <code>null</code> or consists of the literal string
- * "null", the EDM simple type <code>Null</code> is returned.</p>
- * <p>The URI literal syntax of EDM simple types allows two ways of determining
- * the type:
- * <ul>
- * <li>The literal has an explicit type indicator (prefix or suffix).</li>
- * <li>The value is of a type compatible to all other possible types, e.g., "256"
- * could be of type <code>Int16</code> or <code>Int32</code> but all possible
- * values of <code>Int16</code> are also legal values of <code>Int32</code>
- * so callers could promote it to <code>Int32</code> in all cases where they
- * deem it necessary.<br/>
- * For a given literal, always the narrowest possible type is chosen.</li>
- * </ul></p>
- * <p>There are two cases where it is not possible to choose unambiguously
- * a compatible type:
- * <ul>
- * <li><code>0</code> or <code>1</code> could be a number but also a boolean value;
- * therefore, the internal (system) type <code>Bit</code> is used for these values.</li>
- * <li>Integer values between <code>0</code> and <code>127</code> (inclusive) could
- * be of type <code>SByte</code> or <code>Byte</code> both of which are not compatible
- * to the other; therefore, the internal (system) type <code>Uint7</code> is used
- * for these values.</li>
- * </ul></p>
- * @param uriLiteral the literal
- * @return an instance of {@link EdmLiteral}, containing the literal
- * in default String representation and the EDM simple type
- * @throws EdmLiteralException if the literal is malformed
- */
- public static EdmLiteral parseUriLiteral(final String uriLiteral) throws EdmLiteralException {
- return SimpleTypeFacadeHolder.instance.parseUriLiteral(uriLiteral);
- }
-
- /**
- * Cached access to {@link EdmSimpleTypeFacade} which is used i.a. for {@link EdmSimpleType} instance creation
- * or parsing of {@link EdmLiteral}s.
- */
- private static class SimpleTypeFacadeHolder {
- static final EdmSimpleTypeFacade instance = RuntimeDelegate.getSimpleTypeFacade();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
deleted file mode 100644
index 9b92c5e..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
+++ /dev/null
@@ -1,54 +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.odata2.api.edm;
-
-import java.util.List;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmStructuralType is the base for a complex type or an entity type.
- * <p>Complex types and entity types are described in the Conceptual Schema Definition of the OData protocol.
- *
- */
-public interface EdmStructuralType extends EdmMappable, EdmType {
-
- /**
- * Get property by name
- * @param name
- * @return simple or complex property as {@link EdmTyped}
- * @throws EdmException
- */
- EdmTyped getProperty(String name) throws EdmException;
-
- /**
- * Get all property names
- *
- * @return property names as type List<String>
- * @throws EdmException
- */
- List<String> getPropertyNames() throws EdmException;
-
- /**
- * Base types are described in the OData protocol specification.
- *
- * @return {@link EdmStructuralType}
- * @throws EdmException
- */
- EdmStructuralType getBaseType() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
deleted file mode 100644
index f16ba58..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
+++ /dev/null
@@ -1,40 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmTargetPath specifies the possible default targets for an EDM property which is mapped to an atom element.
- *
- */
-public class EdmTargetPath {
-
- public static final String SYNDICATION_AUTHORNAME = "SyndicationAuthorName";
- public static final String SYNDICATION_AUTHOREMAIL = "SyndicationAuthorEmail";
- public static final String SYNDICATION_AUTHORURI = "SyndicationAuthorUri";
- public static final String SYNDICATION_PUBLISHED = "SyndicationPublished";
- public static final String SYNDICATION_RIGHTS = "SyndicationRights";
- public static final String SYNDICATION_TITLE = "SyndicationTitle";
- public static final String SYNDICATION_UPDATED = "SyndicationUpdated";
- public static final String SYNDICATION_CONTRIBUTORNAME = "SyndicationContributorName";
- public static final String SYNDICATION_CONTRIBUTOREMAIL = "SyndicationContributorEmail";
- public static final String SYNDICATION_CONTRIBUTORURI = "SyndicationContributorUri";
- public static final String SYNDICATION_SOURCE = "SyndicationSource";
- public static final String SYNDICATION_SUMMARY = "SyndicationSummary";
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
deleted file mode 100644
index 8eb8b36..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
+++ /dev/null
@@ -1,39 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmType holds the namespace of a given type and its type as {@link EdmTypeKind}.
- *
- */
-public interface EdmType extends EdmNamed {
-
- /**
- * Namespace of this {@link EdmType}
- * @return namespace as String
- * @throws EdmException
- */
- String getNamespace() throws EdmException;
-
- /**
- * @return {@link EdmTypeKind} of this {@link EdmType}
- */
- EdmTypeKind getKind();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
deleted file mode 100644
index b843f63..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
+++ /dev/null
@@ -1,29 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmTypeKind specifies the type of an EDM element.
- *
- */
-public enum EdmTypeKind {
-
- UNDEFINED, SIMPLE, COMPLEX, ENTITY, NAVIGATION, ASSOCIATION, SYSTEM;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
deleted file mode 100644
index 7636a3a..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
+++ /dev/null
@@ -1,43 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * EdmTyped indicates if an EDM element is of a special type and holds the multiplicity of that type.
- *
- */
-public interface EdmTyped extends EdmNamed {
-
- /**
- * See {@link EdmType} for more information about possible types.
- *
- * @return {@link EdmType}
- * @throws EdmException
- */
- EdmType getType() throws EdmException;
-
- /**
- * See {@link EdmMultiplicity} for more information about possible multiplicities.
- *
- * @return {@link EdmMultiplicity}
- * @throws EdmException
- */
- EdmMultiplicity getMultiplicity() throws EdmException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
deleted file mode 100644
index dfb6d15..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
+++ /dev/null
@@ -1,75 +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.odata2.api.edm;
-
-/**
- * @org.apache.olingo.odata2.DoNotImplement
- * A full qualified name of any element in the EDM consists of a name and a namespace.
- *
- */
-public class FullQualifiedName {
-
- private final String namespace;
- private final String name;
-
- /**
- * @param namespace
- * @param name
- */
- public FullQualifiedName(final String namespace, final String name) {
- this.namespace = namespace;
- this.name = name;
- }
-
- /**
- * @return namespace
- */
- public String getNamespace() {
- return namespace;
- }
-
- /**
- * @return name
- */
- public String getName() {
- return name;
- }
-
- @Override
- public int hashCode() {
- return toString().hashCode();
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if ((obj == null) || !(obj instanceof FullQualifiedName)) {
- return false;
- }
- final FullQualifiedName other = (FullQualifiedName) obj;
- return namespace.equals(other.getNamespace()) && name.equals(other.getName());
- }
-
- @Override
- public String toString() {
- return namespace + Edm.DELIMITER + name;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java
deleted file mode 100644
index 9708d5f..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/package-info.java
+++ /dev/null
@@ -1,28 +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.
- ******************************************************************************/
-/**
- * <h1>Entity Data Model API</h1>
- * <p>The Entity Data Model is described in the OData protocol specification
- * as well as in the Conceptual Schema Definition for the OData Protocol.
- * Both can be found at <a href="http://www.odata.org/">http://www.odata.org/</a>.</p>
- * <p>Many classes and interfaces contain the pragma:" @org.apache.olingo.odata2.DoNotImplement "
- * to indicate these classes should only be used and not implemented.</p>
- */
-package org.apache.olingo.odata2.api.edm;
-