Repository: olingo-odata4 Updated Branches: refs/heads/master 5a97aa261 -> a1e10be17
OLINGO-925: renaming the package name of EdmxReference class such it bundle packaging mechanism will not pull in these classes into other modules Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a1e10be1 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a1e10be1 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a1e10be1 Branch: refs/heads/master Commit: a1e10be17e4b4a2d9ec89a4cb302bd8b014305c5 Parents: 5a97aa2 Author: Ramesh Reddy <[email protected]> Authored: Thu Mar 31 08:22:34 2016 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Thu Mar 31 08:22:34 2016 -0500 ---------------------------------------------------------------------- .../olingo/commons/api/edm/TargetType.java | 2 +- .../olingo/commons/api/edmx/EdmxReference.java | 112 +++++++++++++++++++ .../commons/api/edmx/EdmxReferenceInclude.java | 61 ++++++++++ .../edmx/EdmxReferenceIncludeAnnotation.java | 94 ++++++++++++++++ .../olingo/commons/api/edmx/package-info.java | 26 +++++ .../olingo/server/api/edmx/EdmxReference.java | 112 ------------------- .../server/api/edmx/EdmxReferenceInclude.java | 61 ---------- .../edmx/EdmxReferenceIncludeAnnotation.java | 94 ---------------- .../olingo/server/api/edmx/package-info.java | 26 ----- .../org/apache/olingo/server/api/OData.java | 2 +- .../olingo/server/api/ServiceMetadata.java | 2 +- .../olingo/server/core/MetadataParser.java | 6 +- .../server/core/SchemaBasedEdmProvider.java | 4 +- .../apache/olingo/server/core/ODataImpl.java | 2 +- .../olingo/server/core/ServiceMetadataImpl.java | 2 +- .../xml/MetadataDocumentXmlSerializer.java | 6 +- .../xml/ServiceDocumentXmlSerializer.java | 2 +- .../xml/MetadataDocumentXmlSerializerTest.java | 6 +- .../xml/ServiceDocumentXmlSerializerTest.java | 2 +- .../olingo/server/tecsvc/TechnicalServlet.java | 4 +- .../tecsvc/data/ActionDataProviderTest.java | 2 +- .../server/tecsvc/data/DataProviderTest.java | 2 +- .../server/core/ODataHandlerImplTest.java | 2 +- .../server/core/PreconditionsValidatorTest.java | 2 +- .../AbstractODataDeserializerTest.java | 2 +- .../json/ODataJsonSerializerTest.java | 2 +- .../serializer/json/ServiceDocumentTest.java | 2 +- .../serializer/utils/ContextURLHelperTest.java | 2 +- .../serializer/xml/MetadataDocumentTest.java | 4 +- .../serializer/xml/ODataXmlSerializerTest.java | 2 +- .../olingo/server/core/uri/UriHelperTest.java | 2 +- .../server/core/uri/UriResourceImplTest.java | 2 +- .../core/uri/parser/TestFullResourcePath.java | 2 +- .../core/uri/parser/TestUriParserImpl.java | 2 +- .../queryoption/expression/ExpressionTest.java | 2 +- .../core/uri/validator/UriValidatorTest.java | 2 +- .../olingo/server/sample/CarsServlet.java | 2 +- 37 files changed, 331 insertions(+), 331 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/TargetType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/TargetType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/TargetType.java index 479dfdb..8facd1e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/TargetType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/TargetType.java @@ -37,7 +37,7 @@ import org.apache.olingo.commons.api.edm.annotation.EdmPropertyValue; import org.apache.olingo.commons.api.edm.annotation.EdmRecord; import org.apache.olingo.commons.api.edm.annotation.EdmUrlRef; import org.apache.olingo.commons.api.edm.constants.EdmOnDelete; -import org.apache.olingo.server.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.edmx.EdmxReference; public enum TargetType { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReference.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReference.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReference.java new file mode 100644 index 0000000..7b15894 --- /dev/null +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReference.java @@ -0,0 +1,112 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this 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.commons.api.edmx; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; + +/** + * POJO for Edmx Reference. + */ +public class EdmxReference implements CsdlAnnotatable{ + + private final URI uri; + private final List<EdmxReferenceInclude> edmxIncludes; + private final List<EdmxReferenceIncludeAnnotation> edmxIncludeAnnotations; + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + /** + * Create reference with given uri + * + * @param uri of reference + */ + public EdmxReference(final URI uri) { + this.uri = uri; + edmxIncludes = new ArrayList<EdmxReferenceInclude>(); + edmxIncludeAnnotations = new ArrayList<EdmxReferenceIncludeAnnotation>(); + } + + /** + * Get URI for the reference + * @return uri for the reference + */ + public URI getUri() { + return uri; + } + + /** + * edmx:Include elements that specify the schemas to include from the target document + * + * @return list of {@link EdmxReferenceInclude} in reference or null if none specified + */ + public List<EdmxReferenceInclude> getIncludes() { + return Collections.unmodifiableList(edmxIncludes); + } + + /** + * Add include element to current list. + * + * @param include to be added + * @return this EdmxReference object + */ + public EdmxReference addInclude(final EdmxReferenceInclude include) { + edmxIncludes.add(include); + return this; + } + + /** + * edmx:IncludeAnnotations elements that specify the annotations to include from the target document. + * + * @return List of {@link EdmxReferenceIncludeAnnotation} or null if none specified + */ + public List<EdmxReferenceIncludeAnnotation> getIncludeAnnotations() { + return Collections.unmodifiableList(edmxIncludeAnnotations); + } + + /** + * Add include annotation element to current list. + * + * @param includeAnnotation to be added + * @return this EdmxReference object + */ + public EdmxReference addIncludeAnnotation(final EdmxReferenceIncludeAnnotation includeAnnotation) { + edmxIncludeAnnotations.add(includeAnnotation); + return this; + } + + @Override + public List<CsdlAnnotation> getAnnotations() { + return annotations; + } + + /** + * Sets annotations. + * + * @param annotations the annotations + * @return the annotations + */ + public EdmxReference setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReferenceInclude.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReferenceInclude.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReferenceInclude.java new file mode 100644 index 0000000..d552779 --- /dev/null +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReferenceInclude.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this 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.commons.api.edmx; + +/** + * edmx:Include elements that specify the schemas to include from the target document. + */ +public class EdmxReferenceInclude { + private final String namespace; + private final String alias; + + /** + * Create include with given namespace and alias. + * + * @param namespace of include + * @param alias of include + */ + public EdmxReferenceInclude(final String namespace, final String alias) { + this.namespace = namespace; + this.alias = alias; + } + + /** + * Create include with given namespace and empty (<code>NULL</code>) alias. + * + * @param namespace of include + */ + public EdmxReferenceInclude(final String namespace) { + this(namespace, null); + } + + /** + * @return Namespace of the include + */ + public String getNamespace() { + return namespace; + } + + /** + * @return alias of the include if one defined; null otherwise + */ + public String getAlias() { + return alias; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReferenceIncludeAnnotation.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReferenceIncludeAnnotation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReferenceIncludeAnnotation.java new file mode 100644 index 0000000..9593cb1 --- /dev/null +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/EdmxReferenceIncludeAnnotation.java @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this 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.commons.api.edmx; + +/** + * POJO for Edmx Reference Include Annotation. + */ +public class EdmxReferenceIncludeAnnotation { + private final String termNamespace; + private String qualifier; + private String targetNamespace; + + /** + * Create include annotation with given termNamespace and empty qualifier and targetNamespace. + * + * @param termNamespace of include annotation + */ + public EdmxReferenceIncludeAnnotation(final String termNamespace) { + this(termNamespace, null, null); + } + + /** + * Create include annotation with given termNamespace, qualifier and targetNamespace. + * + * @param termNamespace of include annotation + * @param qualifier of include annotation + * @param targetNamespace of include annotation + */ + public EdmxReferenceIncludeAnnotation(final String termNamespace, final String qualifier, + final String targetNamespace) { + this.termNamespace = termNamespace; + this.qualifier = qualifier; + this.targetNamespace = targetNamespace; + } + + /** + * @return TermNamespace of the include annotation + */ + public String getTermNamespace() { + return termNamespace; + } + + /** + * @return Qualifier if one defined; null otherwise + */ + public String getQualifier() { + return qualifier; + } + + /** + * Set qualifier for this include annotation. + * + * @param qualifier for include annotation + * @return this include annotation + */ + public EdmxReferenceIncludeAnnotation setQualifier(final String qualifier) { + this.qualifier = qualifier; + return this; + } + + /** + * @return targetNamespace if defined; null otherwise + */ + public String getTargetNamespace() { + return targetNamespace; + } + + /** + * Set target namespace for this include annotation. + * + * @param targetNamespace for include annotation + * @return this include annotation + */ + public EdmxReferenceIncludeAnnotation setTargetNamespace(final String targetNamespace) { + this.targetNamespace = targetNamespace; + return this; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/package-info.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/package-info.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/package-info.java new file mode 100644 index 0000000..1f0e6f2 --- /dev/null +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edmx/package-info.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * Olingo Server API - Edmx + * <p> + * The edmx package is used to condense all about the Olingo OData EDMX handling. + * + */ +package org.apache.olingo.commons.api.edmx; + http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.java b/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.java deleted file mode 100644 index 8298c0e..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.server.api.edmx; - -import java.net.URI; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; - -/** - * POJO for Edmx Reference. - */ -public class EdmxReference implements CsdlAnnotatable{ - - private final URI uri; - private final List<EdmxReferenceInclude> edmxIncludes; - private final List<EdmxReferenceIncludeAnnotation> edmxIncludeAnnotations; - private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); - /** - * Create reference with given uri - * - * @param uri of reference - */ - public EdmxReference(final URI uri) { - this.uri = uri; - edmxIncludes = new ArrayList<EdmxReferenceInclude>(); - edmxIncludeAnnotations = new ArrayList<EdmxReferenceIncludeAnnotation>(); - } - - /** - * Get URI for the reference - * @return uri for the reference - */ - public URI getUri() { - return uri; - } - - /** - * edmx:Include elements that specify the schemas to include from the target document - * - * @return list of {@link EdmxReferenceInclude} in reference or null if none specified - */ - public List<EdmxReferenceInclude> getIncludes() { - return Collections.unmodifiableList(edmxIncludes); - } - - /** - * Add include element to current list. - * - * @param include to be added - * @return this EdmxReference object - */ - public EdmxReference addInclude(final EdmxReferenceInclude include) { - edmxIncludes.add(include); - return this; - } - - /** - * edmx:IncludeAnnotations elements that specify the annotations to include from the target document. - * - * @return List of {@link EdmxReferenceIncludeAnnotation} or null if none specified - */ - public List<EdmxReferenceIncludeAnnotation> getIncludeAnnotations() { - return Collections.unmodifiableList(edmxIncludeAnnotations); - } - - /** - * Add include annotation element to current list. - * - * @param includeAnnotation to be added - * @return this EdmxReference object - */ - public EdmxReference addIncludeAnnotation(final EdmxReferenceIncludeAnnotation includeAnnotation) { - edmxIncludeAnnotations.add(includeAnnotation); - return this; - } - - @Override - public List<CsdlAnnotation> getAnnotations() { - return annotations; - } - - /** - * Sets annotations. - * - * @param annotations the annotations - * @return the annotations - */ - public EdmxReference setAnnotations(final List<CsdlAnnotation> annotations) { - this.annotations = annotations; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.java b/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.java deleted file mode 100644 index acd6d8c..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.server.api.edmx; - -/** - * edmx:Include elements that specify the schemas to include from the target document. - */ -public class EdmxReferenceInclude { - private final String namespace; - private final String alias; - - /** - * Create include with given namespace and alias. - * - * @param namespace of include - * @param alias of include - */ - public EdmxReferenceInclude(final String namespace, final String alias) { - this.namespace = namespace; - this.alias = alias; - } - - /** - * Create include with given namespace and empty (<code>NULL</code>) alias. - * - * @param namespace of include - */ - public EdmxReferenceInclude(final String namespace) { - this(namespace, null); - } - - /** - * @return Namespace of the include - */ - public String getNamespace() { - return namespace; - } - - /** - * @return alias of the include if one defined; null otherwise - */ - public String getAlias() { - return alias; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java b/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java deleted file mode 100644 index 4139c4a..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.server.api.edmx; - -/** - * POJO for Edmx Reference Include Annotation. - */ -public class EdmxReferenceIncludeAnnotation { - private final String termNamespace; - private String qualifier; - private String targetNamespace; - - /** - * Create include annotation with given termNamespace and empty qualifier and targetNamespace. - * - * @param termNamespace of include annotation - */ - public EdmxReferenceIncludeAnnotation(final String termNamespace) { - this(termNamespace, null, null); - } - - /** - * Create include annotation with given termNamespace, qualifier and targetNamespace. - * - * @param termNamespace of include annotation - * @param qualifier of include annotation - * @param targetNamespace of include annotation - */ - public EdmxReferenceIncludeAnnotation(final String termNamespace, final String qualifier, - final String targetNamespace) { - this.termNamespace = termNamespace; - this.qualifier = qualifier; - this.targetNamespace = targetNamespace; - } - - /** - * @return TermNamespace of the include annotation - */ - public String getTermNamespace() { - return termNamespace; - } - - /** - * @return Qualifier if one defined; null otherwise - */ - public String getQualifier() { - return qualifier; - } - - /** - * Set qualifier for this include annotation. - * - * @param qualifier for include annotation - * @return this include annotation - */ - public EdmxReferenceIncludeAnnotation setQualifier(final String qualifier) { - this.qualifier = qualifier; - return this; - } - - /** - * @return targetNamespace if defined; null otherwise - */ - public String getTargetNamespace() { - return targetNamespace; - } - - /** - * Set target namespace for this include annotation. - * - * @param targetNamespace for include annotation - * @return this include annotation - */ - public EdmxReferenceIncludeAnnotation setTargetNamespace(final String targetNamespace) { - this.targetNamespace = targetNamespace; - return this; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/package-info.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/package-info.java b/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/package-info.java deleted file mode 100644 index 243d894..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/server/api/edmx/package-info.java +++ /dev/null @@ -1,26 +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. - */ -/** - * Olingo Server API - Edmx - * <p> - * The edmx package is used to condense all about the Olingo OData EDMX handling. - * - */ -package org.apache.olingo.server.api.edmx; - http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java index 118f07a..112f934 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java @@ -24,13 +24,13 @@ import java.util.List; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.ex.ODataRuntimeException; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.debug.DebugResponseHelper; import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.FixedFormatDeserializer; import org.apache.olingo.server.api.deserializer.ODataDeserializer; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.etag.ETagHelper; import org.apache.olingo.server.api.etag.ServiceMetadataETagSupport; import org.apache.olingo.server.api.prefer.Preferences; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java index 7840115..c043f8c 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.server.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.etag.ServiceMetadataETagSupport; /** http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java index 03359f5..3023c4b 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java @@ -86,10 +86,10 @@ import org.apache.olingo.commons.api.edm.provider.annotation.CsdlPropertyPath; import org.apache.olingo.commons.api.edm.provider.annotation.CsdlPropertyValue; import org.apache.olingo.commons.api.edm.provider.annotation.CsdlRecord; import org.apache.olingo.commons.api.edm.provider.annotation.CsdlUrlRef; +import org.apache.olingo.commons.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.edmx.EdmxReferenceInclude; +import org.apache.olingo.commons.api.edmx.EdmxReferenceIncludeAnnotation; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; -import org.apache.olingo.server.api.edmx.EdmxReferenceInclude; -import org.apache.olingo.server.api.edmx.EdmxReferenceIncludeAnnotation; /** * This class can convert a CSDL document into EDMProvider object http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/SchemaBasedEdmProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/SchemaBasedEdmProvider.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/SchemaBasedEdmProvider.java index 348602e..829323f 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/SchemaBasedEdmProvider.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/SchemaBasedEdmProvider.java @@ -41,9 +41,9 @@ import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import org.apache.olingo.commons.api.edm.provider.CsdlSingleton; import org.apache.olingo.commons.api.edm.provider.CsdlTerm; import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; +import org.apache.olingo.commons.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.edmx.EdmxReferenceInclude; import org.apache.olingo.commons.api.ex.ODataException; -import org.apache.olingo.server.api.edmx.EdmxReference; -import org.apache.olingo.server.api.edmx.EdmxReferenceInclude; public class SchemaBasedEdmProvider implements CsdlEdmProvider { private final List<CsdlSchema> edmSchemas = new ArrayList<CsdlSchema>(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java index 65037f6..71ea0e7 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.server.api.OData; @@ -34,7 +35,6 @@ import org.apache.olingo.server.api.debug.DebugResponseHelper; import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.FixedFormatDeserializer; import org.apache.olingo.server.api.deserializer.ODataDeserializer; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.etag.ETagHelper; import org.apache.olingo.server.api.etag.ServiceMetadataETagSupport; import org.apache.olingo.server.api.prefer.Preferences; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java index 4f07af0..06052b8 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java @@ -25,9 +25,9 @@ import java.util.List; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.etag.ServiceMetadataETagSupport; /** http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java index 94ff63b..ff4b009 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java @@ -74,10 +74,10 @@ import org.apache.olingo.commons.api.edm.annotation.EdmPropertyValue; import org.apache.olingo.commons.api.edm.annotation.EdmRecord; import org.apache.olingo.commons.api.edm.annotation.EdmUrlRef; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.commons.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.edmx.EdmxReferenceInclude; +import org.apache.olingo.commons.api.edmx.EdmxReferenceIncludeAnnotation; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; -import org.apache.olingo.server.api.edmx.EdmxReferenceInclude; -import org.apache.olingo.server.api.edmx.EdmxReferenceIncludeAnnotation; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializer.java index 72d93a9..e2f3c64 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializer.java @@ -26,8 +26,8 @@ import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmSingleton; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java index db88062..27e3e90 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java @@ -84,14 +84,14 @@ import org.apache.olingo.commons.api.edm.provider.annotation.CsdlPropertyPath; import org.apache.olingo.commons.api.edm.provider.annotation.CsdlPropertyValue; import org.apache.olingo.commons.api.edm.provider.annotation.CsdlRecord; import org.apache.olingo.commons.api.edm.provider.annotation.CsdlUrlRef; +import org.apache.olingo.commons.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.edmx.EdmxReferenceInclude; +import org.apache.olingo.commons.api.edmx.EdmxReferenceIncludeAnnotation; //CHECKSTYLE:ON import org.apache.olingo.commons.api.ex.ODataException; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; -import org.apache.olingo.server.api.edmx.EdmxReferenceInclude; -import org.apache.olingo.server.api.edmx.EdmxReferenceIncludeAnnotation; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.core.ServiceMetadataImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializerTest.java index c3e3598..befa441 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServiceDocumentXmlSerializerTest.java @@ -33,10 +33,10 @@ import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmSingleton; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.core.ServiceMetadataImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java index 644872d..eee52e9 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java @@ -29,12 +29,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.olingo.commons.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.edmx.EdmxReferenceInclude; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataHttpHandler; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.debug.DefaultDebugSupport; -import org.apache.olingo.server.api.edmx.EdmxReference; -import org.apache.olingo.server.api.edmx.EdmxReferenceInclude; import org.apache.olingo.server.tecsvc.data.DataProvider; import org.apache.olingo.server.tecsvc.processor.TechnicalActionProcessor; import org.apache.olingo.server.tecsvc.processor.TechnicalBatchProcessor; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java index 314ab8a..c48d77a 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java @@ -36,9 +36,9 @@ import org.apache.olingo.commons.api.data.Parameter; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ValueType; import org.apache.olingo.commons.api.edm.Edm; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.tecsvc.data.DataProvider.DataProviderException; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java index f71f1a3..4686cba 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java @@ -29,8 +29,8 @@ import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntitySet; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.uri.UriParameter; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerImplTest.java index 964ed2b..7b1a05b 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerImplTest.java @@ -37,6 +37,7 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider; import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.ex.ODataException; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.http.HttpHeader; @@ -49,7 +50,6 @@ import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ODataServerError; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.batch.BatchFacade; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.processor.ActionComplexCollectionProcessor; import org.apache.olingo.server.api.processor.ActionComplexProcessor; import org.apache.olingo.server.api.processor.ActionEntityCollectionProcessor; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/PreconditionsValidatorTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/PreconditionsValidatorTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/PreconditionsValidatorTest.java index bf68fb3..1765ac3 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/PreconditionsValidatorTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/PreconditionsValidatorTest.java @@ -30,8 +30,8 @@ import java.util.List; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmBindingTarget; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.etag.CustomETagSupport; import org.apache.olingo.server.api.etag.PreconditionException; import org.apache.olingo.server.api.uri.UriInfo; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/AbstractODataDeserializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/AbstractODataDeserializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/AbstractODataDeserializerTest.java index 49c4ac9..7e087fa 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/AbstractODataDeserializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/AbstractODataDeserializerTest.java @@ -23,9 +23,9 @@ import java.io.InputStream; import java.util.Collections; import org.apache.olingo.commons.api.edm.Edm; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; public class AbstractODataDeserializerTest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java index 3754da1..022132c 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java @@ -43,13 +43,13 @@ import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmProperty; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataContent; import org.apache.olingo.server.api.ODataContentWriteErrorCallback; import org.apache.olingo.server.api.ODataContentWriteErrorContext; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.serializer.ComplexSerializerOptions; import org.apache.olingo.server.api.serializer.EntityCollectionSerializerOptions; import org.apache.olingo.server.api.serializer.EntitySerializerOptions; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java index 12a5edc..74a85ad 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java @@ -26,10 +26,10 @@ import java.io.InputStream; import java.util.Collections; import org.apache.commons.io.IOUtils; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.etag.ServiceMetadataETagSupport; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLHelperTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLHelperTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLHelperTest.java index 92b069d..d59dbfd 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLHelperTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLHelperTest.java @@ -28,8 +28,8 @@ import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmProperty; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.uri.UriParameter; import org.apache.olingo.server.api.uri.queryoption.ExpandItem; import org.apache.olingo.server.api.uri.queryoption.ExpandOption; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java index 5f83e8b..2b7a5fd 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java @@ -26,11 +26,11 @@ import java.net.URI; import java.util.Collections; import org.apache.commons.io.IOUtils; +import org.apache.olingo.commons.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.edmx.EdmxReferenceInclude; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; -import org.apache.olingo.server.api.edmx.EdmxReferenceInclude; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java index ae22ea4..bd24f27 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java @@ -42,10 +42,10 @@ import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmProperty; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.serializer.ComplexSerializerOptions; import org.apache.olingo.server.api.serializer.EntityCollectionSerializerOptions; import org.apache.olingo.server.api.serializer.EntitySerializerOptions; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java index d3dba46..e5ed731 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java @@ -25,8 +25,8 @@ import org.apache.olingo.commons.api.data.ValueType; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntitySet; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.api.uri.UriHelper; import org.apache.olingo.server.tecsvc.data.DataProvider; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java index 72f3eb9..8baf61b 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java @@ -39,8 +39,8 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmSingleton; import org.apache.olingo.commons.api.edm.EdmType; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.uri.UriParameter; import org.apache.olingo.server.api.uri.UriResourceKind; import org.apache.olingo.server.api.uri.queryoption.expression.Expression; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java index c2eb419..a53d119 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java @@ -26,9 +26,9 @@ import java.util.Collections; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.uri.UriInfoAll; import org.apache.olingo.server.api.uri.UriInfoCrossjoin; import org.apache.olingo.server.api.uri.UriInfoKind; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java index 1b8c398..c38fba5 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestUriParserImpl.java @@ -23,8 +23,8 @@ import java.util.Collections; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriResourceKind; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java index 66528a0..2791f75 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java @@ -32,8 +32,8 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriInfoResource; import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java index 3d5e97f..f64a711 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java @@ -24,9 +24,9 @@ import static org.junit.Assert.fail; import java.util.Collections; import org.apache.olingo.commons.api.edm.Edm; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.server.api.OData; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.core.uri.parser.Parser; import org.apache.olingo.server.core.uri.parser.UriParserException; import org.apache.olingo.server.core.uri.parser.UriParserSemanticException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1e10be1/samples/server/src/main/java/org/apache/olingo/server/sample/CarsServlet.java ---------------------------------------------------------------------- diff --git a/samples/server/src/main/java/org/apache/olingo/server/sample/CarsServlet.java b/samples/server/src/main/java/org/apache/olingo/server/sample/CarsServlet.java index f6a17dc..7812f6a 100644 --- a/samples/server/src/main/java/org/apache/olingo/server/sample/CarsServlet.java +++ b/samples/server/src/main/java/org/apache/olingo/server/sample/CarsServlet.java @@ -27,10 +27,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.olingo.commons.api.edmx.EdmxReference; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataHttpHandler; import org.apache.olingo.server.api.ServiceMetadata; -import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.sample.data.DataProvider; import org.apache.olingo.server.sample.edmprovider.CarsEdmProvider; import org.apache.olingo.server.sample.processor.CarsProcessor;
