You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/05/22 13:43:47 UTC
[39/51] [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/AbstractEdmDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmDeserializer.java
deleted file mode 100644
index 8ebf5bd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmDeserializer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ReturnType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.ConstExprConstruct;
-import java.io.IOException;
-
-public abstract class AbstractEdmDeserializer<T> extends JsonDeserializer<T> {
-
- protected ODataClient client;
-
- protected boolean isAnnotationConstExprConstruct(final JsonParser jp) throws IOException {
- return ConstExprConstruct.Type.fromString(jp.getCurrentName()) != null;
- }
-
- protected ConstExprConstruct parseAnnotationConstExprConstruct(final JsonParser jp) throws IOException {
- final ConstExprConstruct constExpr = new ConstExprConstruct();
- constExpr.setType(ConstExprConstruct.Type.fromString(jp.getCurrentName()));
- constExpr.setValue(jp.nextTextValue());
- return constExpr;
- }
-
- protected ReturnType parseReturnType(final JsonParser jp, final String elementName) throws IOException {
- ReturnType returnType;
- if (elementName.equals(((FromXmlParser) jp).getStaxReader().getLocalName())) {
- returnType = new ReturnType();
- returnType.setType(jp.nextTextValue());
- } else {
- jp.nextToken();
- returnType = jp.getCodec().readValue(jp, ReturnType.class);
- }
- return returnType;
- }
-
- protected abstract T doDeserialize(JsonParser jp, DeserializationContext ctxt)
- throws IOException, JsonProcessingException;
-
- @Override
- public T deserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- client = (ODataClient) ctxt.findInjectableValue(ODataClient.class.getName(), null, null);
- return doDeserialize(jp, ctxt);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmx.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmx.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmx.java
deleted file mode 100644
index 1cae05d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmx.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = EdmxDeserializer.class)
-public abstract class AbstractEdmx<DS extends AbstractDataServices<S, EC, E, C, FI>, S extends AbstractSchema<
- EC, E, C, FI>, EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- extends AbstractEdm {
-
- private static final long serialVersionUID = -5480835122183091469L;
-
- private String version;
-
- private DS dataServices;
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(final String version) {
- this.version = version;
- }
-
- public DS getDataServices() {
- return dataServices;
- }
-
- public void setDataServices(final DS dataServices) {
- this.dataServices = dataServices;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityContainer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityContainer.java
deleted file mode 100644
index 7aa8fdb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityContainer.java
+++ /dev/null
@@ -1,104 +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.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = EntityContainerDeserializer.class)
-public abstract class AbstractEntityContainer<FI extends AbstractFunctionImport> extends AbstractEdm {
-
- private static final long serialVersionUID = 4121974387552855032L;
-
- private String name;
-
- private String _extends;
-
- private boolean lazyLoadingEnabled;
-
- private boolean defaultEntityContainer;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getExtends() {
- return _extends;
- }
-
- public void setExtends(final String _extends) {
- this._extends = _extends;
- }
-
- public boolean isLazyLoadingEnabled() {
- return lazyLoadingEnabled;
- }
-
- public void setLazyLoadingEnabled(final boolean lazyLoadingEnabled) {
- this.lazyLoadingEnabled = lazyLoadingEnabled;
- }
-
- public boolean isDefaultEntityContainer() {
- return defaultEntityContainer;
- }
-
- public void setDefaultEntityContainer(final boolean defaultEntityContainer) {
- this.defaultEntityContainer = defaultEntityContainer;
- }
-
- public abstract List<? extends AbstractEntitySet> getEntitySets();
-
- public abstract AbstractEntitySet getEntitySet(String name);
-
- /**
- * Gets the first function import with given name.
- *
- * @param name name.
- * @return function import.
- */
- public FI getFunctionImport(final String name) {
- final List<FI> funcImps = getFunctionImports(name);
- return funcImps.isEmpty()
- ? null
- : funcImps.get(0);
- }
-
- /**
- * Gets all function imports with given name.
- *
- * @param name name.
- * @return function imports.
- */
- public List<FI> getFunctionImports(final String name) {
- final List<FI> result = new ArrayList<FI>();
- for (FI functionImport : getFunctionImports()) {
- if (name.equals(functionImport.getName())) {
- result.add(functionImport);
- }
- }
- return result;
- }
-
- public abstract List<FI> getFunctionImports();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntitySet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntitySet.java
deleted file mode 100644
index b0d8b50..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntitySet.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;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = EntitySetDeserializer.class)
-public abstract class AbstractEntitySet extends AbstractEdm {
-
- private static final long serialVersionUID = -6577263439520376420L;
-
- private String name;
-
- private String entityType;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getEntityType() {
- return entityType;
- }
-
- public void setEntityType(final String entityType) {
- this.entityType = entityType;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityType.java
deleted file mode 100644
index b9147d0..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityType.java
+++ /dev/null
@@ -1,83 +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.databind.annotation.JsonDeserialize;
-import java.util.List;
-
-@JsonDeserialize(using = EntityTypeDeserializer.class)
-public abstract class AbstractEntityType extends AbstractComplexType {
-
- private static final long serialVersionUID = -1579462552966168139L;
-
- private boolean abstractEntityType = false;
-
- private String baseType;
-
- private boolean openType = false;
-
- private boolean hasStream = false;
-
- private EntityKey key;
-
- public boolean isAbstractEntityType() {
- return abstractEntityType;
- }
-
- public void setAbstractEntityType(final boolean abstractEntityType) {
- this.abstractEntityType = abstractEntityType;
- }
-
- public String getBaseType() {
- return baseType;
- }
-
- public void setBaseType(final String baseType) {
- this.baseType = baseType;
- }
-
- public boolean isOpenType() {
- return openType;
- }
-
- public void setOpenType(final boolean openType) {
- this.openType = openType;
- }
-
- public EntityKey getKey() {
- return key;
- }
-
- public void setKey(final EntityKey key) {
- this.key = key;
- }
-
- public boolean isHasStream() {
- return hasStream;
- }
-
- public void setHasStream(final boolean hasStream) {
- this.hasStream = hasStream;
- }
-
- public abstract List<? extends AbstractNavigationProperty> getNavigationProperties();
-
- public abstract AbstractNavigationProperty getNavigationProperty(String name);
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEnumType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEnumType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEnumType.java
deleted file mode 100644
index 3c0f58c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEnumType.java
+++ /dev/null
@@ -1,64 +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.databind.annotation.JsonDeserialize;
-import java.util.List;
-
-@JsonDeserialize(using = EnumTypeDeserializer.class)
-public abstract class AbstractEnumType extends AbstractEdm {
-
- private static final long serialVersionUID = 2688487586103418210L;
-
- private String name;
-
- private String underlyingType;
-
- private boolean flags;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getUnderlyingType() {
- return underlyingType;
- }
-
- public void setUnderlyingType(final String underlyingType) {
- this.underlyingType = underlyingType;
- }
-
- public boolean isFlags() {
- return flags;
- }
-
- public void setFlags(final boolean flags) {
- this.flags = flags;
- }
-
- public abstract List<? extends AbstractMember> getMembers();
-
- public abstract AbstractMember getMember(String name);
-
- public abstract AbstractMember getMember(Integer value);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractFunctionImport.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractFunctionImport.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractFunctionImport.java
deleted file mode 100644
index db054a3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractFunctionImport.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;
-
-public abstract class AbstractFunctionImport extends AbstractEdm {
-
- private static final long serialVersionUID = 4154308065211315663L;
-
- public abstract String getName();
-
- public abstract String getEntitySet();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractMember.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractMember.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractMember.java
deleted file mode 100644
index 4795d6e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractMember.java
+++ /dev/null
@@ -1,48 +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 abstract class AbstractMember extends AbstractEdm {
-
- private static final long serialVersionUID = -1852481655317148552L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty("Value")
- private Integer value;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public Integer getValue() {
- return value;
- }
-
- public void setValue(final Integer value) {
- this.value = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractNavigationProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractNavigationProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractNavigationProperty.java
deleted file mode 100644
index f69cc7a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractNavigationProperty.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;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class AbstractNavigationProperty extends AbstractEdm {
-
- private static final long serialVersionUID = 3112463683071069594L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractParameter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractParameter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractParameter.java
deleted file mode 100644
index 2bd3732..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractParameter.java
+++ /dev/null
@@ -1,93 +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;
-import java.math.BigInteger;
-
-public abstract class AbstractParameter extends AbstractEdm {
-
- private static final long serialVersionUID = -4305016554930334342L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Type", required = true)
- private String type;
-
- @JsonProperty(value = "Nullable")
- private boolean nullable = true;
-
- @JsonProperty("MaxLength")
- private String maxLength;
-
- @JsonProperty("Precision")
- private BigInteger precision;
-
- @JsonProperty("Scale")
- private BigInteger scale;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public boolean isNullable() {
- return nullable;
- }
-
- public void setNullable(final boolean nullable) {
- this.nullable = nullable;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractProperty.java
deleted file mode 100644
index 5ae2897..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractProperty.java
+++ /dev/null
@@ -1,237 +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;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import java.math.BigInteger;
-
-public abstract class AbstractProperty extends AbstractEdm {
-
- private static final long serialVersionUID = -6004492361142315153L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Type", required = true)
- private String type;
-
- @JsonProperty(value = "Nullable")
- private boolean nullable = true;
-
- @JsonProperty(value = "DefaultValue")
- private String defaultValue;
-
- @JsonProperty(value = "MaxLength")
- private String maxLength;
-
- @JsonProperty(value = "FixedLength")
- private boolean fixedLength;
-
- @JsonProperty(value = "Precision")
- private BigInteger precision;
-
- @JsonProperty(value = "Scale")
- private BigInteger scale;
-
- @JsonProperty(value = "Unicode")
- private boolean unicode = true;
-
- @JsonProperty(value = "Collation")
- private String collation;
-
- @JsonProperty(value = "SRID")
- private String srid;
-
- @JsonProperty(value = "ConcurrencyMode")
- private ConcurrencyMode concurrencyMode;
-
- @JsonProperty("FC_SourcePath")
- private String fcSourcePath;
-
- @JsonProperty("FC_TargetPath")
- private String fcTargetPath;
-
- @JsonProperty("FC_ContentKind")
- private EdmContentKind fcContentKind = EdmContentKind.text;
-
- @JsonProperty("FC_NsPrefix")
- private String fcNSPrefix;
-
- @JsonProperty("FC_NsUri")
- private String fcNSURI;
-
- @JsonProperty("FC_KeepInContent")
- private boolean fcKeepInContent = true;
-
- @JsonProperty("StoreGeneratedPattern")
- private StoreGeneratedPattern storeGeneratedPattern = StoreGeneratedPattern.None;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public boolean isNullable() {
- return nullable;
- }
-
- public void setNullable(final boolean nullable) {
- this.nullable = nullable;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(final String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public boolean isFixedLength() {
- return fixedLength;
- }
-
- public void setFixedLength(final boolean fixedLength) {
- this.fixedLength = fixedLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-
- public boolean isUnicode() {
- return unicode;
- }
-
- public void setUnicode(final boolean unicode) {
- this.unicode = unicode;
- }
-
- public String getCollation() {
- return collation;
- }
-
- public void setCollation(final String collation) {
- this.collation = collation;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public ConcurrencyMode getConcurrencyMode() {
- return concurrencyMode;
- }
-
- public void setConcurrencyMode(final ConcurrencyMode concurrencyMode) {
- this.concurrencyMode = concurrencyMode;
- }
-
- public String getFcSourcePath() {
- return fcSourcePath;
- }
-
- public void setFcSourcePath(final String fcSourcePath) {
- this.fcSourcePath = fcSourcePath;
- }
-
- public String getFcTargetPath() {
- return fcTargetPath;
- }
-
- public void setFcTargetPath(final String fcTargetPath) {
- this.fcTargetPath = fcTargetPath;
- }
-
- public EdmContentKind getFcContentKind() {
- return fcContentKind;
- }
-
- public void setFcContentKind(final EdmContentKind fcContentKind) {
- this.fcContentKind = fcContentKind;
- }
-
- public String getFcNSPrefix() {
- return fcNSPrefix;
- }
-
- public void setFcNSPrefix(final String fcNSPrefix) {
- this.fcNSPrefix = fcNSPrefix;
- }
-
- public String getFcNSURI() {
- return fcNSURI;
- }
-
- public void setFcNSURI(final String fcNSURI) {
- this.fcNSURI = fcNSURI;
- }
-
- public boolean isFcKeepInContent() {
- return fcKeepInContent;
- }
-
- public void setFcKeepInContent(final boolean fcKeepInContent) {
- this.fcKeepInContent = fcKeepInContent;
- }
-
- public StoreGeneratedPattern getStoreGeneratedPattern() {
- return storeGeneratedPattern;
- }
-
- public void setStoreGeneratedPattern(final StoreGeneratedPattern storeGeneratedPattern) {
- this.storeGeneratedPattern = storeGeneratedPattern;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractSchema.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractSchema.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractSchema.java
deleted file mode 100644
index 51e20a4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractSchema.java
+++ /dev/null
@@ -1,111 +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.databind.annotation.JsonDeserialize;
-import java.util.List;
-
-@JsonDeserialize(using = SchemaDeserializer.class)
-public abstract class AbstractSchema<EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- extends AbstractEdm {
-
- private static final long serialVersionUID = -1356392748971378455L;
-
- private String namespace;
-
- private String alias;
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(final String namespace) {
- this.namespace = namespace;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(final String alias) {
- this.alias = alias;
- }
-
- public abstract List<E> getEntityTypes();
-
- public abstract List<? extends AbstractEnumType> getEnumTypes();
-
- public abstract AbstractEnumType getEnumType(String name);
-
- public abstract List<? extends AbstractAnnotations> getAnnotationsList();
-
- public abstract AbstractAnnotations getAnnotationsList(String target);
-
- public abstract List<C> getComplexTypes();
-
- public abstract List<EC> getEntityContainers();
-
- /**
- * Gets default entity container.
- *
- * @return default entity container.
- */
- public abstract EC getDefaultEntityContainer();
-
- /**
- * Gets entity container with the given name.
- *
- * @param name name.
- * @return entity container.
- */
- public abstract EC getEntityContainer(String name);
-
- /**
- * Gets entity type with the given name.
- *
- * @param name name.
- * @return entity type.
- */
- public E getEntityType(final String name) {
- E result = null;
- for (E type : getEntityTypes()) {
- if (name.equals(type.getName())) {
- result = type;
- }
- }
- return result;
- }
-
- /**
- * Gets complex type with the given name.
- *
- * @param name name.
- * @return complex type.
- */
- public C getComplexType(final String name) {
- C result = null;
- for (C type : getComplexTypes()) {
- if (name.equals(type.getName())) {
- result = type;
- }
- }
- 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/ComplexTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ComplexTypeDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ComplexTypeDeserializer.java
deleted file mode 100644
index 2c31f98..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ComplexTypeDeserializer.java
+++ /dev/null
@@ -1,80 +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.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.Annotation;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class ComplexTypeDeserializer extends AbstractEdmDeserializer<AbstractComplexType> {
-
- @Override
- protected AbstractComplexType doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractComplexType complexType = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- complexType.setName(jp.nextTextValue());
- } else if ("Abstract".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- setAbstractEntityType(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("BaseType".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- setBaseType(jp.nextTextValue());
- } else if ("OpenType".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- setOpenType(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Property".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (complexType instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType) complexType).
- getProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Property.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- getProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Property.class));
- }
- } else if ("NavigationProperty".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- getNavigationProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationProperty.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return complexType;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ConcurrencyMode.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ConcurrencyMode.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ConcurrencyMode.java
deleted file mode 100644
index ce44e47..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ConcurrencyMode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm;
-
-public enum ConcurrencyMode {
-
- None,
- Fixed
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/DataServicesDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/DataServicesDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/DataServicesDeserializer.java
deleted file mode 100644
index 8c2526b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/DataServicesDeserializer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm;
-
-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.utils.ODataVersion;
-import java.io.IOException;
-
-public class DataServicesDeserializer extends AbstractEdmDeserializer<AbstractDataServices> {
-
- @Override
- protected AbstractDataServices doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractDataServices dataServices = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("DataServiceVersion".equals(jp.getCurrentName())) {
- dataServices.setDataServiceVersion(jp.nextTextValue());
- } else if ("MaxDataServiceVersion".equals(jp.getCurrentName())) {
- dataServices.setMaxDataServiceVersion(jp.nextTextValue());
- } else if ("Schema".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (dataServices instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices) dataServices).
- getSchemas().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Schema.class));
-
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices) dataServices).
- getSchemas().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Schema.class));
- }
- }
- }
- }
-
- return dataServices;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmSimpleType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmSimpleType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmSimpleType.java
deleted file mode 100644
index c6f0419..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmSimpleType.java
+++ /dev/null
@@ -1,291 +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.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-
-/**
- * Represent the primitive types of the Entity Data Model (EDM).
- *
- * @see http://dl.windowsazure.com/javadoc/com/microsoft/windowsazure/services/table/models/EdmType.html
- * <p>
- * For an overview of the available EDM primitive data types and names, see the <a
- * href="http://www.odata.org/developers/protocols/overview#AbstractTypeSystem">Primitive Data Types</a> section of the
- * <a href="http://www.odata.org/developers/protocols/overview">OData Protocol Overview</a>.
- * </p>
- * <p>
- * The Abstract Type System used to define the primitive types supported by OData is defined in detail in <a
- * href="http://msdn.microsoft.com/en-us/library/dd541474.aspx">[MC-CSDL] (section 2.2.1).</a>
- * </p>
- */
-public enum EdmSimpleType {
-
- /**
- * The absence of a value.
- */
- Null(Void.class),
- /**
- * An array of bytes.
- */
- Binary(byte[].class),
- /**
- * A Boolean value.
- */
- Boolean(Boolean.class),
- /**
- * Unsigned 8-bit integer value.
- */
- Byte(Integer.class),
- /**
- * A signed 8-bit integer value.
- */
- SByte(Byte.class),
- /**
- * A 64-bit value expressed as Coordinated Universal Time (UTC).
- */
- DateTime(new ODataVersion[] { ODataVersion.V3 }, ODataTimestamp.class, "yyyy-MM-dd'T'HH:mm:ss"),
- /**
- * Date without a time-zone offset.
- */
- Date(new ODataVersion[] { ODataVersion.V4 }, ODataTimestamp.class, "yyyy-MM-dd"),
- /**
- * Date and time as an Offset in minutes from GMT.
- */
- DateTimeOffset(ODataTimestamp.class, "yyyy-MM-dd'T'HH:mm:ss"),
- /**
- * The time of day with values ranging from 0:00:00.x to 23:59:59.y, where x and y depend upon the precision.
- */
- Time(new ODataVersion[] { ODataVersion.V3 }, ODataDuration.class),
- /**
- * The time of day with values ranging from 0:00:00.x to 23:59:59.y, where x and y depend upon the precision.
- */
- TimeOfDay(new ODataVersion[] { ODataVersion.V4 }, ODataDuration.class),
- /**
- * Signed duration in days, hours, minutes, and (sub)seconds.
- */
- Duration(new ODataVersion[] { ODataVersion.V4 }, ODataDuration.class),
- /**
- * Numeric values with fixed precision and scale.
- */
- Decimal(BigDecimal.class, "#.#######################"),
- /**
- * A floating point number with 7 digits precision.
- */
- Single(Float.class, "#.#######E0"),
- /**
- * A 64-bit double-precision floating point value.
- */
- Double(Double.class, "#.#######################E0"),
- // --- Geospatial ---
- Geography(Geospatial.class),
- GeographyPoint(Point.class),
- GeographyLineString(LineString.class),
- GeographyPolygon(Polygon.class),
- GeographyMultiPoint(MultiPoint.class),
- GeographyMultiLineString(MultiLineString.class),
- GeographyMultiPolygon(MultiPolygon.class),
- GeographyCollection(GeospatialCollection.class),
- Geometry(Geospatial.class),
- GeometryPoint(Point.class),
- GeometryLineString(LineString.class),
- GeometryPolygon(Polygon.class),
- GeometryMultiPoint(MultiPoint.class),
- GeometryMultiLineString(MultiLineString.class),
- GeometryMultiPolygon(MultiPolygon.class),
- GeometryCollection(GeospatialCollection.class),
- /**
- * A 128-bit globally unique identifier.
- */
- Guid(UUID.class),
- /**
- * A 16-bit integer value.
- */
- Int16(Short.class),
- /**
- * A 32-bit integer value.
- */
- Int32(Integer.class),
- /**
- * A 64-bit integer value.
- */
- Int64(Long.class),
- /**
- * A UTF-16-encoded value.
- * String values may be up to 64 KB in size.
- */
- String(String.class),
- /**
- * Resource stream (for media entities).
- */
- Stream(URI.class);
-
- private final Class<?> clazz;
-
- private final String pattern;
-
- private final ODataVersion[] versions;
-
- /**
- * Constructor (all OData versions).
- *
- * @param clazz type.
- */
- EdmSimpleType(final Class<?> clazz) {
- this(ODataVersion.values(), clazz, null);
- }
-
- /**
- * Constructor.
- *
- * @param versions supported OData versions.
- * @param clazz type.
- */
- EdmSimpleType(final ODataVersion[] versions, final Class<?> clazz) {
- this(versions, clazz, null);
- }
-
- /**
- * Constructor (all OData versions).
- *
- * @param clazz type.
- * @param pattern pattern.
- */
- EdmSimpleType(final Class<?> clazz, final String pattern) {
- this(ODataVersion.values(), clazz, pattern);
- }
-
- /**
- * Constructor.
- *
- * @param versions supported OData versions.
- * @param clazz type.
- * @param pattern pattern.
- */
- EdmSimpleType(final ODataVersion[] versions, final Class<?> clazz, final String pattern) {
- this.clazz = clazz;
- this.pattern = pattern;
- this.versions = versions.clone();
- }
-
- /**
- * Gets pattern.
- *
- * @return pattern.
- */
- public String pattern() {
- return pattern;
- }
-
- /**
- * Gets corresponding java type.
- *
- * @return java type.
- */
- public Class<?> javaType() {
- return this.clazz;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return namespace() + "." + name();
- }
-
- /**
- * Checks if is a geospatial type.
- *
- * @return <tt>true</tt> if is geospatial type; <tt>false</tt> otherwise.
- */
- public boolean isGeospatial() {
- return name().startsWith("Geo");
- }
-
- /**
- * Checks if the given type is a geospatial type.
- *
- * @param type type.
- * @return <tt>true</tt> if is geospatial type; <tt>false</tt> otherwise.
- */
- public static boolean isGeospatial(final String type) {
- return type != null && type.startsWith(namespace() + ".Geo");
- }
-
- /**
- * Gets <tt>EdmSimpleType</tt> from string.
- *
- * @param value string value type.
- * @return <tt>EdmSimpleType</tt> object.
- */
- public static EdmSimpleType fromValue(final String value) {
- final String noNsValue = value.substring(4);
- for (EdmSimpleType edmSimpleType : EdmSimpleType.values()) {
- if (edmSimpleType.name().equals(noNsValue)) {
- return edmSimpleType;
- }
- }
- throw new IllegalArgumentException(value);
- }
-
- /**
- * Gets <tt>EdmSimpleType</tt> from object instance.
- *
- * @param workingVersion OData version.
- * @param obj object.
- * @return <tt>EdmSimpleType</tt> object.
- */
- public static EdmSimpleType fromObject(final ODataVersion workingVersion, final Object obj) {
- for (EdmSimpleType edmSimpleType : EdmSimpleType.values()) {
- if (edmSimpleType.javaType().equals(obj.getClass())) {
- return edmSimpleType == DateTimeOffset || edmSimpleType == DateTime || edmSimpleType == Date
- ? ((ODataTimestamp) obj).isOffset()
- ? DateTimeOffset : workingVersion == ODataVersion.V3 ? DateTime : Date
- : edmSimpleType;
- }
- }
- throw new IllegalArgumentException(obj.getClass().getSimpleName() + " is not a simple type");
- }
-
- /**
- * Gets namespace.
- *
- * @return namespace.
- */
- public static String namespace() {
- return "Edm";
- }
-
- public ODataVersion[] getSupportedVersions() {
- return versions.clone();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmxDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmxDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmxDeserializer.java
deleted file mode 100644
index bc44b6b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmxDeserializer.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm;
-
-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.Reference;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-
-@SuppressWarnings("rawtypes")
-public class EdmxDeserializer extends AbstractEdmDeserializer<AbstractEdmx> {
-
- @Override
- protected AbstractEdmx doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEdmx edmx = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Version".equals(jp.getCurrentName())) {
- edmx.setVersion(jp.nextTextValue());
- } else if ("DataServices".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (edmx instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx) edmx).
- setDataServices(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx) edmx).
- setDataServices(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices.class));
- }
- } else if ("Reference".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx) edmx).getReferences().
- add(jp.getCodec().readValue(jp, Reference.class));
- }
- }
- }
-
- return edmx;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityContainerDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityContainerDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityContainerDeserializer.java
deleted file mode 100644
index 7f53d4f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityContainerDeserializer.java
+++ /dev/null
@@ -1,99 +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.AssociationSet;
-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.ActionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Singleton;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-@SuppressWarnings("rawtypes")
-public class EntityContainerDeserializer extends AbstractEdmDeserializer<AbstractEntityContainer> {
-
- @Override
- protected AbstractEntityContainer doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEntityContainer entityContainer = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- entityContainer.setName(jp.nextTextValue());
- } else if ("Extends".equals(jp.getCurrentName())) {
- entityContainer.setExtends(jp.nextTextValue());
- } else if ("LazyLoadingEnabled".equals(jp.getCurrentName())) {
- entityContainer.setLazyLoadingEnabled(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsDefaultEntityContainer".equals(jp.getCurrentName())) {
- entityContainer.setDefaultEntityContainer(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("EntitySet".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (entityContainer instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) entityContainer).
- getEntitySets().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.EntitySet.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- getEntitySets().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet.class));
- }
- } else if ("AssociationSet".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) entityContainer).
- getAssociationSets().add(jp.getCodec().readValue(jp, AssociationSet.class));
- } else if ("Singleton".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- getSingletons().add(jp.getCodec().readValue(jp, Singleton.class));
- } else if ("ActionImport".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- getActionImports().add(jp.getCodec().readValue(jp, ActionImport.class));
- } else if ("FunctionImport".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (entityContainer instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) entityContainer).
- getFunctionImports().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- getFunctionImports().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.FunctionImport.class));
- }
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return entityContainer;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKey.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKey.java
deleted file mode 100644
index 695242b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKey.java
+++ /dev/null
@@ -1,39 +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.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = EntityKeyDeserializer.class)
-public class EntityKey extends AbstractEdm {
-
- private static final long serialVersionUID = 2586047015894794685L;
-
- private List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
-
- public List<PropertyRef> getPropertyRefs() {
- return propertyRefs;
- }
-
- public void setPropertyRefs(final List<PropertyRef> propertyRefs) {
- this.propertyRefs = propertyRefs;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKeyDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKeyDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKeyDeserializer.java
deleted file mode 100644
index 7131333..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKeyDeserializer.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;
-
-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;
-
-public class EntityKeyDeserializer extends AbstractEdmDeserializer<EntityKey> {
-
- @Override
- protected EntityKey doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final EntityKey entityKey = new EntityKey();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
-
- if (token == JsonToken.FIELD_NAME && "PropertyRef".equals(jp.getCurrentName())) {
- jp.nextToken();
- entityKey.getPropertyRefs().add(jp.getCodec().readValue(jp, PropertyRef.class));
- }
- }
-
- return entityKey;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntitySetDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntitySetDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntitySetDeserializer.java
deleted file mode 100644
index 8cd1b16..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntitySetDeserializer.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;
-
-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.Annotation;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationPropertyBinding;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class EntitySetDeserializer extends AbstractEdmDeserializer<AbstractEntitySet> {
-
- @Override
- protected AbstractEntitySet doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEntitySet entitySet = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.EntitySet()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- entitySet.setName(jp.nextTextValue());
- } else if ("EntityType".equals(jp.getCurrentName())) {
- entitySet.setEntityType(jp.nextTextValue());
- } else if ("IncludeInServiceDocument".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet) entitySet).
- setIncludeInServiceDocument(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("NavigationPropertyBinding".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet) entitySet).
- getNavigationPropertyBindings().add(
- jp.getCodec().readValue(jp, NavigationPropertyBinding.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet) entitySet).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return entitySet;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityTypeDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityTypeDeserializer.java
deleted file mode 100644
index febf727..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityTypeDeserializer.java
+++ /dev/null
@@ -1,88 +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.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.Annotation;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class EntityTypeDeserializer extends AbstractEdmDeserializer<AbstractEntityType> {
-
- @Override
- protected AbstractEntityType doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEntityType entityType = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- entityType.setName(jp.nextTextValue());
- } else if ("Abstract".equals(jp.getCurrentName())) {
- entityType.setAbstractEntityType(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("BaseType".equals(jp.getCurrentName())) {
- entityType.setBaseType(jp.nextTextValue());
- } else if ("OpenType".equals(jp.getCurrentName())) {
- entityType.setOpenType(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("HasStream".equals(jp.getCurrentName())) {
- entityType.setHasStream(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Key".equals(jp.getCurrentName())) {
- jp.nextToken();
- entityType.setKey(jp.getCodec().readValue(jp, EntityKey.class));
- } else if ("Property".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (entityType instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType) entityType).
- getProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Property.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType) entityType).
- getProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Property.class));
- }
- } else if ("NavigationProperty".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (entityType instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType) entityType).
- getNavigationProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.NavigationProperty.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType) entityType).
- getNavigationProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationProperty.class));
- }
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType) entityType).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return entityType;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EnumTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EnumTypeDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EnumTypeDeserializer.java
deleted file mode 100644
index 531ccea..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EnumTypeDeserializer.java
+++ /dev/null
@@ -1,70 +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.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.Annotation;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class EnumTypeDeserializer extends AbstractEdmDeserializer<AbstractEnumType> {
-
- @Override
- protected AbstractEnumType doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEnumType enumType = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- enumType.setName(jp.nextTextValue());
- } else if ("UnderlyingType".equals(jp.getCurrentName())) {
- enumType.setUnderlyingType(jp.nextTextValue());
- } else if ("IsFlags".equals(jp.getCurrentName())) {
- enumType.setFlags(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Member".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (enumType instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType) enumType).
- getMembers().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Member.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType) enumType).
- getMembers().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Member.class));
- }
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType) enumType).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return enumType;
- }
-}