You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/23 12:58:33 UTC
[38/59] [abbrv] [partial] Removing /ODataJClient: merge complete
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/PropertyRef.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/PropertyRef.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/PropertyRef.java
deleted file mode 100644
index b1440a1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/PropertyRef.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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class PropertyRef extends AbstractEdm {
-
- private static final long serialVersionUID = 6738212067449628983L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Alias")
- private String alias;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(final String alias) {
- this.alias = alias;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/SchemaDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/SchemaDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/SchemaDeserializer.java
deleted file mode 100644
index c9f4db8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/SchemaDeserializer.java
+++ /dev/null
@@ -1,146 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ValueTerm;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Association;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Using;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Action;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Function;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.TypeDefinition;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-
-@SuppressWarnings("rawtypes")
-public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> {
-
- @Override
- protected AbstractSchema doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractSchema schema = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.Schema()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.Schema();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Namespace".equals(jp.getCurrentName())) {
- schema.setNamespace(jp.nextTextValue());
- } else if ("Alias".equals(jp.getCurrentName())) {
- schema.setAlias(jp.nextTextValue());
- } else if ("Using".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getUsings().add(jp.getCodec().readValue(jp, Using.class));
- } else if ("Association".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getAssociations().add(jp.getCodec().readValue(jp, Association.class));
- } else if ("ComplexType".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getComplexTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- getComplexTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType.class));
- }
- } else if ("EntityType".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getEntityTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- getEntityTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType.class));
- }
- } else if ("EnumType".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getEnumTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- getEnumTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType.class));
- }
- } else if ("ValueTerm".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getValueTerms().add(jp.getCodec().readValue(jp, ValueTerm.class));
- } else if ("EntityContainer".equals(jp.getCurrentName())) {
- jp.nextToken();
-
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getEntityContainers().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer.class));
- } else {
- com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer entityContainer =
- jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer.class);
- entityContainer.setDefaultEntityContainer(true);
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- setEntityContainer(entityContainer);
- }
- } else if ("Annotations".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).getAnnotationsList().
- add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Annotations.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).getAnnotationsList().
- add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Annotations.class));
- }
- } else if ("Action".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).getActions().
- add(jp.getCodec().readValue(jp, Action.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).getAnnotations().
- add(jp.getCodec().readValue(jp, Annotation.class));
- } else if ("Function".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).getFunctions().
- add(jp.getCodec().readValue(jp, Function.class));
- } else if ("TypeDefinition".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- getTypeDefinitions().add(jp.getCodec().readValue(jp, TypeDefinition.class));
- }
- }
- }
-
- return schema;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/StoreGeneratedPattern.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/StoreGeneratedPattern.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/StoreGeneratedPattern.java
deleted file mode 100644
index 5172156..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/StoreGeneratedPattern.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm;
-
-public enum StoreGeneratedPattern {
-
- None,
- Identity,
- Computed
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/ComposedGeospatial.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/ComposedGeospatial.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/ComposedGeospatial.java
deleted file mode 100644
index 0e19160..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/ComposedGeospatial.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Abstract base class for all Geometries that are composed out of other geospatial elements.
- */
-public abstract class ComposedGeospatial<T extends Geospatial> extends Geospatial implements Iterable<T> {
-
- private static final long serialVersionUID = 8796254901098541307L;
-
- protected final List<T> geospatials;
-
- /**
- * Constructor.
- *
- * @param dimension dimension.
- * @param type type.
- * @param geospatials geospatials info.
- */
- protected ComposedGeospatial(final Dimension dimension, final Type type, final List<T> geospatials) {
- super(dimension, type);
- this.geospatials = new ArrayList<T>();
- if (geospatials != null) {
- this.geospatials.addAll(geospatials);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public Iterator<T> iterator() {
- return this.geospatials.iterator();
- }
-
- /**
- * Checks if is empty.
- *
- * @return 'TRUE' if is empty; 'FALSE' otherwise.
- */
- public boolean isEmpty() {
- return geospatials.isEmpty();
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setSrid(final Integer srid) {
- for (Geospatial geospatial : this.geospatials) {
- geospatial.setSrid(srid);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Geospatial.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Geospatial.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Geospatial.java
deleted file mode 100644
index 9af2553..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Geospatial.java
+++ /dev/null
@@ -1,156 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.io.Serializable;
-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;
-
-/**
- * Base class for all geospatial info.
- */
-public abstract class Geospatial implements Serializable {
-
- public enum Dimension {
-
- GEOMETRY,
- GEOGRAPHY;
-
- }
-
- public enum Type {
-
- /**
- * The OGIS geometry type number for points.
- */
- POINT,
- /**
- * The OGIS geometry type number for lines.
- */
- LINESTRING,
- /**
- * The OGIS geometry type number for polygons.
- */
- POLYGON,
- /**
- * The OGIS geometry type number for aggregate points.
- */
- MULTIPOINT,
- /**
- * The OGIS geometry type number for aggregate lines.
- */
- MULTILINESTRING,
- /**
- * The OGIS geometry type number for aggregate polygons.
- */
- MULTIPOLYGON,
- /**
- * The OGIS geometry type number for feature collections.
- */
- GEOSPATIALCOLLECTION;
-
- }
-
- protected final Dimension dimension;
-
- protected final Type type;
-
- /**
- * Null value means it is expected to vary per instance.
- */
- protected Integer srid;
-
- /**
- * Constructor.
- *
- * @param dimension dimension.
- * @param type type.
- */
- protected Geospatial(final Dimension dimension, final Type type) {
- this.dimension = dimension;
- this.type = type;
- }
-
- /**
- * Gets dimension.
- *
- * @return dimension.
- * @see Dimension
- */
- public Dimension getDimension() {
- return dimension;
- }
-
- /**
- * Gets type.
- *
- * @return type.
- * @see Type
- */
- public Type getType() {
- return type;
- }
-
- /**
- * Gets s-rid.
- *
- * @return s-rid.
- */
- public Integer getSrid() {
- return srid;
- }
-
- /**
- * Sets s-rid.
- *
- * @param srid s-rid.
- */
- public void setSrid(final Integer srid) {
- this.srid = srid;
- }
-
- public abstract EdmSimpleType getEdmSimpleType();
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/GeospatialCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/GeospatialCollection.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/GeospatialCollection.java
deleted file mode 100644
index 5475a4b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/GeospatialCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-/**
- * Wrapper for a collection of geospatials info.
- */
-public class GeospatialCollection extends ComposedGeospatial<Geospatial> {
-
- private static final long serialVersionUID = -9181547636133878977L;
-
- /**
- * Constructor.
- *
- * @param dimension dimension.
- * @param geospatials geospatials info.
- */
- public GeospatialCollection(final Dimension dimension, final List<Geospatial> geospatials) {
- super(dimension, Type.GEOSPATIALCOLLECTION, geospatials);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyCollection
- : EdmSimpleType.GeometryCollection;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/LineString.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/LineString.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/LineString.java
deleted file mode 100644
index 1a0912e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/LineString.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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-public class LineString extends ComposedGeospatial<Point> {
-
- private static final long serialVersionUID = 3207958185407535907L;
-
- public LineString(final Dimension dimension, final List<Point> points) {
- super(dimension, Type.LINESTRING, points);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyLineString
- : EdmSimpleType.GeometryLineString;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiLineString.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiLineString.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiLineString.java
deleted file mode 100644
index 35715b9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiLineString.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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-public class MultiLineString extends ComposedGeospatial<LineString> {
-
- private static final long serialVersionUID = -5042414471218124125L;
-
- public MultiLineString(final Dimension dimension, final List<LineString> lineStrings) {
- super(dimension, Type.MULTILINESTRING, lineStrings);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiLineString
- : EdmSimpleType.GeometryMultiLineString;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPoint.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPoint.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPoint.java
deleted file mode 100644
index ea896e7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPoint.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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-public class MultiPoint extends ComposedGeospatial<Point> {
-
- private static final long serialVersionUID = 4951011255142116129L;
-
- public MultiPoint(final Dimension dimension, final List<Point> points) {
- super(dimension, Type.MULTIPOINT, points);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiPoint
- : EdmSimpleType.GeometryMultiPoint;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPolygon.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPolygon.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPolygon.java
deleted file mode 100644
index de23eba..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPolygon.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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-public class MultiPolygon extends ComposedGeospatial<Polygon> {
-
- private static final long serialVersionUID = -160184788048512883L;
-
- public MultiPolygon(final Dimension dimension, final List<Polygon> polygons) {
- super(dimension, Type.MULTIPOLYGON, polygons);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiPolygon
- : EdmSimpleType.GeometryMultiPolygon;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Point.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Point.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Point.java
deleted file mode 100644
index 2521abe..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Point.java
+++ /dev/null
@@ -1,81 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-
-public class Point extends Geospatial {
-
- private static final long serialVersionUID = 4917380107331557828L;
-
- /**
- * The X coordinate of the point.
- * In most long/lat systems, this is the longitude.
- */
- private double x;
-
- /**
- * The Y coordinate of the point.
- * In most long/lat systems, this is the latitude.
- */
- private double y;
-
- /**
- * The Z coordinate of the point.
- * In most long/lat systems, this is a radius from the
- * center of the earth, or the height / elevation over
- * the ground.
- */
- private double z;
-
- public Point(final Dimension dimension) {
- super(dimension, Type.POINT);
- }
-
- public double getX() {
- return x;
- }
-
- public void setX(double x) {
- this.x = x;
- }
-
- public double getY() {
- return y;
- }
-
- public void setY(double y) {
- this.y = y;
- }
-
- public double getZ() {
- return z;
- }
-
- public void setZ(double z) {
- this.z = z;
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyPoint
- : EdmSimpleType.GeometryPoint;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Polygon.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Polygon.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Polygon.java
deleted file mode 100644
index 89cb9fb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Polygon.java
+++ /dev/null
@@ -1,72 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-/**
- * Polygon.
- */
-public class Polygon extends Geospatial {
-
- private static final long serialVersionUID = 7797602503445391678L;
-
- final ComposedGeospatial<Point> interior;
-
- final ComposedGeospatial<Point> exterior;
-
- /**
- * Constructor.
- *
- * @param dimension dimension.
- * @param interior interior points.
- * @param exterior exterior points.
- */
- public Polygon(final Dimension dimension, final List<Point> interior, final List<Point> exterior) {
- super(dimension, Type.POLYGON);
- this.interior = new MultiPoint(dimension, interior);
- this.exterior = new MultiPoint(dimension, exterior);
- }
-
- /**
- * Gest interior points.
- *
- * @return interior points.
- */
- public ComposedGeospatial<Point> getInterior() {
- return interior;
- }
-
- /**
- * Gets exterior points.
- *
- * @return exterior points.I
- */
- public ComposedGeospatial<Point> getExterior() {
- return exterior;
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyPolygon
- : EdmSimpleType.GeometryPolygon;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Annotations.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Annotations.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Annotations.java
deleted file mode 100644
index e8e9483..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Annotations.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractAnnotations;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = AnnotationsDeserializer.class)
-public class Annotations extends AbstractAnnotations {
-
- private static final long serialVersionUID = 3877353656301805410L;
-
- private final List<TypeAnnotation> typeAnnotations = new ArrayList<TypeAnnotation>();
-
- private final List<ValueAnnotation> valueAnnotations = new ArrayList<ValueAnnotation>();
-
- public List<TypeAnnotation> getTypeAnnotations() {
- return typeAnnotations;
- }
-
- public List<ValueAnnotation> getValueAnnotations() {
- return valueAnnotations;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AnnotationsDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AnnotationsDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AnnotationsDeserializer.java
deleted file mode 100644
index 4c46682..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AnnotationsDeserializer.java
+++ /dev/null
@@ -1,55 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class AnnotationsDeserializer extends AbstractEdmDeserializer<Annotations> {
-
- @Override
- protected Annotations doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Annotations annotations = new Annotations();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Target".equals(jp.getCurrentName())) {
- annotations.setTarget(jp.nextTextValue());
- } else if ("Qualifier".equals(jp.getCurrentName())) {
- annotations.setQualifier(jp.nextTextValue());
- } else if ("typeAnnotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- annotations.getTypeAnnotations().add(jp.getCodec().readValue(jp, TypeAnnotation.class));
- } else if ("ValueAnnotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- annotations.getValueAnnotations().add(jp.getCodec().readValue(jp, ValueAnnotation.class));
- }
- }
- }
-
- return annotations;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Association.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Association.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Association.java
deleted file mode 100644
index 7797ed0..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Association.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = AssociationDeserializer.class)
-public class Association extends AbstractEdm {
-
- private static final long serialVersionUID = 73763231919532482L;
-
- private String name;
-
- private ReferentialConstraint referentialConstraint;
-
- private List<AssociationEnd> ends = new ArrayList<AssociationEnd>();
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public ReferentialConstraint getReferentialConstraint() {
- return referentialConstraint;
- }
-
- public void setReferentialConstraint(final ReferentialConstraint referentialConstraint) {
- this.referentialConstraint = referentialConstraint;
- }
-
- public List<AssociationEnd> getEnds() {
- return ends;
- }
-
- public void setEnds(final List<AssociationEnd> ends) {
- this.ends = ends;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationDeserializer.java
deleted file mode 100644
index 7331497..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationDeserializer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class AssociationDeserializer extends AbstractEdmDeserializer<Association> {
-
- @Override
- protected Association doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Association association = new Association();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- association.setName(jp.nextTextValue());
- } else if ("ReferentialConstraint".equals(jp.getCurrentName())) {
- jp.nextToken();
- association.setReferentialConstraint(jp.getCodec().readValue(jp, ReferentialConstraint.class));
- } else if ("End".equals(jp.getCurrentName())) {
- jp.nextToken();
- association.getEnds().add(jp.getCodec().readValue(jp, AssociationEnd.class));
- }
- }
- }
-
- return association;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationEnd.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationEnd.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationEnd.java
deleted file mode 100644
index 1cc1f61..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationEnd.java
+++ /dev/null
@@ -1,72 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.OnDelete;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class AssociationEnd extends AbstractEdm {
-
- private static final long serialVersionUID = 3305394053564979376L;
-
- @JsonProperty(value = "Type", required = true)
- private String type;
-
- @JsonProperty(value = "Role")
- private String role;
-
- @JsonProperty(value = "Multiplicity")
- private String multiplicity;
-
- @JsonProperty(value = "OnDelete")
- private OnDelete onDelete;
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public String getRole() {
- return role;
- }
-
- public void setRole(final String role) {
- this.role = role;
- }
-
- public String getMultiplicity() {
- return multiplicity;
- }
-
- public void setMultiplicity(final String multiplicity) {
- this.multiplicity = multiplicity;
- }
-
- public OnDelete getOnDelete() {
- return onDelete;
- }
-
- public void setOnDelete(final OnDelete onDelete) {
- this.onDelete = onDelete;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSet.java
deleted file mode 100644
index 7d8b53c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSet.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = AssociationSetDeserializer.class)
-public class AssociationSet extends AbstractEdm {
-
- private static final long serialVersionUID = 1248430921598774799L;
-
- private String name;
-
- private String association;
-
- private List<AssociationSetEnd> ends = new ArrayList<AssociationSetEnd>();
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getAssociation() {
- return association;
- }
-
- public void setAssociation(final String association) {
- this.association = association;
- }
-
- public List<AssociationSetEnd> getEnds() {
- return ends;
- }
-
- public void setEnds(final List<AssociationSetEnd> ends) {
- this.ends = ends;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetDeserializer.java
deleted file mode 100644
index 337483b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetDeserializer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class AssociationSetDeserializer extends AbstractEdmDeserializer<AssociationSet> {
-
- @Override
- protected AssociationSet doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AssociationSet associationSet = new AssociationSet();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- associationSet.setName(jp.nextTextValue());
- } else if ("Association".equals(jp.getCurrentName())) {
- associationSet.setAssociation(jp.nextTextValue());
- } else if ("End".equals(jp.getCurrentName())) {
- jp.nextToken();
- associationSet.getEnds().add(jp.getCodec().readValue(jp, AssociationSetEnd.class));
- }
- }
- }
-
- return associationSet;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetEnd.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetEnd.java
deleted file mode 100644
index 5d2d3d6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetEnd.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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class AssociationSetEnd extends AbstractEdm {
-
- private static final long serialVersionUID = -6238344152962217446L;
-
- @JsonProperty("Role")
- private String role;
-
- @JsonProperty(value = "EntitySet", required = true)
- private String entitySet;
-
- public String getRole() {
- return role;
- }
-
- public void setRole(final String role) {
- this.role = role;
- }
-
- public String getEntitySet() {
- return entitySet;
- }
-
- public void setEntitySet(final String entitySet) {
- this.entitySet = entitySet;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ComplexType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ComplexType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ComplexType.java
deleted file mode 100644
index e07343a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ComplexType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ComplexType extends AbstractComplexType {
-
- private static final long serialVersionUID = -1251230308269425962L;
-
- private final List<Property> properties = new ArrayList<Property>();
-
- @Override
- public List<Property> getProperties() {
- return properties;
- }
-
- @Override
- public Property getProperty(final String name) {
- Property result = null;
- for (Property property : getProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/DataServices.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/DataServices.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/DataServices.java
deleted file mode 100644
index f8e3f45..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/DataServices.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractDataServices;
-import java.util.ArrayList;
-import java.util.List;
-
-public class DataServices extends AbstractDataServices<
- Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = 633129618050875211L;
-
- private final List<Schema> schemas = new ArrayList<Schema>();
-
- @Override
- public List<Schema> getSchemas() {
- return schemas;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Edmx.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Edmx.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Edmx.java
deleted file mode 100644
index f307b46..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Edmx.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-
-public class Edmx extends AbstractEdmx<
- DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = -8031883176876401375L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityContainer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityContainer.java
deleted file mode 100644
index c7c1f4e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityContainer.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntityContainer extends AbstractEntityContainer<FunctionImport> {
-
- private static final long serialVersionUID = 8934431875078180370L;
-
- private final List<EntitySet> entitySets = new ArrayList<EntitySet>();
-
- private final List<AssociationSet> associationSets = new ArrayList<AssociationSet>();
-
- private final List<FunctionImport> functionImports = new ArrayList<FunctionImport>();
-
- @Override
- public List<EntitySet> getEntitySets() {
- return entitySets;
- }
-
- @Override
- public EntitySet getEntitySet(final String name) {
- EntitySet result = null;
- for (EntitySet entitySet : getEntitySets()) {
- if (name.equals(entitySet.getName())) {
- result = entitySet;
- }
- }
- return result;
- }
-
- public List<AssociationSet> getAssociationSets() {
- return associationSets;
- }
-
- @Override
- public List<FunctionImport> getFunctionImports() {
- return functionImports;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntitySet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntitySet.java
deleted file mode 100644
index 8780001..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntitySet.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-
-public class EntitySet extends AbstractEntitySet {
-
- private static final long serialVersionUID = 5570833733884884012L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityType.java
deleted file mode 100644
index 39fdcb3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityType.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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntityType extends AbstractEntityType {
-
- private static final long serialVersionUID = 8727765036150269547L;
-
- private final List<Property> properties = new ArrayList<Property>();
-
- private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
-
- @Override
- public List<Property> getProperties() {
- return properties;
- }
-
- @Override
- public Property getProperty(final String name) {
- Property result = null;
- for (Property property : getProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-
- @Override
- public List<NavigationProperty> getNavigationProperties() {
- return navigationProperties;
- }
-
- @Override
- public NavigationProperty getNavigationProperty(final String name) {
- NavigationProperty result = null;
- for (NavigationProperty property : getNavigationProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EnumType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EnumType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EnumType.java
deleted file mode 100644
index 701d81f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EnumType.java
+++ /dev/null
@@ -1,58 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEnumType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EnumType extends AbstractEnumType {
-
- private static final long serialVersionUID = 8967396195669128419L;
-
- private final List<Member> members = new ArrayList<Member>();
-
- @Override
- public List<Member> getMembers() {
- return members;
- }
-
- @Override
- public Member getMember(final String name) {
- Member result = null;
- for (Member member : getMembers()) {
- if (name.equals(member.getName())) {
- result = member;
- }
- }
- return result;
- }
-
- @Override
- public Member getMember(final Integer value) {
- Member result = null;
- for (Member member : getMembers()) {
- if (value.equals(member.getValue())) {
- result = member;
- }
- }
- return result;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImport.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImport.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImport.java
deleted file mode 100644
index 4e43d51..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImport.java
+++ /dev/null
@@ -1,129 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = FunctionImportDeserializer.class)
-public class FunctionImport extends AbstractFunctionImport {
-
- private static final long serialVersionUID = -6214472528425935461L;
-
- private String name;
-
- private String returnType;
-
- private String entitySet;
-
- private String entitySetPath;
-
- private boolean composable;
-
- private boolean sideEffecting = true;
-
- private boolean bindable;
-
- private boolean alwaysBindable;
-
- private String httpMethod;
-
- private final List<Parameter> parameters = new ArrayList<Parameter>();
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getReturnType() {
- return returnType;
- }
-
- public void setReturnType(final String returnType) {
- this.returnType = returnType;
- }
-
- @Override
- public String getEntitySet() {
- return entitySet;
- }
-
- public void setEntitySet(final String entitySet) {
- this.entitySet = entitySet;
- }
-
- public String getEntitySetPath() {
- return entitySetPath;
- }
-
- public void setEntitySetPath(final String entitySetPath) {
- this.entitySetPath = entitySetPath;
- }
-
- public boolean isComposable() {
- return composable;
- }
-
- public void setComposable(final boolean composable) {
- this.composable = composable;
- }
-
- public boolean isSideEffecting() {
- return sideEffecting;
- }
-
- public void setSideEffecting(final boolean sideEffecting) {
- this.sideEffecting = sideEffecting;
- }
-
- public boolean isBindable() {
- return bindable;
- }
-
- public void setBindable(final boolean bindable) {
- this.bindable = bindable;
- }
-
- public boolean isAlwaysBindable() {
- return alwaysBindable;
- }
-
- public void setAlwaysBindable(final boolean alwaysBindable) {
- this.alwaysBindable = alwaysBindable;
- }
-
- public String getHttpMethod() {
- return httpMethod;
- }
-
- public void setHttpMethod(final String httpMethod) {
- this.httpMethod = httpMethod;
- }
-
- public List<Parameter> getParameters() {
- return parameters;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImportDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImportDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImportDeserializer.java
deleted file mode 100644
index 4836e86..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImportDeserializer.java
+++ /dev/null
@@ -1,67 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class FunctionImportDeserializer extends AbstractEdmDeserializer<FunctionImport> {
-
- @Override
- protected FunctionImport doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final FunctionImport funcImp = new FunctionImport();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- funcImp.setName(jp.nextTextValue());
- } else if ("ReturnType".equals(jp.getCurrentName())) {
- funcImp.setReturnType(jp.nextTextValue());
- } else if ("EntitySet".equals(jp.getCurrentName())) {
- funcImp.setEntitySet(jp.nextTextValue());
- } else if ("EntitySetPath".equals(jp.getCurrentName())) {
- funcImp.setEntitySetPath(jp.nextTextValue());
- } else if ("IsComposable".equals(jp.getCurrentName())) {
- funcImp.setComposable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsSideEffecting".equals(jp.getCurrentName())) {
- funcImp.setSideEffecting(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsBindable".equals(jp.getCurrentName())) {
- funcImp.setBindable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsAlwaysBindable".equals(jp.getCurrentName())) {
- funcImp.setAlwaysBindable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("HttpMethod".equals(jp.getCurrentName())) {
- funcImp.setHttpMethod(jp.nextTextValue());
- } else if ("Parameter".equals(jp.getCurrentName())) {
- jp.nextToken();
- funcImp.getParameters().add(jp.getCodec().readValue(jp, Parameter.class));
- }
- }
- }
-
- return funcImp;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Member.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Member.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Member.java
deleted file mode 100644
index 2de21dd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Member.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractMember;
-
-public class Member extends AbstractMember {
-
- private static final long serialVersionUID = 6605381518349837929L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/NavigationProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/NavigationProperty.java
deleted file mode 100644
index 723ba49..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/NavigationProperty.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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-
-public class NavigationProperty extends AbstractNavigationProperty {
-
- private static final long serialVersionUID = -2889417442815563307L;
-
- @JsonProperty(value = "Relationship", required = true)
- private String relationship;
-
- @JsonProperty(value = "ToRole", required = true)
- private String toRole;
-
- @JsonProperty(value = "FromRole", required = true)
- private String fromRole;
-
- public String getRelationship() {
- return relationship;
- }
-
- public void setRelationship(final String relationship) {
- this.relationship = relationship;
- }
-
- public String getToRole() {
- return toRole;
- }
-
- public void setToRole(final String toRole) {
- this.toRole = toRole;
- }
-
- public String getFromRole() {
- return fromRole;
- }
-
- public void setFromRole(final String fromRole) {
- this.fromRole = fromRole;
- }
-
-}