http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/IsOf.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/IsOf.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/IsOf.java deleted file mode 100644 index dcaa4fa..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/IsOf.java +++ /dev/null @@ -1,38 +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.client.api.edm.xml.annotation; - -import org.apache.olingo.client.api.edm.xml.Annotatable; -import org.apache.olingo.commons.api.edm.geo.SRID; - -public interface IsOf extends DynamicAnnotationExpression, Annotatable { - - Integer getMaxLength(); - - Integer getPrecision(); - - Integer getScale(); - - SRID getSrid(); - - String getType(); - - DynamicAnnotationExpression getValue(); - -}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/LabeledElement.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/LabeledElement.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/LabeledElement.java deleted file mode 100644 index 9a509e9..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/LabeledElement.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.api.edm.xml.annotation; - -import org.apache.olingo.client.api.edm.xml.Annotatable; - -public interface LabeledElement extends DynamicAnnotationExpression, Annotatable { - - String getName(); - - DynamicAnnotationExpression getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/LabeledElementReference.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/LabeledElementReference.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/LabeledElementReference.java deleted file mode 100644 index 68ea203..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/LabeledElementReference.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml.annotation; - -public interface LabeledElementReference extends DynamicAnnotationExpression { - - String getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/NavigationPropertyPath.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/NavigationPropertyPath.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/NavigationPropertyPath.java deleted file mode 100644 index 4d2d06c..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/NavigationPropertyPath.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml.annotation; - -public interface NavigationPropertyPath extends DynamicAnnotationExpression { - - String getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Not.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Not.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Not.java deleted file mode 100644 index 123dc93..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Not.java +++ /dev/null @@ -1,24 +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.client.api.edm.xml.annotation; - -public interface Not extends DynamicAnnotationExpression { - - DynamicAnnotationExpression getExpression(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Null.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Null.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Null.java deleted file mode 100644 index 63af639..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Null.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml.annotation; - -import org.apache.olingo.client.api.edm.xml.Annotatable; - -public interface Null extends DynamicAnnotationExpression, Annotatable { -//No additional methods needed for now. -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Path.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Path.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Path.java deleted file mode 100644 index b24ceef..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Path.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml.annotation; - -public interface Path extends DynamicAnnotationExpression { - - String getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/PropertyPath.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/PropertyPath.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/PropertyPath.java deleted file mode 100644 index 99ad87a..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/PropertyPath.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml.annotation; - -public interface PropertyPath extends DynamicAnnotationExpression { - - String getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/PropertyValue.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/PropertyValue.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/PropertyValue.java deleted file mode 100644 index fbf4b40..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/PropertyValue.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.api.edm.xml.annotation; - -import org.apache.olingo.client.api.edm.xml.Annotatable; - -public interface PropertyValue extends DynamicAnnotationExpression, Annotatable { - - String getProperty(); - - AnnotationExpression getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Record.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Record.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Record.java deleted file mode 100644 index b597558..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Record.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.api.edm.xml.annotation; - -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.Annotatable; - -public interface Record extends DynamicAnnotationExpression, Annotatable { - - List<PropertyValue> getPropertyValues(); - - String getType(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/TwoParamsOpDynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/TwoParamsOpDynamicAnnotationExpression.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/TwoParamsOpDynamicAnnotationExpression.java deleted file mode 100644 index 276ba3d..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/TwoParamsOpDynamicAnnotationExpression.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.client.api.edm.xml.annotation; - -public interface TwoParamsOpDynamicAnnotationExpression extends DynamicAnnotationExpression { - - public static enum Type { - - And, - Or, - Eq, - Ne, - Gt, - Ge, - Lt, - Le; - - public static Type fromString(final String value) { - Type result = null; - for (Type type : values()) { - if (value.equals(type.name())) { - result = type; - } - } - return result; - } - } - - Type getType(); - - DynamicAnnotationExpression getLeftExpression(); - - DynamicAnnotationExpression getRightExpression(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/UrlRef.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/UrlRef.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/UrlRef.java deleted file mode 100644 index 9f7c44c..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/UrlRef.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml.annotation; - -public interface UrlRef extends DynamicAnnotationExpression { - - AnnotationExpression getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java index 611666a..e895341 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java @@ -21,7 +21,6 @@ package org.apache.olingo.client.api.serialization; import java.io.InputStream; import java.util.Map; -import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.commons.api.domain.ODataEntitySet; @@ -29,6 +28,7 @@ import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.edm.Edm; +import org.apache.olingo.commons.api.edm.provider.Schema; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java index c7bba68..20d1da1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java @@ -27,15 +27,15 @@ import org.apache.http.client.methods.HttpUriRequest; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.XMLMetadataRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.edm.xml.Annotation; -import org.apache.olingo.client.api.edm.xml.Annotations; import org.apache.olingo.client.api.edm.xml.Include; import org.apache.olingo.client.api.edm.xml.IncludeAnnotations; import org.apache.olingo.client.api.edm.xml.Reference; -import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.client.core.edm.xml.AnnotationsImpl; import org.apache.olingo.client.core.edm.xml.SchemaImpl; +import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.Annotations; +import org.apache.olingo.commons.api.edm.provider.Schema; import org.apache.olingo.commons.api.format.ODataFormat; public class XMLMetadataRequestImpl http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImpl.java index 63cfa42..c1dcfa4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.core.edm; -import org.apache.olingo.client.api.edm.xml.Action; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.commons.api.edm.provider.Action; public class EdmActionImpl extends EdmOperationImpl implements EdmAction { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java index d826486..eedcb72 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java @@ -20,7 +20,6 @@ package org.apache.olingo.client.core.edm; import java.util.List; -import org.apache.olingo.client.api.edm.xml.ActionImport; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmActionImport; @@ -28,6 +27,7 @@ import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.ActionImport; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java index f6d0a25..b29d0a9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java @@ -21,11 +21,11 @@ package org.apache.olingo.client.core.edm; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.Annotatable; -import org.apache.olingo.client.api.edm.xml.Annotation; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; +import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.Annotation; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; public class EdmAnnotationHelperImpl implements EdmAnnotationHelper { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java index de46fae..a8a165c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java @@ -21,11 +21,6 @@ package org.apache.olingo.client.core.edm; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.Annotatable; -import org.apache.olingo.client.api.edm.xml.Annotation; -import org.apache.olingo.client.api.edm.xml.annotation.AnnotationExpression; -import org.apache.olingo.client.api.edm.xml.annotation.DynamicAnnotationExpression; -import org.apache.olingo.client.api.edm.xml.annotation.PropertyValue; import org.apache.olingo.client.core.edm.annotation.EdmCastImpl; import org.apache.olingo.client.core.edm.annotation.EdmConstantAnnotationExpressionImpl; import org.apache.olingo.client.core.edm.annotation.EdmIsOfImpl; @@ -38,6 +33,11 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmPropertyValue; +import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.annotation.AnnotationExpression; +import org.apache.olingo.commons.api.edm.provider.annotation.DynamicAnnotationExpression; +import org.apache.olingo.commons.api.edm.provider.annotation.PropertyValue; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.annotation.EdmAndImpl; import org.apache.olingo.commons.core.edm.annotation.EdmAnnotationPathImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java index ebd953d..91cf5fc 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.edm.xml.Annotation; -import org.apache.olingo.client.api.edm.xml.Annotations; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmAnnotations; @@ -34,6 +32,8 @@ import org.apache.olingo.commons.api.edm.EdmSchema; import org.apache.olingo.commons.api.edm.EdmStructuredType; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.Annotations; public class EdmAnnotationsImpl implements EdmAnnotations { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java index 21b7e9b..a75ed61 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java @@ -21,14 +21,14 @@ package org.apache.olingo.client.core.edm; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.BindingTarget; -import org.apache.olingo.client.api.edm.xml.NavigationPropertyBinding; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmNavigationPropertyBinding; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.BindingTarget; +import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding; import org.apache.olingo.commons.core.edm.AbstractEdmBindingTarget; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmNavigationPropertyBindingImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java index 31a7384..409cb58 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java @@ -32,19 +32,6 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.olingo.client.api.edm.xml.Action; -import org.apache.olingo.client.api.edm.xml.Annotatable; -import org.apache.olingo.client.api.edm.xml.Annotation; -import org.apache.olingo.client.api.edm.xml.Annotations; -import org.apache.olingo.client.api.edm.xml.ComplexType; -import org.apache.olingo.client.api.edm.xml.EntityContainer; -import org.apache.olingo.client.api.edm.xml.EntityType; -import org.apache.olingo.client.api.edm.xml.EnumType; -import org.apache.olingo.client.api.edm.xml.Function; -import org.apache.olingo.client.api.edm.xml.Parameter; -import org.apache.olingo.client.api.edm.xml.Schema; -import org.apache.olingo.client.api.edm.xml.Term; -import org.apache.olingo.client.api.edm.xml.TypeDefinition; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmAnnotations; @@ -57,6 +44,19 @@ import org.apache.olingo.commons.api.edm.EdmSchema; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.Action; +import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.Annotations; +import org.apache.olingo.commons.api.edm.provider.ComplexType; +import org.apache.olingo.commons.api.edm.provider.EntityContainer; +import org.apache.olingo.commons.api.edm.provider.EntityType; +import org.apache.olingo.commons.api.edm.provider.EnumType; +import org.apache.olingo.commons.api.edm.provider.Function; +import org.apache.olingo.commons.api.edm.provider.Parameter; +import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.Term; +import org.apache.olingo.commons.api.edm.provider.TypeDefinition; import org.apache.olingo.commons.core.edm.AbstractEdm; import org.apache.olingo.commons.core.edm.EdmTypeInfo; @@ -106,7 +106,7 @@ public class EdmClientImpl extends AbstractEdm { final Schema schema = xmlSchemaByNamespace.get(containerName.getNamespace()); if (schema != null) { - final EntityContainer xmlEntityContainer = schema.getDefaultEntityContainer(); + final EntityContainer xmlEntityContainer = schema.getEntityContainer(); if (xmlEntityContainer != null) { result = new EdmEntityContainerImpl(this, containerName, xmlEntityContainer); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java index d985110..5861640 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java @@ -21,13 +21,13 @@ package org.apache.olingo.client.core.edm; import java.util.List; import java.util.Map; -import org.apache.olingo.client.api.edm.xml.ComplexType; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.ComplexType; import org.apache.olingo.commons.core.edm.AbstractEdmComplexType; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java index 3d1a624..7e3f7f0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java @@ -21,11 +21,6 @@ package org.apache.olingo.client.core.edm; import java.util.Collections; import java.util.List; -import org.apache.olingo.client.api.edm.xml.ActionImport; -import org.apache.olingo.client.api.edm.xml.EntityContainer; -import org.apache.olingo.client.api.edm.xml.EntitySet; -import org.apache.olingo.client.api.edm.xml.FunctionImport; -import org.apache.olingo.client.api.edm.xml.Singleton; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmActionImport; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -34,6 +29,11 @@ import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmSingleton; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.ActionImport; +import org.apache.olingo.commons.api.edm.provider.EntityContainer; +import org.apache.olingo.commons.api.edm.provider.EntitySet; +import org.apache.olingo.commons.api.edm.provider.FunctionImport; +import org.apache.olingo.commons.api.edm.provider.Singleton; import org.apache.olingo.commons.core.edm.AbstractEdmEntityContainer; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; @@ -47,8 +47,8 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer { public EdmEntityContainerImpl(final Edm edm, final FullQualifiedName entityContainerName, final EntityContainer xmlEntityContainer) { - super(edm, entityContainerName, xmlEntityContainer.getExtends() == null - ? null : new FullQualifiedName(xmlEntityContainer.getExtends())); + super(edm, entityContainerName, xmlEntityContainer.getExtendsContainer() == null + ? null : new FullQualifiedName(xmlEntityContainer.getExtendsContainer())); this.xmlEntityContainer = xmlEntityContainer; this.helper = new EdmAnnotationHelperImpl(edm, xmlEntityContainer); @@ -65,7 +65,7 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer { return singleton == null ? null : new EdmSingletonImpl(edm, this, singletonName, new EdmTypeInfo.Builder(). - setTypeExpression(singleton.getEntityType()). + setTypeExpression(singleton.getType()). setDefaultNamespace(entityContainerName.getNamespace()). build().getFullQualifiedName(), singleton); } @@ -76,7 +76,7 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer { final EntitySet entitySet = xmlEntityContainer.getEntitySet(entitySetName); if (entitySet != null) { - final FullQualifiedName entityType = new EdmTypeInfo.Builder().setTypeExpression(entitySet.getEntityType()). + final FullQualifiedName entityType = new EdmTypeInfo.Builder().setTypeExpression(entitySet.getType()). setDefaultNamespace(entityContainerName.getNamespace()).build().getFullQualifiedName(); result = new EdmEntitySetImpl(edm, this, entitySetName, entityType, entitySet); } @@ -113,7 +113,7 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer { if (localEntitySets != null) { for (EntitySet entitySet : localEntitySets) { EdmEntitySet edmSet; - final FullQualifiedName entityType = new EdmTypeInfo.Builder().setTypeExpression(entitySet.getEntityType()). + final FullQualifiedName entityType = new EdmTypeInfo.Builder().setTypeExpression(entitySet.getType()). setDefaultNamespace(entityContainerName.getNamespace()).build().getFullQualifiedName(); edmSet = new EdmEntitySetImpl(edm, this, entitySet.getName(), entityType, entitySet); entitySets.put(edmSet.getName(), edmSet); @@ -138,7 +138,7 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer { for (Singleton singleton : localSingletons) { singletons.put(singleton.getName(), new EdmSingletonImpl(edm, this, singleton.getName(), new EdmTypeInfo.Builder(). - setTypeExpression(singleton.getEntityType()).setDefaultNamespace(entityContainerName.getNamespace()). + setTypeExpression(singleton.getType()).setDefaultNamespace(entityContainerName.getNamespace()). build().getFullQualifiedName(), singleton)); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntitySetImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntitySetImpl.java index d4aa183..85934cb 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntitySetImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntitySetImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.core.edm; -import org.apache.olingo.client.api.edm.xml.EntitySet; 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.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.EntitySet; public class EdmEntitySetImpl extends EdmBindingTargetImpl implements EdmEntitySet { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java index 4fef9a2..c35de08 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.olingo.client.api.edm.xml.EntityType; -import org.apache.olingo.client.api.edm.xml.PropertyRef; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -32,6 +30,8 @@ import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.EntityType; +import org.apache.olingo.commons.api.edm.provider.PropertyRef; import org.apache.olingo.commons.core.edm.AbstractEdmEntityType; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; @@ -56,12 +56,11 @@ public class EdmEntityTypeImpl extends AbstractEdmEntityType { final List<EdmKeyPropertyRef> edmKey; // Abstract EntityTypes do not necessarily have keys - if (entityType.isAbstractType() && entityType.getKey() == null) { + if (entityType.isAbstract() && entityType.getKey() == null) { edmKey = new ArrayList<EdmKeyPropertyRef>(); } else { - edmKey = new ArrayList<EdmKeyPropertyRef>( - entityType.getKey().getPropertyRefs().size()); - for (PropertyRef ref : entityType.getKey().getPropertyRefs()) { + edmKey = new ArrayList<EdmKeyPropertyRef>(entityType.getKey().size()); + for (PropertyRef ref : entityType.getKey()) { edmKey.add(new EdmKeyPropertyRefImpl(instance, ref)); } } @@ -76,7 +75,7 @@ public class EdmEntityTypeImpl extends AbstractEdmEntityType { private EdmEntityTypeImpl(final Edm edm, final FullQualifiedName fqn, final FullQualifiedName baseTypeName, final EntityType entityType) { - super(edm, fqn, baseTypeName, entityType.isHasStream()); + super(edm, fqn, baseTypeName, entityType.hasStream()); this.typeHelper = new EdmStructuredTypeHelperImpl(edm, getFullQualifiedName(), entityType); this.annotationHelper = new EdmAnnotationHelperImpl(edm, entityType); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java index 297aeca..d044f8c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java @@ -26,14 +26,14 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.ArrayUtils; -import org.apache.olingo.client.api.edm.xml.EnumType; -import org.apache.olingo.client.api.edm.xml.Member; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmMember; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.EnumMember; +import org.apache.olingo.commons.api.edm.provider.EnumType; import org.apache.olingo.commons.core.edm.AbstractEdmEnumType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; @@ -69,10 +69,10 @@ public class EdmEnumTypeImpl extends AbstractEdmEnumType { this.underlyingType = EdmPrimitiveTypeFactory.getInstance(underlyingTipeKind); } - final List<? extends Member> xmlMembers = xmlEnumType.getMembers(); + final List<EnumMember> xmlMembers = xmlEnumType.getMembers(); final List<String> _memberNames = new ArrayList<String>(); final Map<String, EdmMember> _members = new LinkedHashMap<String, EdmMember>(xmlMembers.size()); - for (Member xmlMember : xmlMembers) { + for (EnumMember xmlMember : xmlMembers) { _memberNames.add(xmlMember.getName()); _members.put(xmlMember.getName(), new EdmMemberImpl(edm, fqn, xmlMember)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImpl.java index 1e7f9f6..0930bf2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.core.edm; -import org.apache.olingo.client.api.edm.xml.Function; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.commons.api.edm.provider.Function; public class EdmFunctionImpl extends EdmOperationImpl implements EdmFunction { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java index 170c046..ad9baba 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java @@ -20,7 +20,6 @@ package org.apache.olingo.client.core.edm; import java.util.List; -import org.apache.olingo.client.api.edm.xml.FunctionImport; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -28,6 +27,7 @@ import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.FunctionImport; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmKeyPropertyRefImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmKeyPropertyRefImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmKeyPropertyRefImpl.java index 9dca199..796b602 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmKeyPropertyRefImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmKeyPropertyRefImpl.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.core.edm; -import org.apache.olingo.client.api.edm.xml.PropertyRef; import org.apache.olingo.commons.api.edm.EdmEntityType; +import org.apache.olingo.commons.api.edm.provider.PropertyRef; import org.apache.olingo.commons.core.edm.AbstractEdmKeyPropertyRef; public class EdmKeyPropertyRefImpl extends AbstractEdmKeyPropertyRef { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java index bf19703..b14fece 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java @@ -21,12 +21,12 @@ package org.apache.olingo.client.core.edm; import java.util.Collections; import java.util.List; -import org.apache.olingo.client.api.edm.xml.Member; -import org.apache.olingo.client.core.edm.xml.MemberImpl; +import org.apache.olingo.client.core.edm.xml.EnumMemberImpl; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.EnumMember; import org.apache.olingo.commons.core.edm.AbstractEdmMember; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; @@ -34,10 +34,10 @@ public class EdmMemberImpl extends AbstractEdmMember { private EdmAnnotationHelper helper; - public EdmMemberImpl(final Edm edm, final FullQualifiedName enumFQN, final Member member) { + public EdmMemberImpl(final Edm edm, final FullQualifiedName enumFQN, final EnumMember member) { super(edm, enumFQN, member.getName(), member.getValue()); - this.helper = member instanceof MemberImpl - ? new EdmAnnotationHelperImpl(edm, (MemberImpl) member) + this.helper = member instanceof EnumMemberImpl + ? new EdmAnnotationHelperImpl(edm, member) : null; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java index c3aec23..5b8e784 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java @@ -21,13 +21,13 @@ package org.apache.olingo.client.core.edm; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.NavigationProperty; -import org.apache.olingo.client.api.edm.xml.ReferentialConstraint; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmReferentialConstraint; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.NavigationProperty; +import org.apache.olingo.commons.api.edm.provider.ReferentialConstraint; import org.apache.olingo.commons.core.edm.AbstractEdmNavigationProperty; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; @@ -71,7 +71,7 @@ public class EdmNavigationPropertyImpl extends AbstractEdmNavigationProperty { } @Override - public Boolean isNullable() { + public boolean isNullable() { return navigationProperty.isNullable(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java index 0df592c..69fb192 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java @@ -22,20 +22,20 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.edm.xml.Action; -import org.apache.olingo.client.api.edm.xml.Parameter; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmParameter; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.commons.api.edm.provider.Operation; +import org.apache.olingo.commons.api.edm.provider.Parameter; import org.apache.olingo.commons.core.edm.AbstractEdmOperation; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; public abstract class EdmOperationImpl extends AbstractEdmOperation { - protected final Action operation; + protected final Operation operation; protected final EdmAnnotationHelper helper; @@ -63,7 +63,7 @@ public abstract class EdmOperationImpl extends AbstractEdmOperation { return instance; } - protected EdmOperationImpl(final Edm edm, final FullQualifiedName name, final Action operation, + protected EdmOperationImpl(final Edm edm, final FullQualifiedName name, final Operation operation, final EdmTypeKind kind) { super(edm, name, kind); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java index a82e252..27bc5f4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java @@ -21,13 +21,13 @@ package org.apache.olingo.client.core.edm; import java.util.Collections; import java.util.List; -import org.apache.olingo.client.api.edm.xml.Parameter; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmMapping; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.geo.SRID; +import org.apache.olingo.commons.api.edm.provider.Parameter; import org.apache.olingo.commons.core.edm.AbstractEdmParameter; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; @@ -58,7 +58,7 @@ public class EdmParameterImpl extends AbstractEdmParameter { } @Override - public Boolean isNullable() { + public boolean isNullable() { return parameter.isNullable(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java index 9c34472..be3e49e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java @@ -21,13 +21,13 @@ package org.apache.olingo.client.core.edm; import java.util.Collections; import java.util.List; -import org.apache.olingo.client.api.edm.xml.Property; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmMapping; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.geo.SRID; +import org.apache.olingo.commons.api.edm.provider.Property; import org.apache.olingo.commons.core.edm.AbstractEdmProperty; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; @@ -47,7 +47,9 @@ public class EdmPropertyImpl extends AbstractEdmProperty { this.structuredTypeName = structuredTypeName; this.property = property; - this.typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(property.getType()).build(); + this.typeInfo = + new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(property.getType()) + .build(); this.helper = new EdmAnnotationHelperImpl(edm, property); } @@ -67,7 +69,7 @@ public class EdmPropertyImpl extends AbstractEdmProperty { } @Override - public Boolean isNullable() { + public boolean isNullable() { return property.isNullable(); } @@ -87,7 +89,7 @@ public class EdmPropertyImpl extends AbstractEdmProperty { } @Override - public Boolean isUnicode() { + public boolean isUnicode() { return property.isUnicode(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java index c9a80e9..aafc05d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java @@ -20,10 +20,10 @@ package org.apache.olingo.client.core.edm; import java.util.List; -import org.apache.olingo.client.api.edm.xml.ReferentialConstraint; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; +import org.apache.olingo.commons.api.edm.provider.ReferentialConstraint; import org.apache.olingo.commons.core.edm.AbstractEdmReferentialConstraint; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java index 071cbfa..03d1537 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.client.core.edm; -import org.apache.olingo.client.api.edm.xml.ReturnType; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.geo.SRID; +import org.apache.olingo.commons.api.edm.provider.ReturnType; import org.apache.olingo.commons.core.edm.AbstractEdmReturnType; import org.apache.olingo.commons.core.edm.EdmTypeInfo; @@ -47,7 +47,7 @@ public class EdmReturnTypeImpl extends AbstractEdmReturnType { } @Override - public Boolean isNullable() { + public boolean isNullable() { return returnType.isNullable(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java index 30ca77a..41c4900 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java @@ -23,17 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.client.api.edm.xml.Action; -import org.apache.olingo.client.api.edm.xml.Annotation; -import org.apache.olingo.client.api.edm.xml.Annotations; -import org.apache.olingo.client.api.edm.xml.ComplexType; -import org.apache.olingo.client.api.edm.xml.EntityContainer; -import org.apache.olingo.client.api.edm.xml.EntityType; -import org.apache.olingo.client.api.edm.xml.EnumType; -import org.apache.olingo.client.api.edm.xml.Function; -import org.apache.olingo.client.api.edm.xml.Schema; -import org.apache.olingo.client.api.edm.xml.Term; -import org.apache.olingo.client.api.edm.xml.TypeDefinition; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -46,6 +35,17 @@ import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.Action; +import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.Annotations; +import org.apache.olingo.commons.api.edm.provider.ComplexType; +import org.apache.olingo.commons.api.edm.provider.EntityContainer; +import org.apache.olingo.commons.api.edm.provider.EntityType; +import org.apache.olingo.commons.api.edm.provider.EnumType; +import org.apache.olingo.commons.api.edm.provider.Function; +import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.Term; +import org.apache.olingo.commons.api.edm.provider.TypeDefinition; import org.apache.olingo.commons.core.edm.AbstractEdmSchema; public class EdmSchemaImpl extends AbstractEdmSchema { @@ -88,7 +88,7 @@ public class EdmSchemaImpl extends AbstractEdmSchema { } private EdmEntityContainer createEntityContainer(final String name) { - final EntityContainer defaultContainer = schema.getEntityContainer(name); + final EntityContainer defaultContainer = schema.getEntityContainer(); if (defaultContainer != null) { final FullQualifiedName entityContainerName = new FullQualifiedName(schema.getNamespace(), defaultContainer.getName()); @@ -99,7 +99,7 @@ public class EdmSchemaImpl extends AbstractEdmSchema { @Override protected EdmEntityContainer createEntityContainer() { - final EntityContainer defaultContainer = schema.getDefaultEntityContainer(); + final EntityContainer defaultContainer = schema.getEntityContainer(); if (defaultContainer != null) { return createEntityContainer(defaultContainer.getName()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSingletonImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSingletonImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSingletonImpl.java index 4735569..4216727 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSingletonImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSingletonImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.core.edm; -import org.apache.olingo.client.api.edm.xml.Singleton; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmSingleton; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.Singleton; public class EdmSingletonImpl extends EdmBindingTargetImpl implements EdmSingleton { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java index b9ed216..bc6e173 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java @@ -21,13 +21,13 @@ package org.apache.olingo.client.core.edm; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.olingo.client.api.edm.xml.NavigationProperty; -import org.apache.olingo.client.api.edm.xml.Property; -import org.apache.olingo.client.api.edm.xml.StructuralType; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.NavigationProperty; +import org.apache.olingo.commons.api.edm.provider.Property; +import org.apache.olingo.commons.api.edm.provider.StructuralType; import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; public class EdmStructuredTypeHelperImpl implements EdmStructuredTypeHelper { @@ -80,6 +80,6 @@ public class EdmStructuredTypeHelperImpl implements EdmStructuredTypeHelper { @Override public boolean isAbstract() { - return structuralType.isAbstractType(); + return structuralType.isAbstract(); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java index 4d85e51..2885ce2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.ClassUtils; -import org.apache.olingo.client.api.edm.xml.Term; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmException; @@ -30,6 +29,7 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.geo.SRID; +import org.apache.olingo.commons.api.edm.provider.Term; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmNamedImpl; import org.apache.olingo.commons.core.edm.EdmTypeInfo; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java index d82e5f6..1b6f1f5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java @@ -20,7 +20,6 @@ package org.apache.olingo.client.core.edm; import java.util.List; -import org.apache.olingo.client.api.edm.xml.TypeDefinition; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmException; @@ -29,6 +28,7 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.geo.SRID; +import org.apache.olingo.commons.api.edm.provider.TypeDefinition; import org.apache.olingo.commons.core.edm.AbstractEdmTypeDefinition; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmCastImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmCastImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmCastImpl.java index 68a9d66..6d510a5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmCastImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmCastImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.client.core.edm.annotation; -import org.apache.olingo.client.api.edm.xml.annotation.Cast; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.annotation.EdmCast; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.geo.SRID; +import org.apache.olingo.commons.api.edm.provider.annotation.Cast; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.core.edm.annotation.AbstractEdmAnnotatableDynamicAnnotationExpression; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java index d973545..397163a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.edm.xml.annotation.ConstantAnnotationExpression; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.domain.ODataEnumValue; import org.apache.olingo.commons.api.domain.ODataValue; @@ -31,6 +30,7 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.annotation.EdmConstantAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; +import org.apache.olingo.commons.api.edm.provider.annotation.ConstantAnnotationExpression; import org.apache.olingo.commons.core.domain.ODataCollectionValueImpl; import org.apache.olingo.commons.core.domain.ODataEnumValueImpl; import org.apache.olingo.commons.core.domain.ODataPrimitiveValueImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmIsOfImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmIsOfImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmIsOfImpl.java index 8ff4757..b732d34 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmIsOfImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/annotation/EdmIsOfImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.client.core.edm.annotation; -import org.apache.olingo.client.api.edm.xml.annotation.IsOf; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmIsOf; import org.apache.olingo.commons.api.edm.geo.SRID; +import org.apache.olingo.commons.api.edm.provider.annotation.IsOf; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.core.edm.annotation.AbstractEdmAnnotatableDynamicAnnotationExpression; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmItem.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmItem.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmItem.java deleted file mode 100644 index 4bee0a5..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmItem.java +++ /dev/null @@ -1,65 +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.client.core.edm.xml; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.olingo.client.api.edm.xml.Named; - -public abstract class AbstractEdmItem implements Serializable { - - private static final long serialVersionUID = 241190986363884784L; - - protected <T extends Named> T getOneByName(final String name, final Collection<T> items) { - final List<T> result = getAllByName(name, items); - return result.isEmpty() ? null : result.get(0); - } - - protected <T extends Named> List<T> getAllByName(final String name, final Collection<T> items) { - final List<T> result = new ArrayList<T>(); - for (T type : items) { - if (name.equals(type.getName())) { - result.add(type); - } - } - return result; - } - - @Override - public boolean equals(final Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - - @Override - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - @Override - public String toString() { - return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE); - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractStructuralType.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractStructuralType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractStructuralType.java deleted file mode 100644 index a8d0401..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractStructuralType.java +++ /dev/null @@ -1,49 +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.client.core.edm.xml; - -import org.apache.olingo.client.api.edm.xml.NavigationProperty; -import org.apache.olingo.client.api.edm.xml.Property; -import org.apache.olingo.client.api.edm.xml.StructuralType; - -public abstract class AbstractStructuralType extends AbstractEdmItem implements StructuralType { - - private static final long serialVersionUID = 1137297128124390440L; - - private String name; - - @Override - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - @Override - public Property getProperty(final String name) { - return getOneByName(name, getProperties()); - } - - @Override - public NavigationProperty getNavigationProperty(final String name) { - return getOneByName(name, getNavigationProperties()); - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImpl.java index b73a97b..4496daa 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImpl.java @@ -18,82 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml; -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.Action; -import org.apache.olingo.client.api.edm.xml.Annotation; -import org.apache.olingo.client.api.edm.xml.Parameter; -import org.apache.olingo.client.api.edm.xml.ReturnType; +import org.apache.olingo.commons.api.edm.provider.Action; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(using = ActionDeserializer.class) -public class ActionImpl extends AbstractEdmItem implements Action { +public class ActionImpl extends Action { private static final long serialVersionUID = 5321541275349234088L; - - private String name; - - private boolean bound = false; - - private String entitySetPath; - - private final List<Parameter> parameters = new ArrayList<Parameter>(); - - private ReturnType returnType; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - - @Override - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - @Override - public boolean isBound() { - return bound; - } - - public void setBound(final boolean bound) { - this.bound = bound; - } - - @Override - public String getEntitySetPath() { - return entitySetPath; - } - - public void setEntitySetPath(final String entitySetPath) { - this.entitySetPath = entitySetPath; - } - - @Override - public Parameter getParameter(final String name) { - return getOneByName(name, getParameters()); - } - - @Override - public List<Parameter> getParameters() { - return parameters; - } - - @Override - public ReturnType getReturnType() { - return returnType; - } - - public void setReturnType(final ReturnType returnType) { - this.returnType = returnType; - } - } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImportImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImportImpl.java index cdfc650..3187868 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ActionImportImpl.java @@ -1,77 +1,51 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.client.core.edm.xml; -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.ActionImport; -import org.apache.olingo.client.api.edm.xml.Annotation; +import org.apache.olingo.commons.api.edm.provider.ActionImport; import com.fasterxml.jackson.annotation.JsonProperty; -public class ActionImportImpl extends AbstractEdmItem implements ActionImport { +public class ActionImportImpl extends ActionImport { private static final long serialVersionUID = 2971468441177647068L; - @JsonProperty(value = "Name", required = true) - private String name; - - @JsonProperty(value = "Action", required = true) - private String action; - - @JsonProperty(value = "EntitySet") - private String entitySet; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - @Override - public List<Annotation> getAnnotations() { - return annotations; + @JsonProperty(value = "Action", required = true) + public ActionImport setAction(final String action) { + super.setAction(action); + return this; } @Override - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - @Override - public String getAction() { - return action; - } - - public void setAction(final String action) { - this.action = action; - } - - @Override - public String getEntitySet() { - return entitySet; + @JsonProperty(value = "Name", required = true) + public ActionImport setName(final String name) { + super.setName(name); + return this; } @Override - public void setEntitySet(final String entitySet) { - this.entitySet = entitySet; + @JsonProperty(value = "EntitySet") + public ActionImport setEntitySet(final String entitySet) { + super.setEntitySet(entitySet); + return this; } + }
