You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2013/08/28 16:01:59 UTC
[11/41] delete aggregated-sources directory which was created by
accident
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
deleted file mode 100644
index e0f7a55..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
+++ /dev/null
@@ -1,203 +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.processor.api.jpa.jpql;
-
-import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
-import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
-import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
-
-/**
- * The abstract class is a compilation of objects required for building
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement}. Extend this
- * class to implement specific implementations of JPQL context types (Select,
- * Join). A JPQL Context is constructed from an OData
- * request. Depending on OData CRUD operation performed on an Entity, a
- * corresponding JPQL context object is built. The JPQL context object thus
- * built can be used for constructing JPQL statements. <br>
- * A default implementation is provided by the library.
- *
- *
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
- * @see org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory
- *
- */
-public abstract class JPQLContext implements JPQLContextView {
-
- /**
- * An alias for Java Persistence Entity
- */
- protected String jpaEntityAlias;
- /**
- * Java Persistence Entity name
- */
- protected String jpaEntityName;
- /**
- * The type of JPQL context. Based on the type JPQL statements can be built.
- */
- protected JPQLContextType type;
-
- /**
- * sets JPA Entity Name into the context
- *
- * @param jpaEntityName
- * is the name of JPA Entity
- */
- protected final void setJPAEntityName(final String jpaEntityName) {
- this.jpaEntityName = jpaEntityName;
- }
-
- /**
- * sets JPA Entity alias name into the context
- *
- * @param jpaEntityAlias
- * is the JPA entity alias name
- */
- protected final void setJPAEntityAlias(final String jpaEntityAlias) {
- this.jpaEntityAlias = jpaEntityAlias;
- }
-
- /**
- * gets the JPA entity alias name set into the context
- */
- @Override
- public final String getJPAEntityAlias() {
- return jpaEntityAlias;
- }
-
- /**
- * sets the JPQL context type into the context
- *
- * @param type
- * is JPQLContextType
- */
- protected final void setType(final JPQLContextType type) {
- this.type = type;
- }
-
- /**
- * gets the JPA entity name set into the context
- */
- @Override
- public final String getJPAEntityName() {
- return jpaEntityName;
- }
-
- /**
- * gets the JPQL context type set into the context
- */
- @Override
- public final JPQLContextType getType() {
- return type;
- }
-
- /**
- * the method returns an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
- * based on the JPQLContextType. The context builder can be used for
- * building different JPQL contexts.
- *
- * @param contextType
- * is the JPQLContextType
- * @param resultsView
- * is the OData request view
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
- * @throws ODataJPARuntimeException
- */
- public final static JPQLContextBuilder createBuilder(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
- return JPQLContextBuilder.create(contextType, resultsView);
- }
-
- /**
- * The abstract class is extended by specific JPQLContext builder for
- * building JPQLContexts.
- *
- *
- *
- */
- public static abstract class JPQLContextBuilder {
- /**
- * alias counter is an integer counter that is incremented by "1" for
- * every new alias name generation. The value of counter is used in the
- * generation of JPA entity alias names.
- */
- protected int aliasCounter = 0;
-
- protected JPQLContextBuilder() {}
-
- /**
- * the method instantiates an instance of type JPQLContextBuilder.
- *
- * @param contextType
- * indicates the type of JPQLContextBuilder to instantiate.
- * @param resultsView
- * is the OData request view
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
- * @throws ODataJPARuntimeException
- */
- private static JPQLContextBuilder create(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
- JPQLContextBuilder contextBuilder = ODataJPAFactory.createFactory().getJPQLBuilderFactory().getContextBuilder(contextType);
- if (contextBuilder == null) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQLCTXBLDR_CREATE, null);
- }
- contextBuilder.setResultsView(resultsView);
- return contextBuilder;
- }
-
- /**
- * The abstract method is implemented by specific JPQL context builders
- * to build JPQL Contexts. The build method makes use of information set
- * into the context to built JPQL Context Types.
- *
- * @return an instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext}
- * @throws ODataJPAModelException
- * @throws ODataJPARuntimeException
- */
- public abstract JPQLContext build() throws ODataJPAModelException, ODataJPARuntimeException;
-
- /**
- * The abstract method is implemented by specific JPQL context builder.
- * The method sets the OData request view into the JPQL context.
- *
- * @param resultsView
- * is an instance representing OData request.
- */
- protected abstract void setResultsView(Object resultsView);
-
- /**
- * The method resets the alias counter value to "0".
- */
- protected void resetAliasCounter() {
- aliasCounter = 0;
- }
-
- /**
- * The method returns a system generated alias name starting with prefix
- * "E" and ending with suffix "aliasCounter".
- *
- * @return a String representing JPA entity alias name
- */
- protected String generateJPAEntityAlias() {
- return new String("E" + ++aliasCounter);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
deleted file mode 100644
index d1a0590..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.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.processor.api.jpa.jpql;
-
-/**
- * Enumerated list of JPQL context Types.
- *
- *
- *
- */
-public enum JPQLContextType {
- /**
- * indicates that the JPQL context can be used for building JPQL select
- * statements
- */
- SELECT,
- /**
- * indicates that the JPQL context can be used for building JPQL modify
- * statements
- */
- MODIFY,
- /**
- * indicates that the JPQL context can be used for building JPQL delete
- * statements
- */
- DELETE,
- /**
- * indicates that the JPQL context can be used for building JPQL select
- * statement that fetches single record
- */
- SELECT_SINGLE,
- /**
- * indicates that the JPQL context can be used for building JPQL join
- * statement
- */
- JOIN,
- /**
- * indicates that the JPQL context can be used for building JPQL join
- * statement that fetches single record
- */
- JOIN_SINGLE,
- /**
- * indicates that the JPQL context can be used for building JPQL select
- * statement that fetches record counts
- */
- SELECT_COUNT,
- /**
- * indicates that the JPQL context can be used for building JPQL join
- * statement that fetches single record
- */
- JOIN_COUNT,
- /**
- * indicates that the JPQL context can be used for building JPA Method
- * context that can be used for invoking custom functions
- */
- FUNCTION
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
deleted file mode 100644
index 1cd0071..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.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.processor.api.jpa.jpql;
-
-/**
- * The interface provides a view on JPQL Context. The view can be used to access
- * different JPQL context type implementations.
- *
- *
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
- */
-public interface JPQLContextView {
- /**
- * The method returns a JPA entity name for which the JPQL context is
- * relevant.
- *
- * @return JPA entity name
- */
- public String getJPAEntityName();
-
- /**
- * The method returns a JPA entity alias name for which the JPQL context is
- * relevant.
- *
- * @return JPA entity alias name
- */
-
- public String getJPAEntityAlias();
-
- /**
- * The method returns a JPQL context type
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
- */
- public JPQLContextType getType();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
deleted file mode 100644
index 176b093..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ******************************************************************************/
-package org.apache.olingo.odata2.processor.api.jpa.jpql;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
-
-/**
- * The interface provide a view on JPQL Join context.The interface provides
- * methods for accessing the Join Clause which can be part of JPQL Select
- * statement. The interface extends the JPQL Select Context to add JQPL Join
- * clauses to the Select statement. The JPQL Join context view is built from
- * OData read entity set with navigation request.
- *
- *
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectContextView
- *
- */
-public interface JPQLJoinContextView extends JPQLSelectContextView {
- /**
- * The method returns a list of JPA Join Clauses. The returned list of
- * values can be used for building JPQL Statements with Join clauses.
- *
- * @return a list of
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
- */
- public List<JPAJoinClause> getJPAJoinClauses();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
deleted file mode 100644
index 1799772..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.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.processor.api.jpa.jpql;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
-
-/**
- * The interface provide a view on JPQL Join Clauses.The interface is an
- * extension to JPQL select single context and provides methods for accessing
- * JPQL Join clauses. The view can be used for building JPQL statements without
- * any WHERE,ORDERBY clauses. The clauses are built from OData read entity
- * request views.
- *
- *
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectSingleContextView
- *
- */
-public interface JPQLJoinSelectSingleContextView extends JPQLSelectSingleContextView {
-
- /**
- * The method returns a list of JPA Join Clauses. The returned list of
- * values can be used for building JPQL Statements with Join clauses.
- *
- * @return a list of
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
- */
- public abstract List<JPAJoinClause> getJPAJoinClauses();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
deleted file mode 100644
index 729a095..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
+++ /dev/null
@@ -1,62 +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.processor.api.jpa.jpql;
-
-import java.util.HashMap;
-
-/**
- * The interface provide a view on JPQL select context.The interface provides
- * methods for accessing the clauses of a JPQL SELECT statement like "SELECT",
- * "ORDERBY", "WHERE". The clauses are built from OData read entity set request
- * views. The clauses thus built can be used for building JPQL Statements.
- *
- *
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
- *
- */
-public interface JPQLSelectContextView extends JPQLContextView {
- /**
- * The method returns a JPQL SELECT clause. The SELECT clause is built from
- * $select OData system Query option.
- *
- * @return a String representing a SELECT clause in JPQL
- */
- public String getSelectExpression();
-
- /**
- * The method returns a Hash Map of JPQL ORDERBY clause. The ORDERBY clause
- * is built from $orderby OData system query option. The hash map contains
- * <ol>
- * <li>Key - JPA Entity Property name to be ordered</li>
- * <li>Value - Sort Order in JPQL (desc,asc)</li>
- * </ol>
- *
- * @return a hash map of (JPA Property Name,Sort Order)
- */
- public HashMap<String, String> getOrderByCollection();
-
- /**
- * The method returns a JPQL WHERE condition as string. The WHERE condition
- * can be built from $filter OData System Query Option and/or Key predicates
- * of an OData Request.
- *
- * @return a String representing a WHERE condition in JPQL
- */
- public String getWhereExpression();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
deleted file mode 100644
index 9222943..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.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.processor.api.jpa.jpql;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-
-/**
- * The interface provide a view on JPQL select single context.The interface
- * provides methods for accessing the clause of a JPQL SELECT statement like
- * "SELECT". The view can be used for building JPQL statements without any
- * WHERE,JOIN,ORDERBY clauses. The clauses are built from OData read entity
- * request views.
- *
- *
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
- *
- */
-public interface JPQLSelectSingleContextView extends JPQLContextView {
- /**
- * The method returns a JPQL SELECT clause. The SELECT clause is built from
- * $select OData system Query option.
- *
- * @return a String representing a SELECT clause in JPQL
- */
- public String getSelectExpression();
-
- /**
- * The method returns the list of key predicates that can be used for
- * constructing the WHERE clause in JPQL statements. The OData entity key
- * predicates are thus converted into JPA entity keys.
- *
- * @return a list of key predicates
- */
- public List<KeyPredicate> getKeyPredicates();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
deleted file mode 100644
index 6ac545b..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
+++ /dev/null
@@ -1,151 +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.processor.api.jpa.jpql;
-
-import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
-import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
-
-/**
- * The class represents a Java Persistence Query Language (JPQL) Statement.
- * The JPQL statement is built using a builder namely
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder}
- * . Based upon the JPQL Context types (
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} different
- * kinds of JPQL statements are built.
- * The JPQL statements thus generated can be executed using JPA Query APIs to fetch JPA entities.
- *
- *
- * @see org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory
- * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView
- */
-public class JPQLStatement {
-
- protected String statement;
-
- /**
- * The method is used for creating an instance of JPQL Statement Builder for
- * building JPQL statements. The JPQL Statement builder is created based
- * upon the JPQL Context.
- *
- * @param context
- * a non null value of
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView}
- * . The context is expected to be set to be built with no
- * errors.
- * @return an instance of JPQL statement builder
- * @throws ODataJPARuntimeException
- */
- public static JPQLStatementBuilder createBuilder(final JPQLContextView context) throws ODataJPARuntimeException {
- return JPQLStatementBuilder.create(context);
- }
-
- private JPQLStatement(final String statement) {
- this.statement = statement;
- }
-
- /**
- * The method provides a String representation of JPQLStatement.
- */
- @Override
- public String toString() {
- return statement;
- }
-
- /**
- * The abstract class is extended by specific JPQL statement builders for
- * building JPQL statements like
- * <ol>
- * <li>Select statements</li>
- * <li>Select single statements</li>
- * <li>Select statements with Join</li>
- * <li>Insert/Modify/Delete statements</li>
- * </ol>
- *
- * A default statement builder for building each kind of JPQL statements is
- * provided by the library.
- *
- *
- *
- */
- public static abstract class JPQLStatementBuilder {
-
- protected JPQLStatementBuilder() {}
-
- private static final JPQLStatementBuilder create(final JPQLContextView context) throws ODataJPARuntimeException {
- return ODataJPAFactory.createFactory().getJPQLBuilderFactory().getStatementBuilder(context);
- }
-
- protected final JPQLStatement createStatement(final String statement) {
- return new JPQLStatement(statement);
- }
-
- /**
- * The abstract method is implemented by specific statement builder for
- * building JPQL Statement.
- *
- * @return an instance of
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement}
- * @throws ODataJPARuntimeException
- * in case there are errors building the statements
- */
- public abstract JPQLStatement build() throws ODataJPARuntimeException;
-
- }
-
- public static final class Operator {
- public static final String EQ = "=";
- public static final String NE = "<>";
- public static final String LT = "<";
- public static final String LE = "<=";
- public static final String GT = ">";
- public static final String GE = ">=";
- public static final String AND = "AND";
- public static final String NOT = "NOT";
- public static final String OR = "OR";
-
- }
-
- public static final class KEYWORD {
- public static final String SELECT = "SELECT";
- public static final String FROM = "FROM";
- public static final String WHERE = "WHERE";
- public static final String LEFT_OUTER_JOIN = "LEFT OUTER JOIN";
- public static final String OUTER = "OUTER";
- public static final String JOIN = "JOIN";
- public static final String ORDERBY = "ORDER BY";
- public static final String COUNT = "COUNT";
- public static final String OFFSET = ".000";
- public static final String TIMESTAMP = "ts";
-
- }
-
- public static final class DELIMITER {
- public static final char SPACE = ' ';
- public static final char COMMA = ',';
- public static final char PERIOD = '.';
- public static final char PARENTHESIS_LEFT = '(';
- public static final char PARENTHESIS_RIGHT = ')';
- public static final char COLON = ':';
- public static final char HYPHEN = '-';
- public static final char LEFT_BRACE = '{';
- public static final char RIGHT_BRACE = '}';
- public static final char LONG = 'L';
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
deleted file mode 100644
index e385c23..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
+++ /dev/null
@@ -1,27 +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.
- ******************************************************************************/
-/**
- * <h3>OData JPA Processor API Library - Java Persistence Query Language</h3>
- * The library provides set of APIs for building JPQL contexts from OData Requests.
- * The JPQL contexts thus built can be used for building JPQL Statements.
- *
- *
- */
-package org.apache.olingo.odata2.processor.api.jpa.jpql;
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
deleted file mode 100644
index 7ac6b90..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
+++ /dev/null
@@ -1,96 +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.processor.api.jpa.model;
-
-import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
-
-/**
- * <p>
- * A view on Java Persistence Entity Relationship and Entity Data Model
- * Association End.
- * </p>
- * <p>
- * The implementation of the view provides access to EDM Association Ends
- * created from Java Persistence Entity Relationships. The implementation acts
- * as a container for Association Ends.
- * </p>
- *
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
- *
- */
-public interface JPAEdmAssociationEndView extends JPAEdmBaseView {
-
- /**
- * The method gets the one of the association ends present in the container.
- *
- * @return one of the
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
- * {@link org.apache.olingo.odata2.api.edm.provider.Association}
- */
- AssociationEnd getEdmAssociationEnd2();
-
- /**
- * The method gets the other association end present in the container.
- *
- * @return one of the
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
- * {@link org.apache.olingo.odata2.api.edm.provider.Association}
- */
- AssociationEnd getEdmAssociationEnd1();
-
- /**
- * The method compares two ends {<b>end1, end2</b>} of an
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} against its
- * two ends.
- *
- * The Method compares the following properties in each end for equality <i>
- * <ul>
- * <li>{@link org.apache.olingo.odata2.api.edm.FullQualifiedName} of End Type</li>
- * <li>{@link org.apache.olingo.odata2.api.edm.EdmMultiplicity} of End</li>
- * </ul>
- * </i>
- *
- * @param end1
- * one end of type
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
- * an {@link org.apache.olingo.odata2.api.edm.provider.Association}
- * @param end2
- * other end of type
- * {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
- * an {@link org.apache.olingo.odata2.api.edm.provider.Association}
- * <p>
- * @return <ul>
- * <li><i>true</i> - Only if the properties of <b>end1</b> matches
- * with all the properties of any one end and only if the properties
- * of <b>end2</b> matches with all the properties of the remaining
- * end</li> <li><i>false</i> - Otherwise</li>
- * </ul>
- */
- boolean compare(AssociationEnd end1, AssociationEnd end2);
-
- String getJoinColumnName();
-
- String getJoinColumnReferenceColumnName();
-
- String getMappedByName();
-
- String getOwningPropertyName();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
deleted file mode 100644
index 832480c..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
+++ /dev/null
@@ -1,69 +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.processor.api.jpa.model;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.provider.Association;
-import org.apache.olingo.odata2.api.edm.provider.AssociationSet;
-
-/**
- * <p>
- * A view on Java Persistence Entity Relationship and Entity Data Model
- * Association Set.
- * </p>
- * <p>
- * The implementation of the view provides access to EDM Association Set created
- * from Java Persistence Entity Relationship. The implementation act as a
- * container for list of association sets that are consistent.
- * </p>
- *
- *
- * <p>
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
- */
-public interface JPAEdmAssociationSetView extends JPAEdmBaseView {
-
- /**
- * The method returns a consistent list of association sets. An association
- * set is set to be consistent only if all its mandatory properties can be
- * completely built from a Java Persistence Relationship.
- *
- * @return a consistent list of {@link org.apache.olingo.odata2.api.edm.provider.AssociationSet}
- *
- */
- List<AssociationSet> getConsistentEdmAssociationSetList();
-
- /**
- * The method returns an association set that is currently being processed.
- *
- * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.AssociationSet}
- */
- AssociationSet getEdmAssociationSet();
-
- /**
- * The method returns an association from which the association set is
- * currently being processed.
- *
- * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.Association}
- */
- Association getEdmAssociation();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
deleted file mode 100644
index 678115a..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
+++ /dev/null
@@ -1,134 +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.processor.api.jpa.model;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.provider.Association;
-
-/**
- * <p>
- * A View on Java Persistence Entity Relationship and Entity Data Model
- * Association.
- * </p>
- * <p>
- * The implementation of the view provides access to EDM Association created
- * from Java Persistence Entity Relationships. The implementation acts as a
- * container for list of association that are consistent.
- *
- * An Association is said to be consistent only
- * <ol>
- * <li>If both the Ends of Association are consistent</li>
- * <li>If referential constraint exists for the Association then it should be
- * consistent</li>
- * </ol>
- * </p>
- *
- *
- * <p>
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView
- *
- */
-public interface JPAEdmAssociationView extends JPAEdmBaseView {
-
- /**
- * The method returns an association which is currently being processed.
- *
- * @return an {@link org.apache.olingo.odata2.api.edm.provider.Association}
- */
- public Association getEdmAssociation();
-
- /**
- * The method returns a consistent list of associations. An association is
- * set to be consistent only if all its mandatory properties can be
- * completely built from a Java Persistence Relationship.
- *
- * @return a consistent list of
- * {@link org.apache.olingo.odata2.api.edm.provider.Association}
- *
- */
- public List<Association> getConsistentEdmAssociationList();
-
- /**
- * The method adds
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
- * to its container
- *
- * @param associationView
- * of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
- */
- public void addJPAEdmAssociationView(JPAEdmAssociationView associationView, JPAEdmAssociationEndView associationEndView);
-
- /**
- * The method searches for an Association in its container against the
- * search parameter <b>view</b> of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}.
- *
- * The Association in the container <b>view</b> is searched against the
- * consistent list of Association stored in this container.
- *
- * @param view
- * of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
- * @return {@link org.apache.olingo.odata2.api.edm.provider.Association} if found
- * in the container
- */
- public Association searchAssociation(JPAEdmAssociationEndView view);
-
- /**
- * The method adds the referential constraint view to its container.
- * <p>
- * <b>Note: </b>The referential constraint view is added only if it exists.
- * </p>
- *
- * @param refView
- * of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
- */
- public void addJPAEdmRefConstraintView(JPAEdmReferentialConstraintView refView);
-
- /**
- * The method returns the referential constraint view that is currently
- * being processed.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
- */
- public JPAEdmReferentialConstraintView getJPAEdmReferentialConstraintView();
-
- /**
- * The method searches for the number of associations with similar endpoints in its container against the
- * search parameter <b>view</b> of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}.
- *
- * The Association in the container <b>view</b> is searched against the
- * consistent list of Association stored in this container.
- *
- * @param view
- * of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
- * @return {@link org.apache.olingo.odata2.api.edm.provider.Association} if found
- * in the container
- */
- int getNumberOfAssociationsWithSimilarEndPoints(JPAEdmAssociationEndView view);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
deleted file mode 100644
index 1f8370f..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
+++ /dev/null
@@ -1,92 +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.processor.api.jpa.model;
-
-import javax.persistence.metamodel.Metamodel;
-
-import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder;
-import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAccess;
-
-/**
- * <p>
- * A base view on Java Persistence Model and Entity Data Model.
- * </p>
- * <p>
- * The implementation of the view acts as a base container for containers of
- * Java Persistence Model and Entity Data Model elements.
- *
- *
- * <p>
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface JPAEdmBaseView {
- /**
- *
- * @return Java Persistence Unit Name
- */
- public String getpUnitName();
-
- /**
- * The method returns the Java Persistence MetaModel
- *
- * @return a meta model of type
- * {@link javax.persistence.metamodel.Metamodel}
- */
- public Metamodel getJPAMetaModel();
-
- /**
- * The method returns a builder for building Entity Data Model elements from
- * Java Persistence Model Elements
- *
- * @return a builder of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}
- */
- public JPAEdmBuilder getBuilder();
-
- /**
- * The method returns the if the container is consistent without any errors
- *
- * @return <ul>
- * <li>true - if the container is consistent without errors</li>
- * <li>false - if the container is inconsistent with errors</li>
- *
- */
- public boolean isConsistent();
-
- /**
- * The method cleans the container.
- */
- public void clean();
-
- /**
- * The method returns a reference to JPA EDM mapping model access.
- *
- * @return an instance to JPA EDM mapping model access
- */
- public JPAEdmMappingModelAccess getJPAEdmMappingModelAccess();
-
- /**
- * The method returns a reference to JPA EDM extension if available else
- * null.
- *
- * @return an instance of JPA Edm Extension
- */
- public JPAEdmExtension getJPAEdmExtension();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
deleted file mode 100644
index cd7f250..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.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.processor.api.jpa.model;
-
-import org.apache.olingo.odata2.api.edm.provider.ComplexProperty;
-
-/**
- * <p>
- * A view on properties of Java Persistence embeddable type and EDM complex
- * type. Properties of JPA embeddable types are converted into EDM properties of
- * EDM complex type.
- * </p>
- * <p>
- * The implementation of the view provides access to properties of EDM complex
- * type created for a given JPA EDM complex type. The implementation acts as a
- * container for the properties of EDM complex type.
- * </p>
- *
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView
- */
-public interface JPAEdmComplexPropertyView extends JPAEdmBaseView {
- /**
- * The method returns a complex property for a complex type.
- *
- * @return an instance of
- * {@link org.apache.olingo.odata2.api.edm.provider.ComplexProperty}
- */
- ComplexProperty getEdmComplexProperty();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
deleted file mode 100644
index 2b40ba0..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
+++ /dev/null
@@ -1,118 +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.processor.api.jpa.model;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.FullQualifiedName;
-import org.apache.olingo.odata2.api.edm.provider.ComplexType;
-import org.apache.olingo.odata2.api.edm.provider.Property;
-
-/**
- * A view on Java Persistence embeddable types and EDM complex types. Java
- * persistence embeddable types are converted into EDM entity types. Only those
- * embeddable types that are
- * <ol>
- * <li>used in a java persistence Entity type</li>
- * <li>used as non embeddable id of a java persistence entity type</li>
- * </ol>
- * are converted into EDM complex types.
- * <p>
- * The implementation of the view provides access to EDM complex types for the
- * given JPA EDM model. The view acts as a container for consistent list of EDM
- * complex types. An EDM complex type is said to be consistent only if it used
- * in at least one of the EDM entity type.
- *
- *
- * <p>
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView
- *
- */
-public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
-
- /**
- * The method returns an EDM complex type that is currently being processed.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.ComplexType}
- */
- public ComplexType getEdmComplexType();
-
- /**
- * The method returns an JPA embeddable type that is currently being
- * processed.
- *
- * @return an instance of type
- * {@link javax.persistence.metamodel.EmbeddableType}
- */
- public javax.persistence.metamodel.EmbeddableType<?> getJPAEmbeddableType();
-
- /**
- * The method returns a consistent list of EDM complex types.
- *
- * @return a list of {@link org.apache.olingo.odata2.api.edm.provider.ComplexType}
- */
- public List<ComplexType> getConsistentEdmComplexTypes();
-
- /**
- * The method searches for the EDM complex type with in the container for
- * the given JPA embeddable type name.
- *
- * @param embeddableTypeName
- * is the name of JPA embeddable type
- * @return a reference to EDM complex type if found else null
- */
- public ComplexType searchEdmComplexType(String embeddableTypeName);
-
- /**
- * The method add a JPA EDM complex type view to the container.
- *
- * @param view
- * is an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
- */
- public void addJPAEdmCompleTypeView(JPAEdmComplexTypeView view);
-
- /**
- * The method searches for the EDM complex type with in the container for
- * the given EDM complex type's fully qualified name.
- *
- * @param type
- * is the fully qualified name of EDM complex type
- * @return a reference to EDM complex type if found else null
- */
- public ComplexType searchEdmComplexType(FullQualifiedName type);
-
- /**
- * The method expands the given EDM complex type into a list of EDM simple
- * properties.
- *
- * @param complexType
- * is the EDM complex type to expand
- * @param expandedPropertyList
- * is the list to be populated with expanded EDM simple
- * properties
- * @param embeddablePropertyName
- * is the name of the complex property. The name is used as the
- * qualifier for the expanded simple property names.
- */
- public void expandEdmComplexType(ComplexType complexType, List<Property> expandedPropertyList, String embeddablePropertyName);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
deleted file mode 100644
index 20af73a..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.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.processor.api.jpa.model;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.provider.EntityContainer;
-
-/**
- * A view on JPA EDM entity container. JPA EDM entity container is built from
- * consistent JPA EDM entity set and consistent JPA EDM association set views.
- *
- * <p>
- * The implementation of the view provides access to EDM entity containers. The
- * view acts as container for JPA EDM entity containers. A JPA EDM entity
- * container is said to be consistent only if the JPA EDM association set and
- * JPA EDM Entity Set view are consistent.
- *
- *
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView
- *
- */
-public interface JPAEdmEntityContainerView extends JPAEdmBaseView {
- /**
- * The method returns the EDM entity container that is currently being
- * processed.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.EntityContainer}
- */
- public EntityContainer getEdmEntityContainer();
-
- /**
- * The method returns a list of consistent EDM entity containers
- *
- * @return a list of consistent EDM entity containers
- */
- public List<EntityContainer> getConsistentEdmEntityContainerList();
-
- /**
- * The method returns the JPA EDM entity set view that is currently being
- * processed.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}
- */
- public JPAEdmEntitySetView getJPAEdmEntitySetView();
-
- /**
- * The method returns the JPA EDM association set view that is currently
- * being processed.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView}
- */
- public JPAEdmAssociationSetView getEdmAssociationSetView();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
deleted file mode 100644
index 8068be9..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.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.processor.api.jpa.model;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.provider.EntitySet;
-
-/**
- * A view on Java Persistence entity type and EDM entity sets. Java persistence
- * entity types are converted into EDM entity types and EDM entity sets.
- * <p>
- * The implementation of the view provides access to EDM entity sets for the
- * given JPA EDM entity type. The view acts as a container for consistent list
- * of EDM entity sets. An EDM entity set is said to be consistent only if it has
- * consistent EDM entity types.
- *
- *
- * <p>
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView
- *
- */
-public interface JPAEdmEntitySetView extends JPAEdmBaseView {
- /**
- * The method returns an EDM entity set that is currently being processed.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.EntitySet}
- */
- public EntitySet getEdmEntitySet();
-
- /**
- * The method returns a list of consistent EDM entity sets.
- *
- * @return a list of EDM entity sets
- */
- public List<EntitySet> getConsistentEdmEntitySetList();
-
- /**
- * The method returns a JPA EDM entity type view that is currently being
- * processed. JPA EDM entity set view is built from JPA EDM entity type
- * view.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
- */
- public JPAEdmEntityTypeView getJPAEdmEntityTypeView();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
deleted file mode 100644
index d8293d3..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.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.processor.api.jpa.model;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.provider.EntityType;
-
-/**
- * A view on Java Persistence entity types and EDM entity types. Java
- * persistence entity types are converted into EDM entity types.
- * <p>
- * The implementation of the view provides access to EDM entity types for the
- * given JPA EDM model. The view acts as a container for consistent list of EDM
- * entity types. An EDM entity type is said to be consistent only if it has at
- * least one consistent EDM property and at least one consistent EDM key.
- *
- *
- * <p>
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView
- *
- */
-public interface JPAEdmEntityTypeView extends JPAEdmBaseView {
- /**
- * The method returns an EDM entity currently being processed.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
- */
- public EntityType getEdmEntityType();
-
- /**
- * The method returns java persistence Entity type currently being
- * processed.
- *
- * @return an instance of type
- * {@link javax.persistence.metamodel.EntityType}
- */
- public javax.persistence.metamodel.EntityType<?> getJPAEntityType();
-
- /**
- * The method returns a consistent list of EDM entity types for a given java
- * persistence meta model.
- *
- * @return a list of {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
- */
- public List<EntityType> getConsistentEdmEntityTypes();
-
- /**
- * The method searches in the consistent list of EDM entity types for the
- * given EDM entity type's name.
- *
- * @param jpaEntityTypeName
- * is the name of EDM entity type
- * @return a reference to EDM entity type if found else null
- */
- public EntityType searchEdmEntityType(String jpaEntityTypeName);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
deleted file mode 100644
index 77d90a1..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
+++ /dev/null
@@ -1,50 +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.processor.api.jpa.model;
-
-/**
- * The interface provides methods to extend JPA EDM containers.
- *
- *
- *
- */
-public interface JPAEdmExtension {
-
- /**
- * The method is used to extend the JPA EDM schema view with custom operations. Use this method to
- * register custom operations.
- *
- * @param view
- * is the schema view
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView#registerOperations(Class,
- * String[])
- *
- */
- public void extendWithOperation(JPAEdmSchemaView view);
-
- /**
- * The method is used to extend the JPA EDM schema view with Entities, Entity Sets, Navigation Property and Association.
- *
- * @param view
- * is the schema view
- *
- */
- public void extendJPAEdmSchema(JPAEdmSchemaView view);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
deleted file mode 100644
index 0eb1c14..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.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.processor.api.jpa.model;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.provider.FunctionImport;
-
-/**
- * <p>
- * A view on EDM Function Imports. EDM function imports are derived from Java
- * class methods annotated with EDM Annotations.
- * </p>
- * <p>
- * The implementation of the view provides access to EDM Function Import created
- * from Java class methods. The implementation act as a container for list of
- * function imports that are consistent.
- * </p>
- *
- *
- * <p>
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface JPAEdmFunctionImportView extends JPAEdmBaseView {
-
- /**
- * The method returns a list of consistent Function Imports. A function
- * import is said to be consistent only if it adheres to the rules defined
- * in CSDL.
- *
- * @return a list of type
- * {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport}
- */
- List<FunctionImport> getConsistentFunctionImportList();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
deleted file mode 100644
index 205eecd..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.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.processor.api.jpa.model;
-
-import org.apache.olingo.odata2.api.edm.provider.Key;
-
-/**
- * A view on Java Persistence Entity Key Attributes and EDM Key properties. Java
- * Persistence Key Attributes of type
- * <ol>
- * <li>embedded ID</li>
- * <li>ID</li>
- * </ol>
- * are converted into EDM keys. Embedded IDs are expanded into simple EDM
- * properties.
- * <p>
- * The implementation of the view provides access to EDM key properties for a
- * given JPA EDM entity type. The view acts as a container for consistent EDM
- * key property of an EDM entity type.
- *
- *
- * <p>
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView
- *
- */
-public interface JPAEdmKeyView extends JPAEdmBaseView {
- /**
- * The method returns an instance of EDM key for the given JPA EDM Entity
- * type.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.api.edm.provider.Key}
- */
- public Key getEdmKey();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
deleted file mode 100644
index 04bb102..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.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.processor.api.jpa.model;
-
-/**
- * The interface acts a container for storing Java persistence column name. The
- * JPA EDM mapping instance can be associated with any EDM simple, EDM complex
- * property to denote the properties Java persistence column name.
- *
- *
- *
- */
-public interface JPAEdmMapping {
- /**
- * The method sets the Java persistence column name into the mapping
- * container.
- *
- * @param name
- * is the Java persistence column name
- */
- public void setJPAColumnName(String name);
-
- /**
- * The method gets the Java persistence column name from the mapping
- * container.
- *
- * @return a String representing the Java persistence column name set into
- * the container
- */
- public String getJPAColumnName();
-
- /**
- * The method sets the Java persistence entity/property type.
- *
- * @param type
- * is an instance of type Class<?>
- */
- public void setJPAType(Class<?> type);
-
- /**
- * The method returns the Java persistence entity/property type.
- *
- * @return type
- */
- public Class<?> getJPAType();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
deleted file mode 100644
index 61040ed..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ******************************************************************************/
-package org.apache.olingo.odata2.processor.api.jpa.model;
-
-/**
- * A view on JPA meta model and EDM meta model. The view acts as the base for
- * the construction of EDM meta model from a JPA meta model.
- * <p>
- * The implementation of the view acts as the container for JPA meta model and
- * EDM meta model. The instance of JPA EDM meta model can be created using
- * {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory}. The
- * instance thus obtained can be used for constructing other elements of the
- * meta model using
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}.
- *
- *
- * @org.apache.olingo.odata2.DoNotImplement
- * @see org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory
- */
-public interface JPAEdmModelView extends JPAEdmBaseView {
- /**
- * The method returns a consistent JPA EDM schema view created from the JPA
- * meta model.
- *
- * @return an instance of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView}
- */
- public JPAEdmSchemaView getEdmSchemaView();
-}