http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java deleted file mode 100644 index 5f8503f..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.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.v4; - -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = AnnotationDeserializer.class) -public class AnnotationImpl extends AbstractAnnotatable implements Annotation { - - private static final long serialVersionUID = 5464714417411058033L; - - private String term; - - private String qualifier; - - private AnnotationExpression annotationExpression; - - @Override - public String getTerm() { - return term; - } - - public void setTerm(final String term) { - this.term = term; - } - - @Override - public String getQualifier() { - return qualifier; - } - - public void setQualifier(final String qualifier) { - this.qualifier = qualifier; - } - - @Override - public AnnotationExpression getExpression() { - return annotationExpression; - } - - public void setAnnotationExpression(final AnnotationExpression annotationExpression) { - this.annotationExpression = annotationExpression; - } - -}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java deleted file mode 100644 index 89b8e93..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.v4; - -import java.io.IOException; - -import org.apache.olingo.client.core.edm.xml.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; - -public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> { - - @Override - protected AnnotationsImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException, JsonProcessingException { - - final AnnotationsImpl annotations = new AnnotationsImpl(); - - for (; jp.getCurrentToken() != null && jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Target".equals(jp.getCurrentName())) { - annotations.setTarget(jp.nextTextValue()); - } else if ("Qualifier".equals(jp.getCurrentName())) { - annotations.setQualifier(jp.nextTextValue()); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - annotations.getAnnotations().add(jp.readValueAs(AnnotationImpl.class)); - } - } - } - - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java deleted file mode 100644 index 43f3037..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.Annotations; -import org.apache.olingo.client.core.edm.xml.AbstractAnnotations; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = AnnotationsDeserializer.class) -public class AnnotationsImpl extends AbstractAnnotations implements Annotations { - - private static final long serialVersionUID = -5961207981571644200L; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - - @Override - public Annotation getAnnotation(final String term) { - Annotation result = null; - for (Annotation annotation : getAnnotations()) { - if (term.equals(annotation.getTerm())) { - result = annotation; - } - } - return result; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java deleted file mode 100644 index ec86a80..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or >ied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.ComplexType; -import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty; -import org.apache.olingo.client.api.edm.xml.v4.Property; -import org.apache.olingo.client.core.edm.xml.AbstractComplexType; - -public class ComplexTypeImpl extends AbstractComplexType implements ComplexType { - - private static final long serialVersionUID = 4076944306925840115L; - - private boolean abstractEntityType = false; - - private String baseType; - - private boolean openType = false; - - private final List<Property> properties = new ArrayList<Property>(); - - private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>(); - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public boolean isAbstractEntityType() { - return abstractEntityType; - } - - public void setAbstractEntityType(final boolean abstractEntityType) { - this.abstractEntityType = abstractEntityType; - } - - @Override - public String getBaseType() { - return baseType; - } - - public void setBaseType(final String baseType) { - this.baseType = baseType; - } - - @Override - public boolean isOpenType() { - return openType; - } - - public void setOpenType(final boolean openType) { - this.openType = openType; - } - - @Override - public Property getProperty(final String name) { - return (Property) super.getProperty(name); - } - - @Override - public List<Property> getProperties() { - return properties; - } - - @Override - public NavigationProperty getNavigationProperty(final String name) { - return (NavigationProperty) super.getNavigationProperty(name); - } - - @Override - public List<NavigationProperty> getNavigationProperties() { - return navigationProperties; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java deleted file mode 100644 index 80a7da2..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Schema; -import org.apache.olingo.client.core.edm.xml.AbstractDataServices; - -public class DataServicesImpl extends AbstractDataServices { - - private static final long serialVersionUID = 4200317286476885204L; - - private final List<Schema> schemas = new ArrayList<Schema>(); - - @Override - public List<Schema> getSchemas() { - return schemas; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java deleted file mode 100644 index dd44dd3..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Edmx; -import org.apache.olingo.client.api.edm.xml.v4.Reference; -import org.apache.olingo.client.core.edm.xml.AbstractEdmx; - -public class EdmxImpl extends AbstractEdmx implements Edmx { - - private static final long serialVersionUID = -6293476719276092572L; - - private final List<Reference> references = new ArrayList<Reference>(); - - @Override - public DataServicesImpl getDataServices() { - return (DataServicesImpl) super.getDataServices(); - } - - @Override - public List<Reference> getReferences() { - return references; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityContainerImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityContainerImpl.java deleted file mode 100644 index 5cffafb..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityContainerImpl.java +++ /dev/null @@ -1,124 +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.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.ActionImport; -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.EntityContainer; -import org.apache.olingo.client.api.edm.xml.v4.EntitySet; -import org.apache.olingo.client.api.edm.xml.v4.FunctionImport; -import org.apache.olingo.client.api.edm.xml.v4.Singleton; -import org.apache.olingo.client.core.edm.xml.AbstractEntityContainer; - -public class EntityContainerImpl extends AbstractEntityContainer implements EntityContainer { - - private static final long serialVersionUID = 5631432527646955795L; - - private final List<EntitySet> entitySets = new ArrayList<EntitySet>(); - - private final List<Singleton> singletons = new ArrayList<Singleton>(); - - private final List<ActionImport> actionImports = new ArrayList<ActionImport>(); - - private final List<FunctionImport> functionImports = new ArrayList<FunctionImport>(); - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public void setDefaultEntityContainer(final boolean defaultEntityContainer) { - // no action: a single entity container MUST be available as per OData 4.0 - } - - @Override - public boolean isDefaultEntityContainer() { - return true; - } - - @Override - public EntitySet getEntitySet(final String name) { - return (EntitySet) super.getEntitySet(name); - } - - @Override - public List<EntitySet> getEntitySets() { - return entitySets; - } - - @Override - public List<Singleton> getSingletons() { - return singletons; - } - - @Override - public Singleton getSingleton(final String name) { - return getOneByName(name, getSingletons()); - } - - @Override - public FunctionImport getFunctionImport(final String name) { - return (FunctionImport) super.getFunctionImport(name); - } - - @Override - @SuppressWarnings("unchecked") - public List<FunctionImport> getFunctionImports(final String name) { - return (List<FunctionImport>) super.getFunctionImports(name); - } - - /** - * Gets the first action import with given name. - * - * @param name name. - * @return action import. - */ - @Override - public ActionImport getActionImport(final String name) { - return getOneByName(name, getActionImports()); - } - - /** - * Gets all action imports with given name. - * - * @param name name. - * @return action imports. - */ - @Override - public List<ActionImport> getActionImports(final String name) { - return getAllByName(name, getActionImports()); - } - - @Override - public List<ActionImport> getActionImports() { - return actionImports; - } - - @Override - public List<FunctionImport> getFunctionImports() { - return functionImports; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java deleted file mode 100644 index 8c3a2d3..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.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 org.apache.olingo.client.core.edm.xml.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.EntitySet; -import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding; -import org.apache.olingo.client.core.edm.xml.AbstractEntitySet; - -public class EntitySetImpl extends AbstractEntitySet implements EntitySet { - - private static final long serialVersionUID = -5553885465204370676L; - - private boolean includeInServiceDocument = true; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - private final List<NavigationPropertyBinding> navigationPropertyBindings = new ArrayList<NavigationPropertyBinding>(); - - @Override - public boolean isIncludeInServiceDocument() { - return includeInServiceDocument; - } - - public void setIncludeInServiceDocument(final boolean includeInServiceDocument) { - this.includeInServiceDocument = includeInServiceDocument; - } - - @Override - public List<NavigationPropertyBinding> getNavigationPropertyBindings() { - return navigationPropertyBindings; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java deleted file mode 100644 index 87c49f3..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.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.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.EntityType; -import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty; -import org.apache.olingo.client.api.edm.xml.v4.Property; -import org.apache.olingo.client.core.edm.xml.AbstractEntityType; - -public class EntityTypeImpl extends AbstractEntityType implements EntityType { - - private static final long serialVersionUID = -3986417775876689669L; - - private final List<Property> properties = new ArrayList<Property>(); - - private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>(); - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public Property getProperty(final String name) { - return (Property) super.getProperty(name); - } - - @Override - public List<Property> getProperties() { - return properties; - } - - @Override - public NavigationProperty getNavigationProperty(final String name) { - return (NavigationProperty) super.getNavigationProperty(name); - } - - @Override - public List<NavigationProperty> getNavigationProperties() { - return navigationProperties; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java deleted file mode 100644 index c584828..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.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.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotatable; -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.core.edm.xml.AbstractEnumType; - -public class EnumTypeImpl extends AbstractEnumType implements Annotatable { - - private static final long serialVersionUID = 9191189755592743333L; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java deleted file mode 100644 index fc803a3..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.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.v4; - -import java.io.IOException; - -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.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; - -public class FunctionDeserializer extends AbstractEdmDeserializer<FunctionImpl> { - - @Override - protected FunctionImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException, JsonProcessingException { - - final FunctionImpl functionImpl = new FunctionImpl(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Name".equals(jp.getCurrentName())) { - functionImpl.setName(jp.nextTextValue()); - } else if ("IsBound".equals(jp.getCurrentName())) { - functionImpl.setBound(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("IsComposable".equals(jp.getCurrentName())) { - functionImpl.setComposable(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("EntitySetPath".equals(jp.getCurrentName())) { - functionImpl.setEntitySetPath(jp.nextTextValue()); - } else if ("Parameter".equals(jp.getCurrentName())) { - jp.nextToken(); - functionImpl.getParameters().add(jp.readValueAs(ParameterImpl.class)); - } else if ("ReturnType".equals(jp.getCurrentName())) { - functionImpl.setReturnType(parseReturnType(jp, "Function")); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - functionImpl.getAnnotations().add(jp.readValueAs(AnnotationImpl.class)); - } - } - } - - return functionImpl; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java deleted file mode 100644 index 9b9b1b8..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.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 org.apache.olingo.client.core.edm.xml.v4; - -import org.apache.olingo.client.api.edm.xml.v4.Function; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = FunctionDeserializer.class) -public class FunctionImpl extends ActionImpl implements Function { - - private static final long serialVersionUID = -5494898295282843362L; - - private boolean composable = false; - - @Override - public boolean isComposable() { - return composable; - } - - public void setComposable(final boolean composable) { - this.composable = composable; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java deleted file mode 100644 index 271b012..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java +++ /dev/null @@ -1,59 +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.v4; - -import java.io.IOException; - -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.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; - -public class FunctionImportDeserializer extends AbstractEdmDeserializer<FunctionImportImpl> { - - @Override - protected FunctionImportImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException, JsonProcessingException { - - final FunctionImportImpl functImpImpl = new FunctionImportImpl(); - - 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(AnnotationImpl.class)); - } - } - } - - return functImpImpl; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java deleted file mode 100644 index 69745d1..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java +++ /dev/null @@ -1,86 +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.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.FunctionImport; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = FunctionImportDeserializer.class) -public class FunctionImportImpl implements FunctionImport { - - private static final long serialVersionUID = -1686801084142932402L; - - private String name; - - private String function; - - private String entitySet; - - private boolean includeInServiceDocument = false; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - @Override - public String getFunction() { - return function; - } - - public void setFunction(final String function) { - this.function = function; - } - - @Override - public String getEntitySet() { - return entitySet; - } - - @Override - public void setEntitySet(final String entitySet) { - this.entitySet = entitySet; - } - - @Override - public boolean isIncludeInServiceDocument() { - return includeInServiceDocument; - } - - public void setIncludeInServiceDocument(final boolean includeInServiceDocument) { - this.includeInServiceDocument = includeInServiceDocument; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java deleted file mode 100644 index 1fa69a2..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.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 org.apache.olingo.client.core.edm.xml.v4; - -import org.apache.olingo.client.api.edm.xml.v4.IncludeAnnotations; -import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class IncludeAnnotationsImpl extends AbstractEdmItem implements IncludeAnnotations { - - private static final long serialVersionUID = -8157841387011422396L; - - @JsonProperty(value = "TermNamespace", required = true) - private String termNamespace; - - @JsonProperty(value = "Qualifier") - private String qualifier; - - @JsonProperty(value = "TargetNamespace") - 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 setTargeyNamespace(final String targeyNamespace) { - this.targetNamespace = targeyNamespace; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java deleted file mode 100644 index 10d7063..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.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.v4; - -import org.apache.olingo.client.api.edm.xml.v4.Include; -import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class IncludeImpl extends AbstractEdmItem implements Include { - - private static final long serialVersionUID = -5450008299655584221L; - - @JsonProperty(value = "Namespace", required = true) - private String namespace; - - @JsonProperty(value = "Alias") - private String alias; - - @Override - public String getNamespace() { - return namespace; - } - - public void setNamespace(final String namespace) { - this.namespace = namespace; - } - - @Override - public String getAlias() { - return alias; - } - - public void setAlias(final String alias) { - this.alias = alias; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/MemberImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/MemberImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/MemberImpl.java deleted file mode 100644 index 76a8201..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/MemberImpl.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.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotatable; -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.core.edm.xml.AbstractMember; - -public class MemberImpl extends AbstractMember implements Annotatable { - - private static final long serialVersionUID = -6138606817225829791L; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java deleted file mode 100644 index d114b62..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.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.v4; - -import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding; -import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class NavigationPropertyBindingImpl extends AbstractEdmItem implements NavigationPropertyBinding { - - private static final long serialVersionUID = -7056978592235483660L; - - @JsonProperty(value = "Path", required = true) - private String path; - - @JsonProperty(value = "Target", required = true) - private String target; - - @Override - public String getPath() { - return path; - } - - public void setPath(final String path) { - this.path = path; - } - - @Override - 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/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java deleted file mode 100644 index 289c2d1..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.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.v4; - -import java.io.IOException; - -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; -import org.apache.olingo.client.core.edm.xml.OnDeleteImpl; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; - -public class NavigationPropertyDeserializer extends AbstractEdmDeserializer<NavigationPropertyImpl> { - - @Override - protected NavigationPropertyImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException, JsonProcessingException { - - final NavigationPropertyImpl property = new NavigationPropertyImpl(); - - 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.readValueAs(ReferentialConstraintImpl.class)); - } else if ("OnDelete".equals(jp.getCurrentName())) { - jp.nextToken(); - property.setOnDelete(jp.readValueAs(OnDeleteImpl.class)); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - property.getAnnotations().add(jp.readValueAs(AnnotationImpl.class)); - } - } - } - - return property; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java deleted file mode 100644 index 2c1caf6..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.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.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.OnDelete; -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty; -import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint; -import org.apache.olingo.client.core.edm.xml.AbstractNavigationProperty; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = NavigationPropertyDeserializer.class) -public class NavigationPropertyImpl extends AbstractNavigationProperty implements NavigationProperty { - - private static final long serialVersionUID = 4503112988794432940L; - - private String type; - - private boolean nullable = true; - - private String partner; - - private final List<ReferentialConstraint> referentialConstraints = new ArrayList<ReferentialConstraint>(); - - private OnDelete onDelete; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public String getType() { - return type; - } - - public void setType(final String type) { - this.type = type; - } - - @Override - public boolean isNullable() { - return nullable; - } - - public void setNullable(final boolean nullable) { - this.nullable = nullable; - } - - @Override - public String getPartner() { - return partner; - } - - public void setPartner(final String partner) { - this.partner = partner; - } - - @Override - public List<ReferentialConstraint> getReferentialConstraints() { - return referentialConstraints; - } - - @Override - public OnDelete getOnDelete() { - return onDelete; - } - - public void setOnDelete(final OnDelete onDelete) { - this.onDelete = onDelete; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java deleted file mode 100644 index 4a79f7b..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.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.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.Parameter; -import org.apache.olingo.client.core.edm.xml.AbstractParameter; -import org.apache.olingo.commons.api.edm.geo.SRID; - -public class ParameterImpl extends AbstractParameter implements Parameter { - - private static final long serialVersionUID = 7119478691341167904L; - - private SRID srid; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public SRID getSrid() { - return srid; - } - - public void setSrid(final SRID srid) { - this.srid = srid; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java deleted file mode 100644 index d53b659..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.Property; -import org.apache.olingo.client.core.edm.xml.AbstractProperty; - -public class PropertyImpl extends AbstractProperty implements Property { - - private static final long serialVersionUID = 4544336801968719526L; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java deleted file mode 100644 index 552a952..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.v4; - -import java.io.IOException; -import java.net.URI; - -import org.apache.olingo.client.core.edm.xml.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; - -public class ReferenceDeserializer extends AbstractEdmDeserializer<ReferenceImpl> { - - @Override - protected ReferenceImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException, JsonProcessingException { - - final ReferenceImpl reference = new ReferenceImpl(); - - 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.readValueAs( IncludeImpl.class)); - } else if ("IncludeAnnotations".equals(jp.getCurrentName())) { - jp.nextToken(); - reference.getIncludeAnnotations().add(jp.readValueAs( IncludeAnnotationsImpl.class)); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - reference.getAnnotations().add(jp.readValueAs( AnnotationImpl.class)); - } - } - } - - return reference; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java deleted file mode 100644 index d8ae938..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.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.v4; - -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.Include; -import org.apache.olingo.client.api.edm.xml.v4.IncludeAnnotations; -import org.apache.olingo.client.api.edm.xml.v4.Reference; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = ReferenceDeserializer.class) -public class ReferenceImpl extends AbstractAnnotatable implements Reference { - - private static final long serialVersionUID = 7720274712545267654L; - - private URI uri; - - private final List<Include> includes = new ArrayList<Include>(); - - private final List<IncludeAnnotations> includeAnnotations = new ArrayList<IncludeAnnotations>(); - - @Override - public URI getUri() { - return uri; - } - - public void setUri(final URI uri) { - this.uri = uri; - } - - @Override - public List<Include> getIncludes() { - return includes; - } - - @Override - public List<IncludeAnnotations> getIncludeAnnotations() { - return includeAnnotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java deleted file mode 100644 index c11710c..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.v4; - -import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class ReferentialConstraintImpl extends AbstractAnnotatable implements ReferentialConstraint { - - private static final long serialVersionUID = -5822115908069878139L; - - @JsonProperty(value = "Property", required = true) - private String property; - - @JsonProperty(value = "ReferencedProperty", required = true) - private String referencedProperty; - - @Override - public String getProperty() { - return property; - } - - public void setProperty(final String property) { - this.property = property; - } - - @Override - 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/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java deleted file mode 100644 index 18ef16f..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.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.v4; - -import java.io.IOException; - -import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; -import org.apache.olingo.commons.api.edm.geo.SRID; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; - -public class ReturnTypeDeserializer extends AbstractEdmDeserializer<ReturnTypeImpl> { - - @Override - protected ReturnTypeImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException, JsonProcessingException { - - final ReturnTypeImpl returnType = new ReturnTypeImpl(); - - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Type".equals(jp.getCurrentName())) { - returnType.setType(jp.nextTextValue()); - } else if ("Nullable".equals(jp.getCurrentName())) { - returnType.setNullable(BooleanUtils.toBoolean(jp.nextTextValue())); - } else if ("MaxLength".equals(jp.getCurrentName())) { - final String maxLenght = jp.nextTextValue(); - returnType.setMaxLength(maxLenght.equalsIgnoreCase("max") ? Integer.MAX_VALUE : Integer.valueOf(maxLenght)); - } else if ("Precision".equals(jp.getCurrentName())) { - returnType.setPrecision(Integer.valueOf(jp.nextTextValue())); - } else if ("Scale".equals(jp.getCurrentName())) { - final String scale = jp.nextTextValue(); - returnType.setScale(scale.equalsIgnoreCase("variable") ? 0 : Integer.valueOf(scale)); - } else if ("SRID".equals(jp.getCurrentName())) { - final String srid = jp.nextTextValue(); - if (srid != null) { - returnType.setSrid(SRID.valueOf(srid)); - } - } - } - } - - return returnType; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java deleted file mode 100644 index 6df832a..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java +++ /dev/null @@ -1,98 +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.v4; - -import org.apache.olingo.client.api.edm.xml.v4.ReturnType; -import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; -import org.apache.olingo.commons.api.edm.geo.SRID; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = ReturnTypeDeserializer.class) -public class ReturnTypeImpl extends AbstractEdmItem implements ReturnType { - - private static final long serialVersionUID = 6261092793901735110L; - - private String type; - - private boolean nullable = true; - - private Integer maxLength; - - private Integer precision; - - private Integer scale; - - private SRID srid; - - @Override - public String getType() { - return type; - } - - public void setType(final String type) { - this.type = type; - } - - @Override - public boolean isNullable() { - return nullable; - } - - public void setNullable(final boolean nullable) { - this.nullable = nullable; - } - - @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; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java deleted file mode 100644 index 20600fa..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java +++ /dev/null @@ -1,249 +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.v4; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.olingo.client.api.edm.xml.EnumType; -import org.apache.olingo.client.api.edm.xml.v4.Action; -import org.apache.olingo.client.api.edm.xml.v4.ActionImport; -import org.apache.olingo.client.api.edm.xml.v4.Annotatable; -import org.apache.olingo.client.api.edm.xml.v4.Annotation; -import org.apache.olingo.client.api.edm.xml.v4.Annotations; -import org.apache.olingo.client.api.edm.xml.v4.ComplexType; -import org.apache.olingo.client.api.edm.xml.v4.EntityContainer; -import org.apache.olingo.client.api.edm.xml.v4.EntitySet; -import org.apache.olingo.client.api.edm.xml.v4.EntityType; -import org.apache.olingo.client.api.edm.xml.v4.Function; -import org.apache.olingo.client.api.edm.xml.v4.FunctionImport; -import org.apache.olingo.client.api.edm.xml.v4.Schema; -import org.apache.olingo.client.api.edm.xml.v4.Singleton; -import org.apache.olingo.client.api.edm.xml.v4.Term; -import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition; -import org.apache.olingo.client.core.edm.xml.AbstractSchema; - -public class SchemaImpl extends AbstractSchema implements Schema { - - private static final long serialVersionUID = 1911087363912024939L; - - private final List<Action> actions = new ArrayList<Action>(); - - private final List<Annotations> annotationGroups = 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 Map<String, Annotatable> annotatables; - - @Override - public List<Action> getActions() { - return actions; - } - - @Override - public List<Action> getActions(final String name) { - return getAllByName(name, getActions()); - } - - @Override - public List<Annotations> getAnnotationGroups() { - return annotationGroups; - } - - @Override - public Annotations getAnnotationGroup(final String target) { - Annotations result = null; - for (Annotations annots : getAnnotationGroups()) { - if (target.equals(annots.getTarget())) { - result = annots; - } - } - return result; - } - - @Override - public Annotation getAnnotation(final String term) { - Annotation result = null; - for (Annotation annot : getAnnotations()) { - if (term.equals(annot.getTerm())) { - result = annot; - } - } - return result; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - - @Override - public List<Function> getFunctions() { - return functions; - } - - @Override - public List<Function> getFunctions(final String name) { - return getAllByName(name, getFunctions()); - } - - @Override - public Term getTerm(final String name) { - return getOneByName(name, getTerms()); - } - - @Override - public List<Term> getTerms() { - return terms; - } - - @Override - public TypeDefinition getTypeDefinition(final String name) { - return getOneByName(name, getTypeDefinitions()); - } - - @Override - public List<TypeDefinition> getTypeDefinitions() { - return typeDefinitions; - } - - @Override - public EntityContainer getEntityContainer() { - return entityContainer; - } - - public void setEntityContainer(final EntityContainerImpl 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; - } - return null; - } - - @Override - public List<EnumType> getEnumTypes() { - return enumTypes; - } - - @Override - public ComplexType getComplexType(final String name) { - return (ComplexType) super.getComplexType(name); - } - - @Override - public List<ComplexType> getComplexTypes() { - return complexTypes; - } - - @Override - public EntityType getEntityType(final String name) { - return (EntityType) super.getEntityType(name); - } - - @Override - public List<EntityType> getEntityTypes() { - return entityTypes; - } - - @Override - public Map<String, Annotatable> getAnnotatables() { - if (annotatables == null) { - annotatables = new HashMap<String, Annotatable>(); - for (Annotations annotationGroup : getAnnotationGroups()) { - annotatables.put(null, annotationGroup); - } - for (Annotation annotation : getAnnotations()) { - annotatables.put(annotation.getTerm(), annotation); - } - for (Action action : getActions()) { - annotatables.put(action.getName(), action); - } - for (ComplexType complexType : getComplexTypes()) { - annotatables.put(complexType.getName(), complexType); - } - for (EntityType entityType : getEntityTypes()) { - annotatables.put(entityType.getName(), entityType); - } - for (EnumType enumType : getEnumTypes()) { - annotatables.put(enumType.getName(), (EnumTypeImpl) enumType); - } - for (Function function : getFunctions()) { - annotatables.put(function.getName(), function); - } - for (Term term : getTerms()) { - annotatables.put(term.getName(), term); - } - for (TypeDefinition typedef : getTypeDefinitions()) { - annotatables.put(typedef.getName(), typedef); - } - if (entityContainer != null) { - annotatables.put(entityContainer.getName(), entityContainer); - for (Annotation annotation : entityContainer.getAnnotations()) { - annotatables.put(annotation.getTerm(), annotation); - } - for (ActionImport actionImport : entityContainer.getActionImports()) { - annotatables.put(actionImport.getName(), actionImport); - } - for (FunctionImport functionImport : entityContainer.getFunctionImports()) { - annotatables.put(functionImport.getName(), functionImport); - } - for (EntitySet entitySet : entityContainer.getEntitySets()) { - annotatables.put(entitySet.getName(), entitySet); - } - for (Singleton singleton : entityContainer.getSingletons()) { - annotatables.put(singleton.getName(), singleton); - } - } - } - return annotatables; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java deleted file mode 100644 index affe220..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java +++ /dev/null @@ -1,59 +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.v4; - -import java.io.IOException; - -import org.apache.olingo.client.core.edm.xml.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; - -public class SingletonDeserializer extends AbstractEdmDeserializer<SingletonImpl> { - - @Override - protected SingletonImpl doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException, JsonProcessingException { - - final SingletonImpl singleton = new SingletonImpl(); - - 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.setEntityType(jp.nextTextValue()); - } else if ("NavigationPropertyBinding".equals(jp.getCurrentName())) { - jp.nextToken(); - singleton.getNavigationPropertyBindings().add( - jp.readValueAs(NavigationPropertyBindingImpl.class)); - } else if ("Annotation".equals(jp.getCurrentName())) { - jp.nextToken(); - singleton.getAnnotations().add(jp.readValueAs(AnnotationImpl.class)); - } - } - } - - return singleton; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java deleted file mode 100644 index f19ac70..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.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.v4; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding; -import org.apache.olingo.client.api.edm.xml.v4.Singleton; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = SingletonDeserializer.class) -public class SingletonImpl extends AbstractAnnotatable implements Singleton { - - private static final long serialVersionUID = 1656749615107151921L; - - private String name; - - private String entityType; - - private final List<NavigationPropertyBinding> navigationPropertyBindings = new ArrayList<NavigationPropertyBinding>(); - - @Override - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - @Override - public String getEntityType() { - return entityType; - } - - public void setEntityType(final String entityType) { - this.entityType = entityType; - } - - @Override - public List<NavigationPropertyBinding> getNavigationPropertyBindings() { - return navigationPropertyBindings; - } - -}
