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/03/10 10:02:45 UTC
[29/51] [abbrv] [partial] [OLINGO-192] rename java packages
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.java
deleted file mode 100644
index 4ed4769..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.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.odata4.client.core.edm.xml.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.NavigationProperty;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractNavigationProperty;
-
-public class NavigationPropertyImpl extends AbstractNavigationProperty implements NavigationProperty {
-
- 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;
-
- @Override
- public String getRelationship() {
- return relationship;
- }
-
- public void setRelationship(final String relationship) {
- this.relationship = relationship;
- }
-
- @Override
- public String getToRole() {
- return toRole;
- }
-
- public void setToRole(final String toRole) {
- this.toRole = toRole;
- }
-
- @Override
- public String getFromRole() {
- return fromRole;
- }
-
- public void setFromRole(final String fromRole) {
- this.fromRole = fromRole;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java
deleted file mode 100644
index 7406118..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v3;
-
-import org.apache.olingo.odata4.client.api.edm.xml.v3.ParameterMode;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.Parameter;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractParameter;
-
-public class ParameterImpl extends AbstractParameter implements Parameter {
-
- private static final long serialVersionUID = 7596724999614891358L;
-
- private ParameterMode mode;
-
- @Override
- public ParameterMode getMode() {
- return mode;
- }
-
- public void setMode(final ParameterMode mode) {
- this.mode = mode;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java
deleted file mode 100644
index 352f8f0..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java
+++ /dev/null
@@ -1,95 +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.odata4.client.core.edm.xml.v3;
-
-import org.apache.olingo.odata4.client.api.edm.xml.v3.Property;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractProperty;
-import org.apache.olingo.odata4.commons.api.edm.constants.EdmContentKind;
-
-public class PropertyImpl extends AbstractProperty implements Property {
-
- private static final long serialVersionUID = 6224524803474652100L;
-
- private String fcSourcePath;
-
- private String fcTargetPath;
-
- private EdmContentKind fcContentKind = EdmContentKind.text;
-
- private String fcNSPrefix;
-
- private String fcNSURI;
-
- private boolean fcKeepInContent = true;
-
- @Override
- public String getFcSourcePath() {
- return fcSourcePath;
- }
-
- public void setFcSourcePath(final String fcSourcePath) {
- this.fcSourcePath = fcSourcePath;
- }
-
- @Override
- public String getFcTargetPath() {
- return fcTargetPath;
- }
-
- public void setFcTargetPath(final String fcTargetPath) {
- this.fcTargetPath = fcTargetPath;
- }
-
- @Override
- public EdmContentKind getFcContentKind() {
- return fcContentKind;
- }
-
- public void setFcContentKind(final EdmContentKind fcContentKind) {
- this.fcContentKind = fcContentKind;
- }
-
- @Override
- public String getFcNSPrefix() {
- return fcNSPrefix;
- }
-
- public void setFcNSPrefix(final String fcNSPrefix) {
- this.fcNSPrefix = fcNSPrefix;
- }
-
- @Override
- public String getFcNSURI() {
- return fcNSURI;
- }
-
- public void setFcNSURI(final String fcNSURI) {
- this.fcNSURI = fcNSURI;
- }
-
- @Override
- public boolean isFcKeepInContent() {
- return fcKeepInContent;
- }
-
- public void setFcKeepInContent(final boolean fcKeepInContent) {
- this.fcKeepInContent = fcKeepInContent;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java
deleted file mode 100644
index c7e0d42..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java
+++ /dev/null
@@ -1,127 +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.odata4.client.core.edm.xml.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.PropertyValue;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-public class PropertyValueImpl extends AbstractEdmItem implements PropertyValue {
-
- private static final long serialVersionUID = -6580934436491418564L;
-
- @JsonProperty(value = "Property", required = true)
- private String property;
-
- @JsonProperty("Path")
- private String path;
-
- @JsonProperty("String")
- private String string;
-
- @JsonProperty("Int")
- private BigInteger _int;
-
- @JsonProperty("Float")
- private Double _float;
-
- @JsonProperty("Decimal")
- private BigDecimal decimal;
-
- @JsonProperty("Bool")
- private Boolean bool;
-
- @JsonProperty("DateTime")
- private Date dateTime;
-
- @Override
- public String getProperty() {
- return property;
- }
-
- public void setProperty(final String property) {
- this.property = property;
- }
-
- @Override
- public String getPath() {
- return path;
- }
-
- public void setPath(final String path) {
- this.path = path;
- }
-
- @Override
- public String getString() {
- return string;
- }
-
- public void setString(final String string) {
- this.string = string;
- }
-
- @Override
- public BigInteger getInt() {
- return _int;
- }
-
- public void setInt(final BigInteger _int) {
- this._int = _int;
- }
-
- @Override
- public Double getFloat() {
- return _float;
- }
-
- public void setFloat(final Double _float) {
- this._float = _float;
- }
-
- @Override
- public BigDecimal getDecimal() {
- return decimal;
- }
-
- public void setDecimal(final BigDecimal decimal) {
- this.decimal = decimal;
- }
-
- @Override
- public Boolean getBool() {
- return bool;
- }
-
- public void setBool(final Boolean bool) {
- this.bool = bool;
- }
-
- @Override
- public Date getDateTime() {
- return dateTime == null ? null : new Date(dateTime.getTime());
- }
-
- public void setDateTime(final Date dateTime) {
- this.dateTime = dateTime == null ? null : new Date(dateTime.getTime());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java
deleted file mode 100644
index d2cce53..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java
+++ /dev/null
@@ -1,56 +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.odata4.client.core.edm.xml.v3;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.ReferentialConstraint;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.ReferentialConstraintRole;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-public class ReferentialConstraintImpl extends AbstractEdmItem implements ReferentialConstraint {
-
- private static final long serialVersionUID = 9067893732765127269L;
-
- @JsonProperty(value = "Principal", required = true)
- private ReferentialConstraintRoleImpl principal;
-
- @JsonProperty(value = "Dependent", required = true)
- private ReferentialConstraintRoleImpl dependent;
-
- @Override
- public ReferentialConstraintRoleImpl getPrincipal() {
- return principal;
- }
-
- @JsonIgnore
- public void setPrincipal(final ReferentialConstraintRole principal) {
- this.principal = (ReferentialConstraintRoleImpl) principal;
- }
-
- @Override
- public ReferentialConstraintRoleImpl getDependent() {
- return dependent;
- }
-
- @JsonIgnore
- public void setDependent(final ReferentialConstraintRole dependent) {
- this.dependent = (ReferentialConstraintRoleImpl) dependent;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java
deleted file mode 100644
index b565225..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.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 java.io.IOException;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractEdmDeserializer;
-import org.apache.olingo.odata4.client.core.edm.xml.PropertyRefImpl;
-
-public class ReferentialConstraintRoleDeserializer extends AbstractEdmDeserializer<ReferentialConstraintRoleImpl> {
-
- @Override
- protected ReferentialConstraintRoleImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final ReferentialConstraintRoleImpl refConstRole = new ReferentialConstraintRoleImpl();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Role".equals(jp.getCurrentName())) {
- refConstRole.setRole(jp.nextTextValue());
- } else if ("PropertyRef".equals(jp.getCurrentName())) {
- jp.nextToken();
- refConstRole.getPropertyRefs().add(jp.readValueAs( PropertyRefImpl.class));
- }
- }
- }
-
- return refConstRole;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java
deleted file mode 100644
index 9ded4c5..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.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.odata4.client.core.edm.xml.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.PropertyRef;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.ReferentialConstraintRole;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-@JsonDeserialize(using = ReferentialConstraintRoleDeserializer.class)
-public class ReferentialConstraintRoleImpl extends AbstractEdmItem implements ReferentialConstraintRole {
-
- private static final long serialVersionUID = -3712887115248634164L;
-
- private String role;
-
- private List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
-
- @Override
- public String getRole() {
- return role;
- }
-
- public void setRole(final String role) {
- this.role = role;
- }
-
- public List<PropertyRef> getPropertyRefs() {
- return propertyRefs;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java
deleted file mode 100644
index 8caccdc..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java
+++ /dev/null
@@ -1,137 +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.odata4.client.core.edm.xml.v3;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.ComplexType;
-import org.apache.olingo.odata4.client.api.edm.xml.EntityContainer;
-import org.apache.olingo.odata4.client.api.edm.xml.EntityType;
-import org.apache.olingo.odata4.client.api.edm.xml.EnumType;
-import org.apache.olingo.odata4.client.api.edm.xml.Schema;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.Annotations;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.Association;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.Using;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.ValueTerm;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractSchema;
-
-public class SchemaImpl extends AbstractSchema implements Schema {
-
- private static final long serialVersionUID = 4453992249818796144L;
-
- private final List<Annotations> annotationList = new ArrayList<Annotations>();
-
- private final List<Association> associations = new ArrayList<Association>();
-
- private final List<ComplexType> complexTypes = new ArrayList<ComplexType>();
-
- private final List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
-
- private final List<EntityType> entityTypes = new ArrayList<EntityType>();
-
- private final List<EnumType> enumTypes = new ArrayList<EnumType>();
-
- private final List<Using> usings = new ArrayList<Using>();
-
- private final List<ValueTerm> valueTerms = new ArrayList<ValueTerm>();
-
- public Association getAssociation(final String name) {
- return getOneByName(name, getAssociations());
- }
-
- @Override
- public List<Annotations> getAnnotationsList() {
- return annotationList;
- }
-
- @Override
- public Annotations getAnnotationsList(final String target) {
- Annotations result = null;
- for (Annotations annots : getAnnotationsList()) {
- if (target.equals(annots.getTarget())) {
- result = annots;
- }
- }
- return result;
- }
-
- public List<Association> getAssociations() {
- return associations;
- }
-
- public List<Using> getUsings() {
- return usings;
- }
-
- public List<ValueTerm> getValueTerms() {
- return valueTerms;
- }
-
- @Override
- public List<EntityContainer> getEntityContainers() {
- return entityContainers;
- }
-
- @Override
- public EntityContainer getDefaultEntityContainer() {
- EntityContainer result = null;
- for (EntityContainer container : getEntityContainers()) {
- if (container.isDefaultEntityContainer()) {
- result = container;
- }
- }
- return result;
- }
-
- @Override
- public EntityContainer getEntityContainer(final String name) {
- return getOneByName(name, getEntityContainers());
- }
-
- @Override
- public EnumTypeImpl getEnumType(final String name) {
- return (EnumTypeImpl) super.getEnumType(name);
- }
-
- @Override
- public List<EnumType> getEnumTypes() {
- return enumTypes;
- }
-
- @Override
- public ComplexTypeImpl getComplexType(final String name) {
- return (ComplexTypeImpl) super.getComplexType(name);
- }
-
- @Override
- public List<ComplexType> getComplexTypes() {
- return complexTypes;
- }
-
- @Override
- public EntityTypeImpl getEntityType(final String name) {
- return (EntityTypeImpl) super.getEntityType(name);
- }
-
- @Override
- public List<EntityType> getEntityTypes() {
- return entityTypes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java
deleted file mode 100644
index c6a10bc..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.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 java.io.IOException;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractEdmDeserializer;
-
-public class TypeAnnotationDeserializer extends AbstractEdmDeserializer<TypeAnnotationImpl> {
-
- @Override
- protected TypeAnnotationImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final TypeAnnotationImpl typeAnnot = new TypeAnnotationImpl();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Term".equals(jp.getCurrentName())) {
- typeAnnot.setTerm(jp.nextTextValue());
- } else if ("Qualifier".equals(jp.getCurrentName())) {
- typeAnnot.setQualifier(jp.nextTextValue());
- } else if ("PropertyValue".equals(jp.getCurrentName())) {
- jp.nextToken();
- typeAnnot.getPropertyValues().add(jp.readValueAs( PropertyValueImpl.class));
- }
- }
- }
-
- return typeAnnot;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java
deleted file mode 100644
index e709d84..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.PropertyValue;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.TypeAnnotation;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-@JsonDeserialize(using = TypeAnnotationDeserializer.class)
-public class TypeAnnotationImpl extends AbstractEdmItem implements TypeAnnotation {
-
- private static final long serialVersionUID = -7585489230017331877L;
-
- private String term;
-
- private String qualifier;
-
- private List<PropertyValue> propertyValues = new ArrayList<PropertyValue>();
-
- @Override
- public String getTerm() {
- return term;
- }
-
- public void setTerm(final String term) {
- this.term = term;
- }
-
- @Override
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-
- @Override
- public List<PropertyValue> getPropertyValues() {
- return propertyValues;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java
deleted file mode 100644
index 0d938d7..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.Using;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-public class UsingImpl extends AbstractEdmItem implements Using {
-
- private static final long serialVersionUID = 2086957510154443445L;
-
- @JsonProperty(value = "Namespace", required = true)
- private String namespace;
-
- @JsonProperty("Alias")
- private String alias;
-
- @Override
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(final String namespace) {
- this.namespace = namespace;
- }
-
- @Override
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(final String alias) {
- this.alias = alias;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java
deleted file mode 100644
index fde4380..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java
+++ /dev/null
@@ -1,139 +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.odata4.client.core.edm.xml.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.ValueAnnotation;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-public class ValueAnnotationImpl extends AbstractEdmItem implements ValueAnnotation {
-
- private static final long serialVersionUID = -1826414005417952278L;
-
- @JsonProperty(value = "Term", required = true)
- private String term;
-
- @JsonProperty("Qualifier")
- private String qualifier;
-
- @JsonProperty("Path")
- private String path;
-
- @JsonProperty("String")
- private String string;
-
- @JsonProperty("Int")
- private BigInteger _int;
-
- @JsonProperty("Float")
- private Double _float;
-
- @JsonProperty("Decimal")
- private BigDecimal decimal;
-
- @JsonProperty("Bool")
- private Boolean bool;
-
- @JsonProperty("DateTime")
- private Date dateTime;
-
- @Override
- public String getTerm() {
- return term;
- }
-
- public void setTerm(final String term) {
- this.term = term;
- }
-
- @Override
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-
- @Override
- public String getPath() {
- return path;
- }
-
- public void setPath(final String path) {
- this.path = path;
- }
-
- @Override
- public String getString() {
- return string;
- }
-
- public void setString(final String string) {
- this.string = string;
- }
-
- @Override
- public BigInteger getInt() {
- return _int;
- }
-
- public void setInt(final BigInteger _int) {
- this._int = _int;
- }
-
- @Override
- public Double getFloat() {
- return _float;
- }
-
- public void setFloat(final Double _float) {
- this._float = _float;
- }
-
- @Override
- public BigDecimal getDecimal() {
- return decimal;
- }
-
- public void setDecimal(final BigDecimal decimal) {
- this.decimal = decimal;
- }
-
- @Override
- public Boolean getBool() {
- return bool;
- }
-
- public void setBool(final Boolean bool) {
- this.bool = bool;
- }
-
- @Override
- public Date getDateTime() {
- return dateTime == null ? null : new Date(dateTime.getTime());
- }
-
- public void setDateTime(final Date dateTime) {
- this.dateTime = dateTime == null ? null : new Date(dateTime.getTime());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java
deleted file mode 100644
index 114465b..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.olingo.odata4.client.api.edm.xml.v3.ValueTerm;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-public class ValueTermImpl extends AbstractEdmItem implements ValueTerm {
-
- private static final long serialVersionUID = 6149019886137610604L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Type", required = true)
- private String type;
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- @Override
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.java
deleted file mode 100644
index f2d6095..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.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.odata4.client.core.edm.xml.v3;
-
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractXMLMetadata;
-
-public class XMLMetadataImpl extends AbstractXMLMetadata {
-
- private static final long serialVersionUID = -7765327879691528010L;
-
- public XMLMetadataImpl(final EdmxImpl edmx) {
- super(edmx);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java
deleted file mode 100644
index accae2e..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java
+++ /dev/null
@@ -1,44 +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.odata4.client.core.edm.xml.v4;
-
-import org.apache.olingo.odata4.client.api.edm.xml.v4.AnnotatedEdmItem;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Annotation;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-public abstract class AbstractAnnotatedEdmItem extends AbstractEdmItem implements AnnotatedEdmItem {
-
- private static final long serialVersionUID = -8859729466090997718L;
-
- @JsonProperty("Annotation")
- private AnnotationImpl annotation;
-
- @Override
- public AnnotationImpl getAnnotation() {
- return annotation;
- }
-
- @JsonIgnore
- public void setAnnotation(final Annotation annotation) {
- this.annotation = (AnnotationImpl) annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.java
deleted file mode 100644
index ea93d75..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.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 org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-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 java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractEdmDeserializer;
-
-public class ActionDeserializer extends AbstractEdmDeserializer<ActionImpl> {
-
- @Override
- protected ActionImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final ActionImpl action = new ActionImpl();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- action.setName(jp.nextTextValue());
- } else if ("IsBound".equals(jp.getCurrentName())) {
- action.setBound(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("EntitySetPath".equals(jp.getCurrentName())) {
- action.setEntitySetPath(jp.nextTextValue());
- } else if ("Parameter".equals(jp.getCurrentName())) {
- jp.nextToken();
- action.getParameters().add(jp.readValueAs(ParameterImpl.class));
- } else if ("ReturnType".equals(jp.getCurrentName())) {
- action.setReturnType(parseReturnType(jp, "Action"));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- action.setAnnotation(jp.readValueAs(AnnotationImpl.class));
- }
- }
- }
-
- return action;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java
deleted file mode 100644
index a1c3d16..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java
+++ /dev/null
@@ -1,89 +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.odata4.client.core.edm.xml.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Action;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Parameter;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.ReturnType;
-
-@JsonDeserialize(using = ActionDeserializer.class)
-public class ActionImpl extends AbstractAnnotatedEdmItem implements Action {
-
- private static final long serialVersionUID = -99977447455438193L;
-
- private String name;
-
- private boolean bound = false;
-
- private String entitySetPath;
-
- private final List<Parameter> parameters = new ArrayList<Parameter>();
-
- private ReturnType returnType;
-
- @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/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.java
deleted file mode 100644
index fca7ed7..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.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.odata4.client.core.edm.xml.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.ActionImport;
-
-public class ActionImportImpl extends AbstractAnnotatedEdmItem implements ActionImport {
-
- private static final long serialVersionUID = -866422101558426421L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Action", required = true)
- private String action;
-
- @JsonProperty(value = "EntitySet")
- private String entitySet;
-
- @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;
- }
-
- @Override
- public void setEntitySet(final String entitySet) {
- this.entitySet = entitySet;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java
deleted file mode 100644
index 6a4332a..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java
+++ /dev/null
@@ -1,57 +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.odata4.client.core.edm.xml.v4;
-
-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 java.io.IOException;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractEdmDeserializer;
-import org.apache.olingo.odata4.client.core.edm.xml.v4.annotation.DynExprConstructImpl;
-
-public class AnnotationDeserializer extends AbstractEdmDeserializer<AnnotationImpl> {
-
- @Override
- protected AnnotationImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AnnotationImpl annotation = new AnnotationImpl();
-
- for (; jp.getCurrentToken() != null && jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Term".equals(jp.getCurrentName())) {
- annotation.setTerm(jp.nextTextValue());
- } else if ("Qualifier".equals(jp.getCurrentName())) {
- annotation.setQualifier(jp.nextTextValue());
- } else if (isAnnotationConstExprConstruct(jp)) {
- // Constant Expressions
- annotation.setConstExpr(parseAnnotationConstExprConstruct(jp));
- } else {
- // Dynamic Expressions
- annotation.setDynExpr(jp.readValueAs( DynExprConstructImpl.class));
- }
- }
- }
-
- return annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java
deleted file mode 100644
index 1e1ae0c..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java
+++ /dev/null
@@ -1,76 +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.odata4.client.core.edm.xml.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Annotation;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.annotation.ConstExprConstruct;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.annotation.DynExprConstruct;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmItem;
-
-@JsonDeserialize(using = AnnotationDeserializer.class)
-public class AnnotationImpl extends AbstractEdmItem implements Annotation {
-
- private static final long serialVersionUID = -5600031479702563436L;
-
- private String term;
-
- private String qualifier;
-
- private ConstExprConstruct constExpr;
-
- private DynExprConstruct dynExpr;
-
- @Override
- public String getTerm() {
- return term;
- }
-
- public void setTerm(final String term) {
- this.term = term;
- }
-
- @Override
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-
- @Override
- public ConstExprConstruct getConstExpr() {
- return constExpr;
- }
-
- public void setConstExpr(final ConstExprConstruct constExpr) {
- this.constExpr = constExpr;
- }
-
- @Override
- public DynExprConstruct getDynExpr() {
- return dynExpr;
- }
-
- public void setDynExpr(final DynExprConstruct dynExpr) {
- this.dynExpr = dynExpr;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java
deleted file mode 100644
index 80e07ad..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-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 java.io.IOException;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractEdmDeserializer;
-
-public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> {
-
- @Override
- protected AnnotationsImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AnnotationsImpl annotations = new AnnotationsImpl();
-
- 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 ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- annotations.getAnnotations().add(jp.readValueAs( AnnotationImpl.class));
- }
- }
- }
-
- return annotations;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.java
deleted file mode 100644
index cfd961d..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.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.odata4.client.core.edm.xml.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Annotations;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractAnnotations;
-
-@JsonDeserialize(using = AnnotationsDeserializer.class)
-public class AnnotationsImpl extends AbstractAnnotations implements Annotations {
-
- private static final long serialVersionUID = 3877353656301805410L;
-
- private final List<AnnotationImpl> annotations = new ArrayList<AnnotationImpl>();
-
- @Override
- public List<AnnotationImpl> getAnnotations() {
- return annotations;
- }
-
- @Override
- public AnnotationImpl getAnnotation(final String term) {
- AnnotationImpl result = null;
- for (AnnotationImpl annotation : getAnnotations()) {
- if (term.equals(annotation.getTerm())) {
- result = annotation;
- }
- }
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java
deleted file mode 100644
index bc3fe92..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java
+++ /dev/null
@@ -1,101 +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 >ied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Annotation;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.ComplexType;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.NavigationProperty;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Property;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractComplexType;
-
-public class ComplexTypeImpl extends AbstractComplexType implements ComplexType {
-
- private static final long serialVersionUID = -1251230308269425962L;
-
- private boolean abstractEntityType = false;
-
- private String baseType;
-
- private boolean openType = false;
-
- private final List<Property> properties = new ArrayList<Property>();
-
- private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
-
- private Annotation annotation;
-
- @Override
- public boolean isAbstractEntityType() {
- return abstractEntityType;
- }
-
- public void setAbstractEntityType(final boolean abstractEntityType) {
- this.abstractEntityType = abstractEntityType;
- }
-
- @Override
- public String getBaseType() {
- return baseType;
- }
-
- public void setBaseType(final String baseType) {
- this.baseType = baseType;
- }
-
- @Override
- public boolean isOpenType() {
- return openType;
- }
-
- public void setOpenType(final boolean openType) {
- this.openType = openType;
- }
-
- @Override
- public Property getProperty(final String name) {
- return (Property) super.getProperty(name);
- }
-
- @Override
- public List<Property> getProperties() {
- return properties;
- }
-
- @Override
- public NavigationProperty getNavigationProperty(final String name) {
- return (NavigationProperty) super.getNavigationProperty(name);
- }
-
- @Override
- public List<NavigationProperty> getNavigationProperties() {
- return navigationProperties;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.java
deleted file mode 100644
index a9b0589..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.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 org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Schema;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractDataServices;
-
-public class DataServicesImpl extends AbstractDataServices {
-
- private static final long serialVersionUID = -7954360771258897632L;
-
- private final List<Schema> schemas = new ArrayList<Schema>();
-
- @Override
- public List<Schema> getSchemas() {
- return schemas;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java
deleted file mode 100644
index bd216f9..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Edmx;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Reference;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEdmx;
-
-public class EdmxImpl extends AbstractEdmx implements Edmx {
-
- private static final long serialVersionUID = -8031883176876401375L;
-
- private final List<Reference> references = new ArrayList<Reference>();
-
- @Override
- public DataServicesImpl getDataServices() {
- return (DataServicesImpl) super.getDataServices();
- }
-
- @Override
- public List<Reference> getReferences() {
- return references;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java
deleted file mode 100644
index 8e11425..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java
+++ /dev/null
@@ -1,128 +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.odata4.client.core.edm.xml.v4;
-
-import org.apache.olingo.odata4.client.api.edm.xml.v4.AnnotatedEdmItem;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.ActionImport;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Annotation;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.EntityContainer;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.EntitySet;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.FunctionImport;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Singleton;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEntityContainer;
-
-public class EntityContainerImpl extends AbstractEntityContainer implements AnnotatedEdmItem, EntityContainer {
-
- private static final long serialVersionUID = 2526002525927260320L;
-
- private final List<EntitySet> entitySets = new ArrayList<EntitySet>();
-
- private final List<Singleton> singletons = new ArrayList<Singleton>();
-
- private final List<ActionImport> actionImports = new ArrayList<ActionImport>();
-
- private final List<FunctionImport> functionImports = new ArrayList<FunctionImport>();
-
- private Annotation annotation;
-
- @Override
- public void setDefaultEntityContainer(final boolean defaultEntityContainer) {
- // no action: a single entity container MUST be available as per OData 4.0
- }
-
- @Override
- public boolean isDefaultEntityContainer() {
- return true;
- }
-
- @Override
- public EntitySet getEntitySet(final String name) {
- return (EntitySet) super.getEntitySet(name);
- }
-
- @Override
- public List<EntitySet> getEntitySets() {
- return entitySets;
- }
-
- @Override
- public List<Singleton> getSingletons() {
- return singletons;
- }
-
- @Override
- public Singleton getSingleton(final String name) {
- return getOneByName(name, getSingletons());
- }
-
- @Override
- public FunctionImport getFunctionImport(final String name) {
- return (FunctionImport) super.getFunctionImport(name);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List<FunctionImport> getFunctionImports(final String name) {
- return (List<FunctionImport>) super.getFunctionImports(name);
- }
-
- /**
- * Gets the first action import with given name.
- *
- * @param name name.
- * @return action import.
- */
- @Override
- public ActionImport getActionImport(final String name) {
- return getOneByName(name, getActionImports());
- }
-
- /**
- * Gets all action imports with given name.
- *
- * @param name name.
- * @return action imports.
- */
- @Override
- public List<ActionImport> getActionImports(final String name) {
- return getAllByName(name, getActionImports());
- }
-
- @Override
- public List<ActionImport> getActionImports() {
- return actionImports;
- }
-
- @Override
- public List<FunctionImport> getFunctionImports() {
- return functionImports;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java
deleted file mode 100644
index 723faee..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Annotation;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.EntitySet;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.NavigationPropertyBinding;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEntitySet;
-
-public class EntitySetImpl extends AbstractEntitySet implements EntitySet {
-
- private static final long serialVersionUID = 5570833733884884012L;
-
- private boolean includeInServiceDocument = true;
-
- private Annotation annotation;
-
- private final List<NavigationPropertyBinding> navigationPropertyBindings = new ArrayList<NavigationPropertyBinding>();
-
- @Override
- public boolean isIncludeInServiceDocument() {
- return includeInServiceDocument;
- }
-
- public void setIncludeInServiceDocument(final boolean includeInServiceDocument) {
- this.includeInServiceDocument = includeInServiceDocument;
- }
-
- @Override
- public List<NavigationPropertyBinding> getNavigationPropertyBindings() {
- return navigationPropertyBindings;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java
deleted file mode 100644
index 8ca73aa..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java
+++ /dev/null
@@ -1,68 +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.odata4.client.core.edm.xml.v4;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Annotation;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.EntityType;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.NavigationProperty;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Property;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEntityType;
-
-public class EntityTypeImpl extends AbstractEntityType implements EntityType {
-
- private static final long serialVersionUID = 8727765036150269547L;
-
- private final List<Property> properties = new ArrayList<Property>();
-
- private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
-
- private Annotation annotation;
-
- @Override
- public Property getProperty(final String name) {
- return (Property) super.getProperty(name);
- }
-
- @Override
- public List<Property> getProperties() {
- return properties;
- }
-
- @Override
- public NavigationProperty getNavigationProperty(final String name) {
- return (NavigationProperty) super.getNavigationProperty(name);
- }
-
- @Override
- public List<NavigationProperty> getNavigationProperties() {
- return navigationProperties;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java
deleted file mode 100644
index b225902..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-import org.apache.olingo.odata4.client.api.edm.xml.v4.AnnotatedEdmItem;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Annotation;
-import org.apache.olingo.odata4.client.core.edm.xml.AbstractEnumType;
-
-public class EnumTypeImpl extends AbstractEnumType implements AnnotatedEdmItem {
-
- private static final long serialVersionUID = -3329664331877556957L;
-
- private Annotation annotation;
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java
deleted file mode 100644
index f8c6b8a..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-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 java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractEdmDeserializer;
-
-public class FunctionDeserializer extends AbstractEdmDeserializer<FunctionImpl> {
-
- @Override
- protected FunctionImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final FunctionImpl functionImpl = new FunctionImpl();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- functionImpl.setName(jp.nextTextValue());
- } else if ("IsBound".equals(jp.getCurrentName())) {
- functionImpl.setBound(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsComposable".equals(jp.getCurrentName())) {
- functionImpl.setComposable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("EntitySetPath".equals(jp.getCurrentName())) {
- functionImpl.setEntitySetPath(jp.nextTextValue());
- } else if ("Parameter".equals(jp.getCurrentName())) {
- jp.nextToken();
- functionImpl.getParameters().add(jp.readValueAs(ParameterImpl.class));
- } else if ("ReturnType".equals(jp.getCurrentName())) {
- functionImpl.setReturnType(parseReturnType(jp, "Function"));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- functionImpl.setAnnotation(jp.readValueAs(AnnotationImpl.class));
- }
- }
- }
-
- return functionImpl;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java
deleted file mode 100644
index 17ae459..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.edm.xml.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.Function;
-
-@JsonDeserialize(using = FunctionDeserializer.class)
-public class FunctionImpl extends ActionImpl implements Function {
-
- private static final long serialVersionUID = -5888231162358116515L;
-
- private boolean composable = false;
-
- @Override
- public boolean isComposable() {
- return composable;
- }
-
- public void setComposable(final boolean composable) {
- this.composable = composable;
- }
-
-}