You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/23 12:58:31 UTC
[36/59] [abbrv] [partial] Removing /ODataJClient: merge complete
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionImport.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionImport.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionImport.java
deleted file mode 100644
index 3584a58..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionImport.java
+++ /dev/null
@@ -1,87 +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.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-
-public class FunctionImport extends AbstractFunctionImport implements AnnotatedEdm {
-
- private static final long serialVersionUID = 3023813358471000019L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Function", required = true)
- private String function;
-
- @JsonProperty(value = "EntitySet")
- private String entitySet;
-
- @JsonProperty(value = "IncludeInServiceDocument")
- private boolean includeInServiceDocument = false;
-
- @JsonProperty(value = "Annotation")
- private Annotation annotation;
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getFunction() {
- return function;
- }
-
- public void setFunction(final String function) {
- this.function = function;
- }
-
- @Override
- public String getEntitySet() {
- return entitySet;
- }
-
- public void setEntitySet(final String entitySet) {
- this.entitySet = entitySet;
- }
-
- public boolean isIncludeInServiceDocument() {
- return includeInServiceDocument;
- }
-
- public void setIncludeInServiceDocument(final boolean includeInServiceDocument) {
- this.includeInServiceDocument = includeInServiceDocument;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Include.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Include.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Include.java
deleted file mode 100644
index c7cfabc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Include.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.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class Include extends AbstractEdm {
-
- private static final long serialVersionUID = -5600031479702563436L;
-
- @JsonProperty(value = "Namespace", required = true)
- private String namespace;
-
- @JsonProperty(value = "Alias")
- 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;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/IncludeAnnotations.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/IncludeAnnotations.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/IncludeAnnotations.java
deleted file mode 100644
index 2ff0fd4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/IncludeAnnotations.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class IncludeAnnotations extends AbstractEdm {
-
- private static final long serialVersionUID = -5600031479702563436L;
-
- @JsonProperty(value = "TermNamespace", required = true)
- private String termNamespace;
-
- @JsonProperty(value = "Qualifier")
- private String qualifier;
-
- @JsonProperty(value = "TargetNamespace")
- private String targeyNamespace;
-
- public String getTermNamespace() {
- return termNamespace;
- }
-
- public void setTermNamespace(final String termNamespace) {
- this.termNamespace = termNamespace;
- }
-
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-
- public String getTargeyNamespace() {
- return targeyNamespace;
- }
-
- public void setTargeyNamespace(final String targeyNamespace) {
- this.targeyNamespace = targeyNamespace;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Member.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Member.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Member.java
deleted file mode 100644
index bddb1e1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Member.java
+++ /dev/null
@@ -1,41 +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.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractMember;
-
-public class Member extends AbstractMember implements AnnotatedEdm {
-
- private static final long serialVersionUID = -344920557183058824L;
-
- @JsonProperty("Annotation")
- private Annotation annotation;
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationProperty.java
deleted file mode 100644
index 431a34d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationProperty.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.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = NavigationPropertyDeserializer.class)
-public class NavigationProperty extends AbstractNavigationProperty implements AnnotatedEdm {
-
- private static final long serialVersionUID = -2889417442815563307L;
-
- private String type;
-
- private boolean nullable = true;
-
- private String partner;
-
- private boolean containsTarget = false;
-
- private final List<ReferentialConstraint> referentialConstraints = new ArrayList<ReferentialConstraint>();
-
- private OnDelete onDelete;
-
- private Annotation annotation;
-
- 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 getPartner() {
- return partner;
- }
-
- public void setPartner(final String partner) {
- this.partner = partner;
- }
-
- public boolean isContainsTarget() {
- return containsTarget;
- }
-
- public void setContainsTarget(final boolean containsTarget) {
- this.containsTarget = containsTarget;
- }
-
- public List<ReferentialConstraint> getReferentialConstraints() {
- return referentialConstraints;
- }
-
- public OnDelete getOnDelete() {
- return onDelete;
- }
-
- public void setOnDelete(final OnDelete onDelete) {
- this.onDelete = onDelete;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyBinding.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyBinding.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyBinding.java
deleted file mode 100644
index 3d23996..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyBinding.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.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class NavigationPropertyBinding extends AbstractEdm {
-
- private static final long serialVersionUID = -6026065326479176817L;
-
- @JsonProperty(value = "Path", required = true)
- private String path;
-
- @JsonProperty(value = "Target", required = true)
- private String target;
-
- public String getPath() {
- return path;
- }
-
- public void setPath(final String path) {
- this.path = path;
- }
-
- public String getTarget() {
- return target;
- }
-
- public void setTarget(final String target) {
- this.target = target;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyDeserializer.java
deleted file mode 100644
index 2486507..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyDeserializer.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.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 com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class NavigationPropertyDeserializer extends AbstractEdmDeserializer<NavigationProperty> {
-
- @Override
- protected NavigationProperty doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final NavigationProperty property = new NavigationProperty();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- property.setName(jp.nextTextValue());
- } else if ("Type".equals(jp.getCurrentName())) {
- property.setType(jp.nextTextValue());
- } else if ("Nullable".equals(jp.getCurrentName())) {
- property.setNullable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Partner".equals(jp.getCurrentName())) {
- property.setPartner(jp.nextTextValue());
- } else if ("ContainsTarget".equals(jp.getCurrentName())) {
- property.setContainsTarget(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("ReferentialConstraint".equals(jp.getCurrentName())) {
- jp.nextToken();
- property.getReferentialConstraints().add(jp.getCodec().readValue(jp, ReferentialConstraint.class));
- } else if ("OnDelete".equals(jp.getCurrentName())) {
- jp.nextToken();
- property.setOnDelete(jp.getCodec().readValue(jp, OnDelete.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- property.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return property;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDelete.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDelete.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDelete.java
deleted file mode 100644
index 8db8974..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDelete.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.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class OnDelete extends AbstractEdm {
-
- private static final long serialVersionUID = -5321523424474336347L;
-
- @JsonProperty(value = "Action", required = true)
- private OnDeleteAction action = OnDeleteAction.None;
-
- public OnDeleteAction getAction() {
- return action;
- }
-
- public void setAction(final OnDeleteAction action) {
- this.action = action;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDeleteAction.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDeleteAction.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDeleteAction.java
deleted file mode 100644
index 3a8a7df..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDeleteAction.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.v4;
-
-public enum OnDeleteAction {
-
- Cascade,
- None,
- SetNull,
- SetDefault;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Parameter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Parameter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Parameter.java
deleted file mode 100644
index ae65093..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Parameter.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.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractParameter;
-
-public class Parameter extends AbstractParameter {
-
- private static final long serialVersionUID = -1067642515116697747L;
-
- @JsonProperty(value = "SRID")
- private String srid;
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Property.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Property.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Property.java
deleted file mode 100644
index 47bc9d7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Property.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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractProperty;
-
-public class Property extends AbstractProperty implements AnnotatedEdm {
-
- private static final long serialVersionUID = -5541908235094985412L;
-
- @JsonProperty("Annotation")
- private Annotation annotation;
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Reference.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Reference.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Reference.java
deleted file mode 100644
index b71d1ac..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Reference.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = ReferenceDeserializer.class)
-public class Reference extends AbstractEdm {
-
- private static final long serialVersionUID = -5600031479702563436L;
-
- private URI uri;
-
- private final List<Include> includes = new ArrayList<Include>();
-
- private final List<IncludeAnnotations> includeAnnotations = new ArrayList<IncludeAnnotations>();
-
- private final List<Annotation> annotations = new ArrayList<Annotation>();
-
- public URI getUri() {
- return uri;
- }
-
- public void setUri(final URI uri) {
- this.uri = uri;
- }
-
- public List<Include> getIncludes() {
- return includes;
- }
-
- public List<IncludeAnnotations> getIncludeAnnotations() {
- return includeAnnotations;
- }
-
- public List<Annotation> getAnnotations() {
- return annotations;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferenceDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferenceDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferenceDeserializer.java
deleted file mode 100644
index a214c58..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferenceDeserializer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.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 com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import java.net.URI;
-
-public class ReferenceDeserializer extends AbstractEdmDeserializer<Reference> {
-
- @Override
- protected Reference doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Reference reference = new Reference();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Uri".equals(jp.getCurrentName())) {
- reference.setUri(URI.create(jp.nextTextValue()));
- } else if ("Include".equals(jp.getCurrentName())) {
- jp.nextToken();
- reference.getIncludes().add(jp.getCodec().readValue(jp, Include.class));
- } else if ("IncludeAnnotations".equals(jp.getCurrentName())) {
- jp.nextToken();
- reference.getIncludeAnnotations().add(jp.getCodec().readValue(jp, IncludeAnnotations.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- reference.getAnnotations().add(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return reference;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferentialConstraint.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferentialConstraint.java
deleted file mode 100644
index 83399b1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferentialConstraint.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class ReferentialConstraint extends AbstractAnnotatedEdm {
-
- private static final long serialVersionUID = -9182114558289778632L;
-
- @JsonProperty(value = "Property", required = true)
- private String property;
-
- @JsonProperty(value = "ReferencedProperty", required = true)
- private String referencedProperty;
-
- public String getProperty() {
- return property;
- }
-
- public void setProperty(final String property) {
- this.property = property;
- }
-
- public String getReferencedProperty() {
- return referencedProperty;
- }
-
- public void setReferencedProperty(final String referencedProperty) {
- this.referencedProperty = referencedProperty;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReturnType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReturnType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReturnType.java
deleted file mode 100644
index 867dd3f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReturnType.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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.math.BigInteger;
-
-public class ReturnType extends AbstractEdm {
-
- private static final long serialVersionUID = -5888231162358116515L;
-
- @JsonProperty(value = "Type")
- private String type;
-
- @JsonProperty(value = "Nullable")
- private boolean nullable = true;
-
- @JsonProperty(value = "MaxLength")
- private String maxLength;
-
- @JsonProperty(value = "Precision")
- private BigInteger precision;
-
- @JsonProperty(value = "Scale")
- private BigInteger scale;
-
- @JsonProperty(value = "SRID")
- private String srid;
-
- 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;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Schema.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Schema.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Schema.java
deleted file mode 100644
index f0d9ac6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Schema.java
+++ /dev/null
@@ -1,171 +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.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class Schema extends AbstractSchema<EntityContainer, EntityType, ComplexType, FunctionImport>
- implements AnnotatedEdm {
-
- private static final long serialVersionUID = 4453992249818796144L;
-
- private final List<Action> actions = new ArrayList<Action>();
-
- private final List<Annotations> annotationsList = new ArrayList<Annotations>();
-
- private final List<Annotation> annotations = new ArrayList<Annotation>();
-
- private final List<ComplexType> complexTypes = new ArrayList<ComplexType>();
-
- private EntityContainer entityContainer;
-
- private final List<EnumType> enumTypes = new ArrayList<EnumType>();
-
- private final List<EntityType> entityTypes = new ArrayList<EntityType>();
-
- private final List<Function> functions = new ArrayList<Function>();
-
- private final List<Term> terms = new ArrayList<Term>();
-
- private final List<TypeDefinition> typeDefinitions = new ArrayList<TypeDefinition>();
-
- private Annotation annotation;
-
- public List<Action> getActions() {
- return actions;
- }
-
- public List<Action> getActions(final String name) {
- final List<Action> result = new ArrayList<Action>();
- for (Action action : getActions()) {
- if (name.equals(action.getName())) {
- result.add(action);
- }
- }
- return result;
- }
-
- @Override
- public List<Annotations> getAnnotationsList() {
- return annotationsList;
- }
-
- @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<Annotation> getAnnotations() {
- return annotations;
- }
-
- @Override
- public List<EnumType> getEnumTypes() {
- return enumTypes;
- }
-
- @Override
- public EnumType getEnumType(final String name) {
- EnumType result = null;
- for (EnumType type : getEnumTypes()) {
- if (name.equals(type.getName())) {
- result = type;
- }
- }
- return result;
- }
-
- public List<Function> getFunctions() {
- return functions;
- }
-
- public List<Function> getFunctions(final String name) {
- final List<Function> result = new ArrayList<Function>();
- for (Function function : getFunctions()) {
- if (name.equals(function.getName())) {
- result.add(function);
- }
- }
- return result;
- }
-
- public List<Term> getTerms() {
- return terms;
- }
-
- public List<TypeDefinition> getTypeDefinitions() {
- return typeDefinitions;
- }
-
- public EntityContainer getEntityContainer() {
- return entityContainer;
- }
-
- public void setEntityContainer(final EntityContainer entityContainer) {
- this.entityContainer = entityContainer;
- }
-
- @Override
- public List<EntityContainer> getEntityContainers() {
- return entityContainer == null
- ? Collections.<EntityContainer>emptyList() : Collections.singletonList(entityContainer);
- }
-
- @Override
- public EntityContainer getDefaultEntityContainer() {
- return entityContainer;
- }
-
- @Override
- public EntityContainer getEntityContainer(final String name) {
- if (entityContainer != null && name.equals(entityContainer.getName())) {
- return entityContainer;
- }
- throw new IllegalArgumentException("No EntityContainer found with name " + name);
- }
-
- @Override
- public List<EntityType> getEntityTypes() {
- return entityTypes;
- }
-
- @Override
- public List<ComplexType> getComplexTypes() {
- return complexTypes;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Singleton.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Singleton.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Singleton.java
deleted file mode 100644
index e7536c1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Singleton.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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = SingletonDeserializer.class)
-public class Singleton extends AbstractAnnotatedEdm {
-
- private static final long serialVersionUID = 941802518279658559L;
-
- private String name;
-
- private String type;
-
- private final List<NavigationPropertyBinding> navigationPropertyBindings =
- new ArrayList<NavigationPropertyBinding>();
-
- 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 List<NavigationPropertyBinding> getNavigationPropertyBindings() {
- return navigationPropertyBindings;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/SingletonDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/SingletonDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/SingletonDeserializer.java
deleted file mode 100644
index 2a726cc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/SingletonDeserializer.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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-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 SingletonDeserializer extends AbstractEdmDeserializer<Singleton> {
-
- @Override
- protected Singleton doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Singleton singleton = new Singleton();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- singleton.setName(jp.nextTextValue());
- } else if ("Type".equals(jp.getCurrentName())) {
- singleton.setType(jp.nextTextValue());
- } else if ("NavigationPropertyBinding".equals(jp.getCurrentName())) {
- jp.nextToken();
- singleton.getNavigationPropertyBindings().add(
- jp.getCodec().readValue(jp, NavigationPropertyBinding.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- singleton.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return singleton;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Term.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Term.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Term.java
deleted file mode 100644
index 5b53027..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Term.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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = TermDeserializer.class)
-public class Term extends AbstractAnnotatedEdm {
-
- private static final long serialVersionUID = -5888231162358116515L;
-
- private String name;
-
- private String type;
-
- private String baseTerm;
-
- private String defaultValue;
-
- private boolean nullable = true;
-
- private String maxLength;
-
- private BigInteger precision;
-
- private BigInteger scale;
-
- private String srid;
-
- private final List<CSDLElement> appliesTo = new ArrayList<CSDLElement>();
-
- 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 String getBaseTerm() {
- return baseTerm;
- }
-
- public void setBaseTerm(final String baseTerm) {
- this.baseTerm = baseTerm;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(final String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- 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;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public List<CSDLElement> getAppliesTo() {
- return appliesTo;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TermDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TermDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TermDeserializer.java
deleted file mode 100644
index 7415e17..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TermDeserializer.java
+++ /dev/null
@@ -1,74 +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.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-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 java.math.BigInteger;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-
-public class TermDeserializer extends AbstractEdmDeserializer<Term> {
-
- @Override
- protected Term doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Term term = new Term();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- term.setName(jp.nextTextValue());
- } else if ("Type".equals(jp.getCurrentName())) {
- term.setType(jp.nextTextValue());
- } else if ("BaseTerm".equals(jp.getCurrentName())) {
- term.setBaseTerm(jp.nextTextValue());
- } else if ("DefaultValue".equals(jp.getCurrentName())) {
- term.setDefaultValue(jp.nextTextValue());
- } else if ("Nullable".equals(jp.getCurrentName())) {
- term.setNullable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("MaxLength".equals(jp.getCurrentName())) {
- term.setMaxLength(jp.nextTextValue());
- } else if ("Precision".equals(jp.getCurrentName())) {
- term.setPrecision(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("Scale".equals(jp.getCurrentName())) {
- term.setScale(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("SRID".equals(jp.getCurrentName())) {
- term.setSrid(jp.nextTextValue());
- } else if ("AppliesTo".equals(jp.getCurrentName())) {
- for (String split : StringUtils.split(jp.nextTextValue())) {
- term.getAppliesTo().add(CSDLElement.valueOf(split));
- }
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- term.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return term;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinition.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinition.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinition.java
deleted file mode 100644
index 65c2bd7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinition.java
+++ /dev/null
@@ -1,106 +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.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TypeDefinition extends AbstractEdm {
-
- private static final long serialVersionUID = -5888231162358116515L;
-
- private String name;
-
- private String underlyingType;
-
- private String maxLength;
-
- private BigInteger precision;
-
- private BigInteger scale;
-
- private boolean unicode = true;
-
- private String srid;
-
- private final List<Annotation> annotations = new ArrayList<Annotation>();
-
- 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 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;
- }
-
- public boolean isUnicode() {
- return unicode;
- }
-
- public void setUnicode(final boolean unicode) {
- this.unicode = unicode;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public List<Annotation> getAnnotations() {
- return annotations;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinitionDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinitionDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinitionDeserializer.java
deleted file mode 100644
index 00d2a1a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinitionDeserializer.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.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 com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import java.math.BigInteger;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class TypeDefinitionDeserializer extends AbstractEdmDeserializer<TypeDefinition> {
-
- @Override
- protected TypeDefinition doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final TypeDefinition typeDefinition = new TypeDefinition();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- typeDefinition.setName(jp.nextTextValue());
- } else if ("UnderlyingType".equals(jp.getCurrentName())) {
- typeDefinition.setUnderlyingType(jp.nextTextValue());
- } else if ("MaxLength".equals(jp.getCurrentName())) {
- typeDefinition.setMaxLength(jp.nextTextValue());
- } else if ("Unicode".equals(jp.getCurrentName())) {
- typeDefinition.setUnicode(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Precision".equals(jp.getCurrentName())) {
- typeDefinition.setPrecision(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("Scale".equals(jp.getCurrentName())) {
- typeDefinition.setScale(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("SRID".equals(jp.getCurrentName())) {
- typeDefinition.setSrid(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- typeDefinition.getAnnotations().add(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return typeDefinition;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AbstractElOrAttrConstruct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AbstractElOrAttrConstruct.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AbstractElOrAttrConstruct.java
deleted file mode 100644
index 56efd17..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AbstractElOrAttrConstruct.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.v4.annotation;
-
-/**
- * Groups dynamic expressions that may be provided using element notation or attribute notation.
- */
-abstract class AbstractElOrAttrConstruct extends DynExprConstruct {
-
- private static final long serialVersionUID = 5503275111425750339L;
-
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public void setValue(final String 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/v4/annotation/AnnotatedDynExprConstruct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotatedDynExprConstruct.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotatedDynExprConstruct.java
deleted file mode 100644
index c3d53e8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotatedDynExprConstruct.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.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.AnnotatedEdm;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-
-public abstract class AnnotatedDynExprConstruct extends DynExprConstruct implements AnnotatedEdm {
-
- private static final long serialVersionUID = -8117155475397749038L;
-
- private Annotation annotation;
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotationPath.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotationPath.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotationPath.java
deleted file mode 100644
index b93e107..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotationPath.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class AnnotationPath extends AbstractElOrAttrConstruct {
-
- private static final long serialVersionUID = 6198019768659098819L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Apply.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Apply.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Apply.java
deleted file mode 100644
index 72df22b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Apply.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = ApplyDeserializer.class)
-public class Apply extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = 6198019768659098819L;
-
- public static final String CANONICAL_FUNCTION_CONCAT = "odata.concat";
-
- public static final String CANONICAL_FUNCTION_FILLURITEMPLATE = "odata.fillUriTemplate";
-
- public static final String CANONICAL_FUNCTION_URIENCODE = "odata.uriEncode";
-
- private String function;
-
- private final List<ExprConstruct> parameters = new ArrayList<ExprConstruct>();
-
- public String getFunction() {
- return function;
- }
-
- public void setFunction(final String function) {
- this.function = function;
- }
-
- public List<ExprConstruct> getParameters() {
- return parameters;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ApplyDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ApplyDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ApplyDeserializer.java
deleted file mode 100644
index 1b00101..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ApplyDeserializer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class ApplyDeserializer extends AbstractEdmDeserializer<Apply> {
-
- @Override
- protected Apply doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Apply apply = new Apply();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Function".equals(jp.getCurrentName())) {
- apply.setFunction(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- apply.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- } else if (isAnnotationConstExprConstruct(jp)) {
- apply.getParameters().add(parseAnnotationConstExprConstruct(jp));
- } else {
- apply.getParameters().add(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return apply;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Cast.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Cast.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Cast.java
deleted file mode 100644
index 93eaa61..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Cast.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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.math.BigInteger;
-
-@JsonDeserialize(using = CastDeserializer.class)
-public class Cast extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = -7836626668653004926L;
-
- private String type;
-
- private String maxLength;
-
- private BigInteger precision;
-
- private BigInteger scale;
-
- private String srid;
-
- private DynExprConstruct value;
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- 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;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public DynExprConstruct getValue() {
- return value;
- }
-
- public void setValue(final DynExprConstruct 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/v4/annotation/CastDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CastDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CastDeserializer.java
deleted file mode 100644
index 36bb14e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CastDeserializer.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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import java.math.BigInteger;
-
-public class CastDeserializer extends AbstractEdmDeserializer<Cast> {
-
- @Override
- protected Cast doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Cast cast = new Cast();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Type".equals(jp.getCurrentName())) {
- cast.setType(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- cast.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- } else if ("MaxLength".equals(jp.getCurrentName())) {
- cast.setMaxLength(jp.nextTextValue());
- } else if ("Precision".equals(jp.getCurrentName())) {
- cast.setPrecision(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("Scale".equals(jp.getCurrentName())) {
- cast.setScale(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("SRID".equals(jp.getCurrentName())) {
- cast.setSrid(jp.nextTextValue());
- } else {
- cast.setValue(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return cast;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Collection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Collection.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Collection.java
deleted file mode 100644
index 25f410a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Collection.java
+++ /dev/null
@@ -1,36 +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.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = CollectionDeserializer.class)
-public class Collection extends DynExprConstruct {
-
- private static final long serialVersionUID = -4975881520695477686L;
-
- private final List<ExprConstruct> items = new ArrayList<ExprConstruct>();
-
- public List<ExprConstruct> getItems() {
- return items;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CollectionDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CollectionDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CollectionDeserializer.java
deleted file mode 100644
index ba0b35b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CollectionDeserializer.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.v4.annotation;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class CollectionDeserializer extends AbstractEdmDeserializer<Collection> {
-
- @Override
- protected Collection doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Collection collection = new Collection();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if (isAnnotationConstExprConstruct(jp)) {
- collection.getItems().add(parseAnnotationConstExprConstruct(jp));
- } else {
- collection.getItems().add(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return collection;
- }
-
-}