http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java new file mode 100644 index 0000000..420f226 --- /dev/null +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.client.core.edm.xml; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.DeserializationContext; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.olingo.commons.api.edm.geo.SRID; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import java.io.IOException; + +@JsonDeserialize(using = ClientCsdlTypeDefinition.TypeDefinitionDeserializer.class) +class ClientCsdlTypeDefinition extends CsdlTypeDefinition { + + private static final long serialVersionUID = -902407149079419602L; + + static class TypeDefinitionDeserializer extends AbstractClientCsdlEdmDeserializer<ClientCsdlTypeDefinition> { + @Override + protected ClientCsdlTypeDefinition doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + throws IOException { + final ClientCsdlTypeDefinition typeDefinition = new ClientCsdlTypeDefinition(); + + 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.nextIntValue(0)); + } else if ("Unicode".equals(jp.getCurrentName())) { + typeDefinition.setUnicode(BooleanUtils.toBoolean(jp.nextTextValue())); + } else if ("Precision".equals(jp.getCurrentName())) { + typeDefinition.setPrecision(jp.nextIntValue(0)); + } else if ("Scale".equals(jp.getCurrentName())) { + final String scale = jp.nextTextValue(); + typeDefinition.setScale(scale.equalsIgnoreCase("variable") ? 0 : Integer.valueOf(scale)); + } else if ("SRID".equals(jp.getCurrentName())) { + final String srid = jp.nextTextValue(); + if (srid != null) { + typeDefinition.setSrid(SRID.valueOf(srid)); + } + } else if ("Annotation".equals(jp.getCurrentName())) { + jp.nextToken(); + typeDefinition.getAnnotations().add(jp.readValueAs(ClientCsdlAnnotation.class)); + } + } + } + + return typeDefinition; + } + } +}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlUrlRef.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlUrlRef.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlUrlRef.java new file mode 100644 index 0000000..280e1af --- /dev/null +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlUrlRef.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.client.core.edm.xml; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.DeserializationContext; +import org.apache.olingo.commons.api.edm.provider.annotation.AnnotationExpression; +import org.apache.olingo.commons.api.edm.provider.annotation.UrlRef; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import java.io.IOException; + +@JsonDeserialize(using = ClientCsdlUrlRef.UrlRefDeserializer.class) +class ClientCsdlUrlRef extends AbstractClientCsdlDynamicAnnotationExpression implements UrlRef { + + private static final long serialVersionUID = -7693224811739000440L; + + private AnnotationExpression value; + + @Override + public AnnotationExpression getValue() { + return value; + } + + public void setValue(final AnnotationExpression value) { + this.value = value; + } + + static class UrlRefDeserializer extends AbstractClientCsdlEdmDeserializer<ClientCsdlUrlRef> { + @Override + protected ClientCsdlUrlRef doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + throws IOException { + final ClientCsdlUrlRef urlref = new ClientCsdlUrlRef(); + for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { + final JsonToken token = jp.getCurrentToken(); + if (token == JsonToken.FIELD_NAME) { + if (isAnnotationConstExprConstruct(jp)) { + urlref.setValue(parseAnnotationConstExprConstruct(jp)); + } else { + urlref.setValue(jp.readValueAs(AbstractClientCsdlDynamicAnnotationExpression.class)); + } + } + } + return urlref; + } + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.java deleted file mode 100644 index d4a4406..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.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 org.apache.olingo.client.core.edm.xml; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.client.api.edm.xml.DataServices; -import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; -import org.apache.olingo.commons.api.edm.provider.CsdlSchema; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = ClientDataServices.DataServicesDeserializer.class) -class ClientDataServices extends CsdlAbstractEdmItem implements DataServices { - - private static final long serialVersionUID = 4200317286476885204L; - - private final List<CsdlSchema> schemas = new ArrayList<CsdlSchema>(); - - private String dataServiceVersion; - - private String maxDataServiceVersion; - - @Override - public String getDataServiceVersion() { - return dataServiceVersion; - } - - public void setDataServiceVersion(final String version) { - this.dataServiceVersion = version; - } - - @Override - public String getMaxDataServiceVersion() { - return maxDataServiceVersion; - } - - public void setMaxDataServiceVersion(final String version) { - this.maxDataServiceVersion = version; - } - - @Override - public List<CsdlSchema> getSchemas() { - return schemas; - } - - static class DataServicesDeserializer extends AbstractClientEdmDeserializer<ClientDataServices> { - - @Override - protected ClientDataServices doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientDataServices dataServices = new ClientDataServices(); - - 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(); - dataServices.getSchemas().add(jp.readValueAs(ClientSchema.class)); - } - } - } - - return dataServices; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java deleted file mode 100644 index 736030b..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.client.api.edm.xml.DataServices; -import org.apache.olingo.client.api.edm.xml.Edmx; -import org.apache.olingo.client.api.edm.xml.Reference; -import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = ClientEdmx.EdmxDeserializer.class) -public class ClientEdmx extends CsdlAbstractEdmItem implements Edmx { - - private static final long serialVersionUID = -6293476719276092572L; - - private final List<Reference> references = new ArrayList<Reference>(); - - private String version; - - private DataServices dataServices; - - @Override - public String getVersion() { - return version; - } - - public void setVersion(final String version) { - this.version = version; - } - - @Override - public DataServices getDataServices() { - return dataServices; - } - - public void setDataServices(final DataServices dataServices) { - this.dataServices = dataServices; - } - - @Override - public List<Reference> getReferences() { - return references; - } - - static class EdmxDeserializer extends AbstractClientEdmDeserializer<ClientEdmx> { - - @Override - protected ClientEdmx doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientEdmx edmx = new ClientEdmx(); - - 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(); - edmx.setDataServices(jp.readValueAs(ClientDataServices.class)); - } else if ("Reference".equals(jp.getCurrentName())) { - jp.nextToken(); - edmx.getReferences().add(jp.readValueAs(ClientReference.class)); - } - } - } - - return edmx; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java deleted file mode 100644 index 2109cee..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientEntityContainer.EntityContainerDeserializer.class) -class ClientEntityContainer extends CsdlEntityContainer { - - private static final long serialVersionUID = 5631432527646955795L; - - static class EntityContainerDeserializer extends AbstractClientEdmDeserializer<ClientEntityContainer> { - - @Override - protected ClientEntityContainer doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientEntityContainer entityContainer = new ClientEntityContainer(); - - 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.setExtendsContainer(jp.nextTextValue()); - } else if ("EntitySet".equals(jp.getCurrentName())) { - jp.nextToken(); - entityContainer.getEntitySets().add(jp.readValueAs(ClientEntitySet.class)); - } else if ("Singleton".equals(jp.getCurrentName())) { - jp.nextToken(); - entityContainer.getSingletons().add(jp.readValueAs(ClientSingleton.class)); - } else if ("ActionImport".equals(jp.getCurrentName())) { - jp.nextToken(); - entityContainer.getActionImports().add(jp.readValueAs(ClientActionImport.class)); - } else if ("FunctionImport".equals(jp.getCurrentName())) { - jp.nextToken(); - entityContainer.getFunctionImports().add(jp.readValueAs(ClientFunctionImport.class)); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - entityContainer.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - - return entityContainer; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.java deleted file mode 100644 index 6b9e230..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.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 org.apache.olingo.client.core.edm.xml; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; -import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = ClientEntityKey.EntityKeyDeserializer.class) -class ClientEntityKey extends CsdlAbstractEdmItem { - - private static final long serialVersionUID = 520227585458843347L; - - private final List<CsdlPropertyRef> propertyRefs = new ArrayList<CsdlPropertyRef>(); - - public List<CsdlPropertyRef> getPropertyRefs() { - return propertyRefs; - } - - static class EntityKeyDeserializer extends AbstractClientEdmDeserializer<ClientEntityKey> { - @Override - protected ClientEntityKey doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientEntityKey entityKey = new ClientEntityKey(); - - 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.readValueAs(ClientPropertyRef.class)); - } - } - - return entityKey; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java deleted file mode 100644 index ca358cb..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientEntitySet.EntitySetDeserializer.class) -class ClientEntitySet extends CsdlEntitySet { - - private static final long serialVersionUID = -5553885465204370676L; - - static class EntitySetDeserializer extends AbstractClientEdmDeserializer<CsdlEntitySet> { - @Override - protected CsdlEntitySet doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientEntitySet entitySet = new ClientEntitySet(); - - 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.setType(jp.nextTextValue()); - } else if ("IncludeInServiceDocument".equals(jp.getCurrentName())) { - entitySet.setIncludeInServiceDocument(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("NavigationPropertyBinding".equals(jp.getCurrentName())) { - jp.nextToken(); - entitySet.getNavigationPropertyBindings().add(jp.readValueAs(ClientNavigationPropertyBinding.class)); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - entitySet.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - - return entitySet; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java deleted file mode 100644 index ceef35e..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientEntityType.EntityTypeDeserializer.class) -class ClientEntityType extends CsdlEntityType { - - private static final long serialVersionUID = -3986417775876689669L; - - static class EntityTypeDeserializer extends AbstractClientEdmDeserializer<CsdlEntityType> { - @Override - protected CsdlEntityType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientEntityType entityType = new ClientEntityType(); - - 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.setAbstract(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(); - ClientEntityKey keyImpl = jp.readValueAs(ClientEntityKey.class); - entityType.setKey(keyImpl.getPropertyRefs()); - } else if ("Property".equals(jp.getCurrentName())) { - jp.nextToken(); - entityType.getProperties().add(jp.readValueAs(ClientProperty.class)); - } else if ("NavigationProperty".equals(jp.getCurrentName())) { - jp.nextToken(); - entityType.getNavigationProperties().add(jp.readValueAs(ClientNavigationProperty.class)); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - entityType.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - - return entityType; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java deleted file mode 100644 index b72e2df..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; - -import java.io.IOException; - -@JsonDeserialize(using = ClientEnumMember.EnumMemberDeserializer.class) -class ClientEnumMember extends CsdlEnumMember { - - private static final long serialVersionUID = -6138606817225829791L; - - static class EnumMemberDeserializer extends AbstractClientEdmDeserializer<CsdlEnumMember> { - @Override - protected CsdlEnumMember doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final CsdlEnumMember member = new CsdlEnumMember(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Name".equals(jp.getCurrentName())) { - member.setName(jp.nextTextValue()); - } else if ("Value".equals(jp.getCurrentName())) { - member.setValue(jp.nextTextValue()); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - member.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - return member; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java deleted file mode 100644 index e64f1c8..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientEnumType.EnumTypeDeserializer.class) -class ClientEnumType extends CsdlEnumType { - - private static final long serialVersionUID = 9191189755592743333L; - - static class EnumTypeDeserializer extends AbstractClientEdmDeserializer<ClientEnumType> { - @Override - protected ClientEnumType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientEnumType enumType = new ClientEnumType(); - - 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(); - enumType.getMembers().add(jp.readValueAs(ClientEnumMember.class)); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - enumType.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - - return enumType; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.java deleted file mode 100644 index c07b37e..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.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 org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.CsdlFunction; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientFunction.FunctionDeserializer.class) -class ClientFunction extends CsdlFunction { - - private static final long serialVersionUID = -5494898295282843362L; - - static class FunctionDeserializer extends AbstractClientEdmDeserializer<ClientFunction> { - @Override - protected ClientFunction doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientFunction functionImpl = new ClientFunction(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Name".equals(jp.getCurrentName())) { - functionImpl.setName(jp.nextTextValue()); - } else if ("IsBound".equals(jp.getCurrentName())) { - functionImpl.setBound(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("IsComposable".equals(jp.getCurrentName())) { - functionImpl.setComposable(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("EntitySetPath".equals(jp.getCurrentName())) { - functionImpl.setEntitySetPath(jp.nextTextValue()); - } else if ("Parameter".equals(jp.getCurrentName())) { - jp.nextToken(); - functionImpl.getParameters().add(jp.readValueAs(ClientParameter.class)); - } else if ("ReturnType".equals(jp.getCurrentName())) { - functionImpl.setReturnType(parseReturnType(jp, "Function")); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - functionImpl.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - - return functionImpl; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.java deleted file mode 100644 index 25c3a91..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.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 org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientFunctionImport.FunctionImportDeserializer.class) -class ClientFunctionImport extends CsdlFunctionImport { - - private static final long serialVersionUID = -1686801084142932402L; - - static class FunctionImportDeserializer extends AbstractClientEdmDeserializer<ClientFunctionImport> { - @Override - protected ClientFunctionImport doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientFunctionImport functImpImpl = new ClientFunctionImport(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Name".equals(jp.getCurrentName())) { - functImpImpl.setName(jp.nextTextValue()); - } else if ("Function".equals(jp.getCurrentName())) { - functImpImpl.setFunction(jp.nextTextValue()); - } else if ("EntitySet".equals(jp.getCurrentName())) { - functImpImpl.setEntitySet(jp.nextTextValue()); - } else if ("IncludeInServiceDocument".equals(jp.getCurrentName())) { - functImpImpl.setIncludeInServiceDocument(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - functImpImpl.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - - return functImpImpl; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIf.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIf.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIf.java deleted file mode 100644 index 26d33e6..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIf.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import org.apache.olingo.commons.api.edm.provider.annotation.AnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.If; - -class ClientIf extends AbstractClientAnnotatableDynamicAnnotationExpression implements If { - - private static final long serialVersionUID = -8571383625077590656L; - - private AnnotationExpression guard; - - private AnnotationExpression _then; - - private AnnotationExpression _else; - - @Override - public AnnotationExpression getGuard() { - return guard; - } - - public void setGuard(final AnnotationExpression guard) { - this.guard = guard; - } - - @Override - public AnnotationExpression getThen() { - return _then; - } - - public void setThen(final AnnotationExpression _then) { - this._then = _then; - } - - @Override - public AnnotationExpression getElse() { - return _else; - } - - public void setElse(final AnnotationExpression _else) { - this._else = _else; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java deleted file mode 100644 index fafd3a4..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.client.api.edm.xml.Include; -import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; - -import java.io.IOException; - -@JsonDeserialize(using = ClientInclude.IncludeDeserializer.class) -class ClientInclude extends CsdlAbstractEdmItem implements Include { - - private static final long serialVersionUID = -5450008299655584221L; - - private String namespace; - private String alias; - - @Override - public String getNamespace() { - return namespace; - } - - public void setNamespace(final String namespace) { - this.namespace = namespace; - } - - @Override - public String getAlias() { - return alias; - } - - public void setAlias(final String alias) { - this.alias = alias; - } - - static class IncludeDeserializer extends AbstractClientEdmDeserializer<Include> { - @Override - protected Include doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientInclude include = new ClientInclude(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Namespace".equals(jp.getCurrentName())) { - include.setNamespace(jp.nextTextValue()); - } else if ("Alias".equals(jp.getCurrentName())) { - include.setAlias(jp.nextTextValue()); - } - } - } - return include; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.java deleted file mode 100644 index 3617c65..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.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 org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.client.api.edm.xml.IncludeAnnotations; -import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; - -import java.io.IOException; - -@JsonDeserialize(using = ClientIncludeAnnotations.IncludeAnnotationsDeserializer.class) -class ClientIncludeAnnotations extends CsdlAbstractEdmItem implements IncludeAnnotations { - - private static final long serialVersionUID = -8157841387011422396L; - - private String termNamespace; - private String qualifier; - private String targetNamespace; - - @Override - public String getTermNamespace() { - return termNamespace; - } - - public void setTermNamespace(final String termNamespace) { - this.termNamespace = termNamespace; - } - - @Override - public String getQualifier() { - return qualifier; - } - - public void setQualifier(final String qualifier) { - this.qualifier = qualifier; - } - - @Override - public String getTargetNamespace() { - return targetNamespace; - } - - public void setTargetNamespace(final String targetNamespace) { - this.targetNamespace = targetNamespace; - } - - static class IncludeAnnotationsDeserializer extends AbstractClientEdmDeserializer<IncludeAnnotations> { - @Override - protected IncludeAnnotations doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientIncludeAnnotations member = new ClientIncludeAnnotations(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("TermNamespace".equals(jp.getCurrentName())) { - member.setTermNamespace(jp.nextTextValue()); - } else if ("Qualifier".equals(jp.getCurrentName())) { - member.setQualifier(jp.nextTextValue()); - } else if ("TargetNamespace".equals(jp.getCurrentName())) { - member.setTargetNamespace(jp.nextTextValue()); - } - } - } - return member; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIsOf.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIsOf.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIsOf.java deleted file mode 100644 index bae05ac..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIsOf.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.annotation.DynamicAnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.IsOf; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientIsOf.IsOfDeserializer.class) -class ClientIsOf extends AbstractClientAnnotatableDynamicAnnotationExpression implements IsOf { - - private static final long serialVersionUID = -893355856129761174L; - - private String type; - - private Integer maxLength; - - private Integer precision; - - private Integer scale; - - private SRID srid; - - private DynamicAnnotationExpression value; - - @Override - public String getType() { - return type; - } - - public void setType(final String type) { - this.type = type; - } - - @Override - public Integer getMaxLength() { - return maxLength; - } - - public void setMaxLength(final Integer maxLength) { - this.maxLength = maxLength; - } - - @Override - public Integer getPrecision() { - return precision; - } - - public void setPrecision(final Integer precision) { - this.precision = precision; - } - - @Override - public Integer getScale() { - return scale; - } - - public void setScale(final Integer scale) { - this.scale = scale; - } - - @Override - public SRID getSrid() { - return srid; - } - - public void setSrid(final SRID srid) { - this.srid = srid; - } - - @Override - public DynamicAnnotationExpression getValue() { - return value; - } - - public void setValue(final DynamicAnnotationExpression value) { - this.value = value; - } - - static class IsOfDeserializer extends AbstractClientEdmDeserializer<ClientIsOf> { - @Override - protected ClientIsOf doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - final ClientIsOf isof = new ClientIsOf(); - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Type".equals(jp.getCurrentName())) { - isof.setType(jp.nextTextValue()); - } else if ("Annotation".equals(jp.getCurrentName())) { - isof.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } else if ("MaxLength".equals(jp.getCurrentName())) { - final String maxLenght = jp.nextTextValue(); - isof.setMaxLength(maxLenght.equalsIgnoreCase("max") ? Integer.MAX_VALUE : Integer.valueOf(maxLenght)); - } else if ("Precision".equals(jp.getCurrentName())) { - isof.setPrecision(Integer.valueOf(jp.nextTextValue())); - } else if ("Scale".equals(jp.getCurrentName())) { - final String scale = jp.nextTextValue(); - isof.setScale(scale.equalsIgnoreCase("variable") ? 0 : Integer.valueOf(scale)); - } else if ("SRID".equals(jp.getCurrentName())) { - final String srid = jp.nextTextValue(); - if (srid != null) { - isof.setSrid(SRID.valueOf(srid)); - } - } else { - isof.setValue(jp.readValueAs(AbstractClientDynamicAnnotationExpression.class)); - } - } - } - return isof; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientLabeledElement.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientLabeledElement.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientLabeledElement.java deleted file mode 100644 index 5ae9a89..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientLabeledElement.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.annotation.DynamicAnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.LabeledElement; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientLabeledElement.LabeledElementDeserializer.class) -class ClientLabeledElement - extends AbstractClientAnnotatableDynamicAnnotationExpression implements LabeledElement { - - private static final long serialVersionUID = 4909387630253341824L; - - private String name; - - private DynamicAnnotationExpression value; - - @Override - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - @Override - public DynamicAnnotationExpression getValue() { - return value; - } - - public void setValue(final DynamicAnnotationExpression value) { - this.value = value; - } - - static class LabeledElementDeserializer extends AbstractClientEdmDeserializer<ClientLabeledElement> { - @Override - protected ClientLabeledElement doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - final ClientLabeledElement element = new ClientLabeledElement(); - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Name".equals(jp.getCurrentName())) { - element.setName(jp.nextTextValue()); - } else if ("Annotation".equals(jp.getCurrentName())) { - element.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } else { - element.setValue(jp.readValueAs(AbstractClientDynamicAnnotationExpression.class)); - } - } - } - return element; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientLabeledElementReference.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientLabeledElementReference.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientLabeledElementReference.java deleted file mode 100644 index e1a6303..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientLabeledElementReference.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 org.apache.olingo.client.core.edm.xml; - -import org.apache.olingo.commons.api.edm.provider.annotation.LabeledElementReference; - -class ClientLabeledElementReference - extends AbstractClientElementOrAttributeExpression implements LabeledElementReference { - - private static final long serialVersionUID = 7560525604021670529L; - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.java deleted file mode 100644 index 5b0af33..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.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 org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientNavigationProperty.NavigationPropertyDeserializer.class) -class ClientNavigationProperty extends CsdlNavigationProperty { - - private static final long serialVersionUID = 6240231735592427582L; - - static class NavigationPropertyDeserializer extends AbstractClientEdmDeserializer<CsdlNavigationProperty> { - - @Override - protected CsdlNavigationProperty doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final CsdlNavigationProperty property = new ClientNavigationProperty(); - - 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())) { - String metadataTypeName = jp.nextTextValue(); - if (metadataTypeName.startsWith("Collection(")) { - property.setType(metadataTypeName.substring(metadataTypeName.indexOf("(") + 1, - metadataTypeName.length() - 1)); - property.setCollection(true); - } else { - property.setType(metadataTypeName); - property.setCollection(false); - } - } 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.readValueAs(ClientReferentialConstraint.class)); - } else if ("OnDelete".equals(jp.getCurrentName())) { - jp.nextToken(); - property.setOnDelete(jp.readValueAs(ClientOnDelete.class)); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - property.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - return property; - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.java deleted file mode 100644 index 250c769..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.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 org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.CsdlNavigationPropertyBinding; - -import java.io.IOException; - -@JsonDeserialize(using = ClientNavigationPropertyBinding.NavigationPropertyBindingDeserializer.class) -class ClientNavigationPropertyBinding extends CsdlNavigationPropertyBinding { - - private static final long serialVersionUID = -7056978592235483660L; - - @Override - public CsdlNavigationPropertyBinding setPath(final String path) { - super.setPath(path); - return this; - } - - @Override - public CsdlNavigationPropertyBinding setTarget(final String target) { - super.setTarget(target); - return this; - } - - static class NavigationPropertyBindingDeserializer extends - AbstractClientEdmDeserializer<CsdlNavigationPropertyBinding> { - @Override - protected CsdlNavigationPropertyBinding doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientNavigationPropertyBinding member = new ClientNavigationPropertyBinding(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Path".equals(jp.getCurrentName())) { - member.setPath(jp.nextTextValue()); - } else if ("Target".equals(jp.getCurrentName())) { - member.setTarget(jp.nextTextValue()); - } - } - } - return member; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyPath.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyPath.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyPath.java deleted file mode 100644 index 8a3173c..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyPath.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 org.apache.olingo.client.core.edm.xml; - -import org.apache.olingo.commons.api.edm.provider.annotation.NavigationPropertyPath; - -class ClientNavigationPropertyPath extends AbstractClientElementOrAttributeExpression - implements NavigationPropertyPath { - - private static final long serialVersionUID = 879840502446301312L; - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNot.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNot.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNot.java deleted file mode 100644 index eca2b67..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNot.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 org.apache.olingo.client.core.edm.xml; - -import org.apache.olingo.commons.api.edm.provider.annotation.DynamicAnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.Not; - -class ClientNot extends AbstractClientDynamicAnnotationExpression implements Not { - - private static final long serialVersionUID = -437788415922966812L; - - private DynamicAnnotationExpression expression; - - @Override - public DynamicAnnotationExpression getExpression() { - return expression; - } - - public void setExpression(final DynamicAnnotationExpression expression) { - this.expression = expression; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNull.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNull.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNull.java deleted file mode 100644 index 950d10c..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNull.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.annotation.Null; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientNull.NullDeserializer.class) -class ClientNull extends AbstractClientAnnotatableDynamicAnnotationExpression implements Null { - - private static final long serialVersionUID = -3148516847180393142L; - - static class NullDeserializer extends AbstractClientEdmDeserializer<ClientNull> { - @Override - protected ClientNull doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - final ClientNull _null = new ClientNull(); - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Annotation".equals(jp.getCurrentName())) { - _null.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - return _null; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java deleted file mode 100644 index 489326d..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.CsdlOnDelete; -import org.apache.olingo.commons.api.edm.provider.CsdlOnDeleteAction; - -import java.io.IOException; - -@JsonDeserialize(using = ClientOnDelete.OnDeleteDeserializer.class) -class ClientOnDelete extends CsdlOnDelete { - - private static final long serialVersionUID = -7130889202653716784L; - - static class OnDeleteDeserializer extends AbstractClientEdmDeserializer<CsdlOnDelete> { - @Override - protected CsdlOnDelete doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final CsdlOnDelete ondelete = new ClientOnDelete(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Action".equals(jp.getCurrentName())) { - CsdlOnDeleteAction action = CsdlOnDeleteAction.valueOf(jp.nextTextValue()); - ondelete.setAction(action); - } - } - } - return ondelete; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java deleted file mode 100644 index 24e8650..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.CsdlParameter; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientParameter.ParameterDeserializer.class) -class ClientParameter extends CsdlParameter { - - private static final long serialVersionUID = 7119478691341167904L; - - static class ParameterDeserializer extends AbstractClientEdmDeserializer<ClientParameter> { - @Override - protected ClientParameter doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientParameter parameter = new ClientParameter(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Name".equals(jp.getCurrentName())) { - parameter.setName(jp.nextTextValue()); - } else if ("Type".equals(jp.getCurrentName())) { - String metadataTypeName = jp.nextTextValue(); - if (metadataTypeName.startsWith("Collection(")) { - parameter.setType(metadataTypeName.substring(metadataTypeName.indexOf("(") + 1, - metadataTypeName.length() - 1)); - parameter.setCollection(true); - } else { - parameter.setType(metadataTypeName); - parameter.setCollection(false); - } - } else if ("Nullable".equals(jp.getCurrentName())) { - parameter.setNullable(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("MaxLength".equals(jp.getCurrentName())) { - final String maxLenght = jp.nextTextValue(); - parameter.setMaxLength(maxLenght.equalsIgnoreCase("max") ? Integer.MAX_VALUE : Integer.valueOf(maxLenght)); - } else if ("Precision".equals(jp.getCurrentName())) { - parameter.setPrecision(Integer.valueOf(jp.nextTextValue())); - } else if ("Scale".equals(jp.getCurrentName())) { - final String scale = jp.nextTextValue(); - parameter.setScale(scale.equalsIgnoreCase("variable") ? 0 : Integer.valueOf(scale)); - } else if ("SRID".equals(jp.getCurrentName())) { - final String srid = jp.nextTextValue(); - if (srid != null) { - parameter.setSrid(SRID.valueOf(srid)); - } - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - parameter.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - - return parameter; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPath.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPath.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPath.java deleted file mode 100644 index 3d790d7..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPath.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml; - -import org.apache.olingo.commons.api.edm.provider.annotation.Path; - -class ClientPath extends AbstractClientElementOrAttributeExpression implements Path { - - private static final long serialVersionUID = 6020168217561402545L; - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53b10f6b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.java deleted file mode 100644 index d753fd4..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.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 org.apache.olingo.client.core.edm.xml; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.CsdlProperty; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientProperty.PropertyDeserializer.class) -class ClientProperty extends CsdlProperty { - - private static final long serialVersionUID = -4521766603286651372L; - - static class PropertyDeserializer extends AbstractClientEdmDeserializer<ClientProperty> { - @Override - protected ClientProperty doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - - final ClientProperty property = new ClientProperty(); - - 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())) { - String metadataTypeName = jp.nextTextValue(); - if (metadataTypeName.startsWith("Collection(")) { - property.setType(metadataTypeName.substring(metadataTypeName.indexOf("(") + 1, - metadataTypeName.length() - 1)); - property.setCollection(true); - } else { - property.setType(metadataTypeName); - property.setCollection(false); - } - } else if ("Nullable".equals(jp.getCurrentName())) { - property.setNullable(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("DefaultValue".equals(jp.getCurrentName())) { - property.setDefaultValue(jp.nextTextValue()); - } else if ("MaxLength".equals(jp.getCurrentName())) { - final String maxLenght = jp.nextTextValue(); - property.setMaxLength(maxLenght.equalsIgnoreCase("max") ? Integer.MAX_VALUE : Integer.valueOf(maxLenght)); - } else if ("Precision".equals(jp.getCurrentName())) { - property.setPrecision(Integer.valueOf(jp.nextTextValue())); - } else if ("Scale".equals(jp.getCurrentName())) { - final String scale = jp.nextTextValue(); - property.setScale(scale.equalsIgnoreCase("variable") ? 0 : Integer.valueOf(scale)); - } else if ("Unicode".equals(jp.getCurrentName())) { - property.setUnicode(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("SRID".equals(jp.getCurrentName())) { - final String srid = jp.nextTextValue(); - if (srid != null) { - property.setSrid(SRID.valueOf(srid)); - } - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - property.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } - } - } - - return property; - } - } -}
