http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityContainerInfo.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityContainerInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityContainerInfo.java deleted file mode 100644 index 8de97de..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityContainerInfo.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.api.edm.provider; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -public class EntityContainerInfo { - - private FullQualifiedName containerName; - - private FullQualifiedName extendsContainer; - - public FullQualifiedName getContainerName() { - return containerName; - } - - public EntityContainerInfo setContainerName(final FullQualifiedName containerName) { - this.containerName = containerName; - return this; - } - - public FullQualifiedName getExtendsContainer() { - return extendsContainer; - } - - public EntityContainerInfo setExtendsContainer(final FullQualifiedName extendsContainer) { - this.extendsContainer = extendsContainer; - return this; - } - -}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java deleted file mode 100644 index 51d28db..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.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.commons.api.edm.provider; - -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -public class EntitySet extends BindingTarget { - - private static final long serialVersionUID = 5291570018480936643L; - - //Default for EntitySets is true - private boolean includeInServiceDocument = true; - - @Override - public EntitySet setName(final String name) { - this.name = name; - return this; - } - - @Override - public EntitySet setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) { - this.navigationPropertyBindings = navigationPropertyBindings; - return this; - } - - @Override - public EntitySet setType(final String type) { - this.type = new FullQualifiedName(type); - return this; - } - - @Override - public EntitySet setType(final FullQualifiedName type) { - this.type = type; - return this; - } - - public boolean isIncludeInServiceDocument() { - return includeInServiceDocument; - } - - public EntitySet setIncludeInServiceDocument(final boolean includeInServiceDocument) { - this.includeInServiceDocument = includeInServiceDocument; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySetPath.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySetPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySetPath.java deleted file mode 100644 index 3bc8d45..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySetPath.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.commons.api.edm.provider; - -public class EntitySetPath { - - private String bindingParameter; - - private String path; - - public String getBindingParameter() { - return bindingParameter; - } - - public EntitySetPath setBindingParameter(final String bindingParameter) { - this.bindingParameter = bindingParameter; - return this; - } - - public String getPath() { - return path; - } - - public EntitySetPath setPath(final String path) { - this.path = path; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityType.java deleted file mode 100644 index 9994e9e..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityType.java +++ /dev/null @@ -1,92 +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.commons.api.edm.provider; - -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -public class EntityType extends StructuralType { - - private static final long serialVersionUID = -1564752618679704024L; - - private List<PropertyRef> key; - - private boolean hasStream = false; - - public boolean hasStream() { - return hasStream; - } - - public EntityType setHasStream(final boolean hasStream) { - this.hasStream = hasStream; - return this; - } - - public List<PropertyRef> getKey() { - return key; - } - - public EntityType setKey(final List<PropertyRef> key) { - this.key = key; - return this; - } - - @Override - public EntityType setName(final String name) { - this.name = name; - return this; - } - - @Override - public EntityType setOpenType(final boolean isOpenType) { - this.isOpenType = isOpenType; - return this; - } - - @Override - public EntityType setBaseType(final String baseType) { - this.baseType = new FullQualifiedName(baseType); - return this; - } - - @Override - public EntityType setBaseType(final FullQualifiedName baseType) { - this.baseType = baseType; - return this; - } - - @Override - public EntityType setAbstract(final boolean isAbstract) { - this.isAbstract = isAbstract; - return this; - } - - @Override - public EntityType setProperties(final List<Property> properties) { - this.properties = properties; - return this; - } - - @Override - public EntityType setNavigationProperties(final List<NavigationProperty> navigationProperties) { - this.navigationProperties = navigationProperties; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumMember.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumMember.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumMember.java deleted file mode 100644 index 2787e3f..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumMember.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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -public class EnumMember extends AbstractEdmItem implements Named, Annotatable{ - - private static final long serialVersionUID = 5618984420582832094L; - - private String name; - - private String value; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public EnumMember setName(final String name) { - this.name = name; - return this; - } - - public String getValue() { - return value; - } - - public EnumMember setValue(final String value) { - this.value = value; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumType.java deleted file mode 100644 index badf0ba..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumType.java +++ /dev/null @@ -1,113 +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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -public class EnumType extends AbstractEdmItem implements Named, Annotatable { - - private static final long serialVersionUID = -718032622783883403L; - - private String name; - - private boolean isFlags; - - private FullQualifiedName underlyingType; - - private List<EnumMember> members = new ArrayList<EnumMember>(); - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public EnumType setName(final String name) { - this.name = name; - return this; - } - - public boolean isFlags() { - return isFlags; - } - - public EnumType setFlags(final boolean isFlags) { - this.isFlags = isFlags; - return this; - } - - public String getUnderlyingType() { - if(underlyingType != null){ - return underlyingType.getFullQualifiedNameAsString(); - } - return null; - } - - public EnumType setUnderlyingType(final String underlyingType) { - this.underlyingType = new FullQualifiedName(underlyingType); - return this; - } - - public EnumType setUnderlyingType(final FullQualifiedName underlyingType) { - this.underlyingType = underlyingType; - return this; - } - - - public List<EnumMember> getMembers() { - return members; - } - - public EnumMember getMember(final String name) { - EnumMember result = null; - if (getMembers() != null) { - for (EnumMember member : getMembers()) { - if (name.equals(member.getName())) { - result = member; - } - } - } - return result; - } - - public EnumMember getMember(final Integer value) { - EnumMember result = null; - if (getMembers() != null) { - for (EnumMember member : getMembers()) { - if (String.valueOf(value).equals(member.getValue())) { - result = member; - } - } - } - return result; - } - - public EnumType setMembers(final List<EnumMember> members) { - this.members = members; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Expression.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Expression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Expression.java deleted file mode 100644 index 1784dad..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Expression.java +++ /dev/null @@ -1,23 +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.commons.api.edm.provider; - -public class Expression { -//TODO: Expression implementation -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Function.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Function.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Function.java deleted file mode 100644 index 04f0521..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Function.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.commons.api.edm.provider; - -import java.util.List; - -public class Function extends Operation { - - private static final long serialVersionUID = 673858921468578957L; - - private boolean isComposable = false; - - public boolean isComposable() { - return isComposable; - } - - public Function setComposable(final boolean isComposable) { - this.isComposable = isComposable; - return this; - } - - @Override - public Function setName(final String name) { - this.name = name; - return this; - } - - @Override - public Function setBound(final boolean isBound) { - this.isBound = isBound; - return this; - } - - @Override - public Function setEntitySetPath(final String entitySetPath) { - this.entitySetPath = entitySetPath; - return this; - } - - @Override - public Function setParameters(final List<Parameter> parameters) { - this.parameters = parameters; - return this; - } - - @Override - public Function setReturnType(final ReturnType returnType) { - this.returnType = returnType; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java deleted file mode 100644 index 84d6789..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java +++ /dev/null @@ -1,77 +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.commons.api.edm.provider; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; - - -public class FunctionImport extends OperationImport { - - private static final long serialVersionUID = 8479762299534736719L; - - private FullQualifiedName function; - - //Default include in service document is false for function imports - private boolean includeInServiceDocument; - - @Override - public String getName() { - return name; - } - - @Override - public FunctionImport setName(final String name) { - this.name = name; - return this; - } - - @Override - public FunctionImport setEntitySet(final String entitySet) { - this.entitySet = entitySet; - return this; - } - - public String getFunction() { - return function.getFullQualifiedNameAsString(); - } - - public FullQualifiedName getFunctionFQN() { - return function; - } - - - public FunctionImport setFunction(final FullQualifiedName function) { - this.function = function; - return this; - } - - public FunctionImport setFunction(final String function) { - this.function = new FullQualifiedName(function); - return this; - } - - public boolean isIncludeInServiceDocument() { - return includeInServiceDocument; - } - - public FunctionImport setIncludeInServiceDocument(final boolean includeInServiceDocument) { - this.includeInServiceDocument = includeInServiceDocument; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java deleted file mode 100644 index 472a28e..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.api.edm.provider; - -import org.apache.olingo.commons.api.edm.EdmMapping; - -/** - * Content of this class does not appear within the CSDL metadata document. This class is used to perform server - * internal mapping for edm primitive types to java types. - */ -public class Mapping implements EdmMapping { - - private Class<?> mappedJavaClass; - - /** - * Sets the class to be used during deserialization to transform an EDM primitive type into this java class. To see - * which classes work for which primitive type refer to {@link org.apache.olingo.commons.api.edm.EdmPrimitiveType}. - * @param mappedJavaClass class to which is mapped - * @return this for method chaining - */ - public Mapping setMappedJavaClass(Class<?> mappedJavaClass) { - this.mappedJavaClass = mappedJavaClass; - return this; - } - - /* (non-Javadoc) - * @see org.apache.olingo.commons.api.edm.EdmMapping#getMappedJavaClass() - */ - @Override - public Class<?> getMappedJavaClass() { - return mappedJavaClass; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Named.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Named.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Named.java deleted file mode 100644 index 6b716a6..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Named.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.api.edm.provider; - -import java.io.Serializable; - -public interface Named extends Serializable { - - String getName(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationProperty.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationProperty.java deleted file mode 100644 index bfb74b0..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationProperty.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -public class NavigationProperty extends AbstractEdmItem implements Named, Annotatable{ - - private static final long serialVersionUID = -788021920718310799L; - - private String name; - - private FullQualifiedName type; - - private boolean isCollection; - - private String partner; - - private boolean containsTarget = false; - - private List<ReferentialConstraint> referentialConstraints = new ArrayList<ReferentialConstraint>(); - - // Facets - private boolean nullable = true; - - private OnDelete onDelete; - - private List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public boolean isCollection() { - return isCollection; - } - - public NavigationProperty setCollection(final boolean isCollection) { - this.isCollection = isCollection; - return this; - } - - public NavigationProperty setName(final String name) { - this.name = name; - return this; - } - - public FullQualifiedName getTypeFQN() { - return type; - } - - public String getType() { - if(type != null){ - return type.getFullQualifiedNameAsString(); - } - return null; - } - - public NavigationProperty setType(final FullQualifiedName type) { - this.type = type; - return this; - } - - public NavigationProperty setType(final String type) { - this.type = new FullQualifiedName(type); - return this; - } - - public String getPartner() { - return partner; - } - - public NavigationProperty setPartner(final String partner) { - this.partner = partner; - return this; - } - - public boolean isContainsTarget() { - return containsTarget; - } - - public NavigationProperty setContainsTarget(final boolean containsTarget) { - this.containsTarget = containsTarget; - return this; - } - - public List<ReferentialConstraint> getReferentialConstraints() { - return referentialConstraints; - } - - public NavigationProperty setReferentialConstraints(final List<ReferentialConstraint> referentialConstraints) { - this.referentialConstraints = referentialConstraints; - return this; - } - - public Boolean isNullable() { - return nullable; - } - - public NavigationProperty setNullable(final Boolean nullable) { - this.nullable = nullable; - return this; - } - - public OnDelete getOnDelete() { - return onDelete; - } - - public NavigationProperty setOnDelete(final OnDelete onDelete) { - this.onDelete = onDelete; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java deleted file mode 100644 index 1ac7d6b..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.api.edm.provider; - - -public class NavigationPropertyBinding extends AbstractEdmItem { - - private static final long serialVersionUID = 770380971233808502L; - - private String path; - - private String target; - - public String getPath() { - return path; - } - - public NavigationPropertyBinding setPath(final String path) { - this.path = path; - return this; - } - - public String getTarget() { - return target; - } - - public NavigationPropertyBinding setTarget(final String target) { - this.target = target; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OnDelete.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OnDelete.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OnDelete.java deleted file mode 100644 index e699dbb..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OnDelete.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.commons.api.edm.provider; - - - -public class OnDelete extends AbstractEdmItem { - - private static final long serialVersionUID = -7130889202653716784L; - - private OnDeleteAction action = OnDeleteAction.None; - - public OnDeleteAction getAction() { - return action; - } - - public OnDelete setAction(final OnDeleteAction action) { - this.action = action; - return this; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OnDeleteAction.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OnDeleteAction.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OnDeleteAction.java deleted file mode 100644 index a5bf50b..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OnDeleteAction.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.api.edm.provider; - -public enum OnDeleteAction { - - Cascade, - None, - SetNull, - SetDefault - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Operation.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Operation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Operation.java deleted file mode 100644 index 882087c..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Operation.java +++ /dev/null @@ -1,92 +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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -public abstract class Operation extends AbstractEdmItem implements Named, Annotatable{ - - private static final long serialVersionUID = -3842411084067064086L; - - protected String name; - - protected boolean isBound = false; - - protected String entitySetPath; - - protected List<Parameter> parameters = new ArrayList<Parameter>(); - - protected ReturnType returnType; - - protected final List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public Operation setName(final String name) { - this.name = name; - return this; - } - - public boolean isBound() { - return isBound; - } - - public Operation setBound(final boolean isBound) { - this.isBound = isBound; - return this; - } - - public String getEntitySetPath() { - return entitySetPath; - } - - public Operation setEntitySetPath(final String entitySetPath) { - this.entitySetPath = entitySetPath; - return this; - } - - public List<Parameter> getParameters() { - return parameters; - } - - public Parameter getParameter(String name) { - return getOneByName(name, getParameters()); - } - - public Operation setParameters(final List<Parameter> parameters) { - this.parameters = parameters; - return this; - } - - public ReturnType getReturnType() { - return returnType; - } - - public Operation setReturnType(final ReturnType returnType) { - this.returnType = returnType; - return this; - } - - public List<Annotation> getAnnotations() { - return annotations; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java deleted file mode 100644 index 7de9623..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -public abstract class OperationImport extends AbstractEdmItem implements Named, Annotatable{ - - private static final long serialVersionUID = -8928186067970681061L; - - protected String name; - protected String entitySet; - protected final List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public OperationImport setName(final String name) { - this.name = name; - return this; - } - - public String getEntitySet() { - return entitySet; - } - - public OperationImport setEntitySet(final String entitySet) { - this.entitySet = entitySet; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java deleted file mode 100644 index fb29da2..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java +++ /dev/null @@ -1,146 +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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.geo.SRID; - -public class Parameter extends AbstractEdmItem implements Named, Annotatable{ - - private static final long serialVersionUID = -7360900923880732015L; - - private String name; - - private FullQualifiedName type; - - private boolean isCollection; - - private Mapping mapping; - - // Facets - private boolean nullable = true; - - private Integer maxLength; - - private Integer precision; - - private Integer scale; - - private SRID srid; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public Parameter setName(final String name) { - this.name = name; - return this; - } - - public String getType() { - return type.getFullQualifiedNameAsString(); - } - - public FullQualifiedName getTypeFQN() { - return type; - } - - public Parameter setType(final String type) { - this.type = new FullQualifiedName(type); - return this; - } - - public Parameter setType(final FullQualifiedName type) { - this.type = type; - return this; - } - - public boolean isCollection() { - return isCollection; - } - - public Parameter setCollection(final boolean isCollection) { - this.isCollection = isCollection; - return this; - } - - public boolean isNullable() { - return nullable; - } - - public Parameter setNullable(final boolean nullable) { - this.nullable = nullable; - return this; - } - - public Integer getMaxLength() { - return maxLength; - } - - public Parameter setMaxLength(final Integer maxLength) { - this.maxLength = maxLength; - return this; - } - - public Integer getPrecision() { - return precision; - } - - public Parameter setPrecision(final Integer precision) { - this.precision = precision; - return this; - } - - public Integer getScale() { - return scale; - } - - public Parameter setScale(final Integer scale) { - this.scale = scale; - return this; - } - - public SRID getSrid() { - return srid; - } - - public Parameter setSrid(final SRID srid) { - this.srid = srid; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - - public Mapping getMapping() { - return mapping; - } - - public Parameter setMapping(final Mapping mapping) { - this.mapping = mapping; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java deleted file mode 100644 index cf4e928..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java +++ /dev/null @@ -1,180 +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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.geo.SRID; - -public class Property extends AbstractEdmItem implements Named, Annotatable{ - - private static final long serialVersionUID = -4224390853690843450L; - - private String name; - - private String type; - - private boolean collection; - - private String mimeType; - - private Mapping mapping; - - // Facets - private String defaultValue; - - private boolean nullable = true; - - private Integer maxLength; - - private Integer precision; - - private Integer scale; - - private boolean unicode = true; - - private SRID srid; - - private List<Annotation> annotations = new ArrayList<Annotation>(); - - - public String getName() { - return name; - } - - public Property setName(final String name) { - this.name = name; - return this; - } - - public String getType() { - return type; - } - - public Property setType(final String type) { - this.type = type; - return this; - } - - public FullQualifiedName getTypeAsFQNObject(){ - return new FullQualifiedName(type); - } - - public Property setType(FullQualifiedName fqnName){ - this.type = fqnName.getFullQualifiedNameAsString(); - return this; - } - - public boolean isCollection() { - return collection; - } - - public Property setCollection(final boolean isCollection) { - collection = isCollection; - return this; - } - - public String getDefaultValue() { - return defaultValue; - } - - public Property setDefaultValue(final String defaultValue) { - this.defaultValue = defaultValue; - return this; - } - - public boolean isNullable() { - return nullable; - } - - public Property setNullable(final boolean nullable) { - this.nullable = nullable; - return this; - } - - public Integer getMaxLength() { - return maxLength; - } - - public Property setMaxLength(final Integer maxLength) { - this.maxLength = maxLength; - return this; - } - - public Integer getPrecision() { - return precision; - } - - public Property setPrecision(final Integer precision) { - this.precision = precision; - return this; - } - - public Integer getScale() { - return scale; - } - - public Property setScale(final Integer scale) { - this.scale = scale; - return this; - } - - public boolean isUnicode() { - return unicode; - } - - public Property setUnicode(final boolean unicode) { - this.unicode = unicode; - return this; - } - - public String getMimeType() { - return mimeType; - } - - public Property setMimeType(final String mimeType) { - this.mimeType = mimeType; - return this; - } - - public Mapping getMapping() { - return mapping; - } - - public Property setMapping(final Mapping mapping) { - this.mapping = mapping; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } - - public Property setSrid(final SRID srid) { - this.srid = srid; - return this; - } - - public SRID getSrid() { - return srid; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java deleted file mode 100644 index 6588aaa..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.api.edm.provider; - -public class PropertyRef extends AbstractEdmItem implements Named{ - - private static final long serialVersionUID = 9082892362895660037L; - - private String name; - - private String alias; - - public String getName() { - return name; - } - - public PropertyRef setName(final String name) { - this.name = name; - return this; - } - - public String getAlias() { - return alias; - } - - public PropertyRef setAlias(final String alias) { - this.alias = alias; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReferentialConstraint.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReferentialConstraint.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReferentialConstraint.java deleted file mode 100644 index 72c84c1..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReferentialConstraint.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -public class ReferentialConstraint extends AbstractEdmItem implements Annotatable { - - private static final long serialVersionUID = -7467707499798840075L; - - private String property; - - private String referencedProperty; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getProperty() { - return property; - } - - public ReferentialConstraint setProperty(final String property) { - this.property = property; - return this; - } - - public String getReferencedProperty() { - return referencedProperty; - } - - public ReferentialConstraint setReferencedProperty(final String referencedProperty) { - this.referencedProperty = referencedProperty; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReturnType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReturnType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReturnType.java deleted file mode 100644 index 1d58ae1..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReturnType.java +++ /dev/null @@ -1,114 +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.commons.api.edm.provider; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.geo.SRID; - -public class ReturnType extends AbstractEdmItem{ - - private static final long serialVersionUID = 4816954124986010965L; - - private FullQualifiedName type; - - private boolean isCollection; - - // facets - private boolean nullable = true; - - private Integer maxLength; - - private Integer precision; - - private Integer scale; - - private SRID srid; - - public String getType() { - return type.getFullQualifiedNameAsString(); - } - - public FullQualifiedName getTypeFQN() { - return type; - } - - public ReturnType setType(final String type) { - this.type = new FullQualifiedName(type); - return this; - } - - public ReturnType setType(final FullQualifiedName type) { - this.type = type; - return this; - } - - public boolean isCollection() { - return isCollection; - } - - public ReturnType setCollection(final boolean isCollection) { - this.isCollection = isCollection; - return this; - } - - public boolean isNullable() { - return nullable; - } - - public ReturnType setNullable(final boolean nullable) { - this.nullable = nullable; - return this; - } - - public Integer getMaxLength() { - return maxLength; - } - - public ReturnType setMaxLength(final Integer maxLength) { - this.maxLength = maxLength; - return this; - } - - public Integer getPrecision() { - return precision; - } - - public ReturnType setPrecision(final Integer precision) { - this.precision = precision; - return this; - } - - public Integer getScale() { - return scale; - } - - public ReturnType setScale(final Integer scale) { - this.scale = scale; - return this; - } - - public SRID getSrid() { - return srid; - } - - public ReturnType setSrid(final SRID srid) { - this.srid = srid; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Schema.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Schema.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Schema.java deleted file mode 100644 index 7ed2704..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Schema.java +++ /dev/null @@ -1,265 +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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class Schema extends AbstractEdmItem implements Annotatable{ - - private static final long serialVersionUID = -1527213201328056750L; - - private String namespace; - - private String alias; - - private List<EnumType> enumTypes = new ArrayList<EnumType>(); - - private List<TypeDefinition> typeDefinitions = new ArrayList<TypeDefinition>(); - - private List<EntityType> entityTypes = new ArrayList<EntityType>(); - - private List<ComplexType> complexTypes = new ArrayList<ComplexType>(); - - private List<Action> actions = new ArrayList<Action>(); - - private List<Function> functions = new ArrayList<Function>(); - - private EntityContainer entityContainer; - - private List<Term> terms = new ArrayList<Term>(); - - private final List<Annotations> annotationGroups = new ArrayList<Annotations>(); - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - private Map<String, Annotatable> annotatables; - - - public String getNamespace() { - return namespace; - } - - public Schema setNamespace(final String namespace) { - this.namespace = namespace; - return this; - } - - public String getAlias() { - return alias; - } - - public Schema setAlias(final String alias) { - this.alias = alias; - return this; - } - - public List<EnumType> getEnumTypes() { - return enumTypes; - } - - public EnumType getEnumType(final String name) { - return getOneByName(name, getEnumTypes()); - } - - public Schema setEnumTypes(final List<EnumType> enumTypes) { - this.enumTypes = enumTypes; - return this; - } - - public List<TypeDefinition> getTypeDefinitions() { - return typeDefinitions; - } - - public TypeDefinition getTypeDefinition(final String name) { - return getOneByName(name, getTypeDefinitions()); - } - - public Schema setTypeDefinitions(final List<TypeDefinition> typeDefinitions) { - this.typeDefinitions = typeDefinitions; - return this; - } - - public List<EntityType> getEntityTypes() { - return entityTypes; - } - - public EntityType getEntityType(final String name) { - return getOneByName(name, getEntityTypes()); - } - - public Schema setEntityTypes(final List<EntityType> entityTypes) { - this.entityTypes = entityTypes; - return this; - } - - public List<ComplexType> getComplexTypes() { - return complexTypes; - } - - public ComplexType getComplexType(final String name) { - return getOneByName(name, getComplexTypes()); - } - - public Schema setComplexTypes(final List<ComplexType> complexTypes) { - this.complexTypes = complexTypes; - return this; - } - - public List<Action> getActions() { - return actions; - } - - /** - * All actions with the given name - * @param name - * @return a list of actions - */ - public List<Action> getActions(final String name) { - return getAllByName(name, getActions()); - } - - public Schema setActions(final List<Action> actions) { - this.actions = actions; - return this; - } - - public List<Function> getFunctions() { - return functions; - } - - /** - * All functions with the given name - * @param name - * @return a list of functions - */ - public List<Function> getFunctions(final String name) { - return getAllByName(name, getFunctions()); - } - - public Schema setFunctions(final List<Function> functions) { - this.functions = functions; - return this; - } - - public EntityContainer getEntityContainer() { - return entityContainer; - } - - public Schema setEntityContainer(final EntityContainer entityContainer) { - this.entityContainer = entityContainer; - return this; - } - - public List<Term> getTerms() { - return terms; - } - - public Term getTerm(final String name) { - return getOneByName(name, getTerms()); - } - - - public Schema setTerms(final List<Term> terms) { - this.terms = terms; - return this; - } - - public List<Annotations> getAnnotationGroups() { - return annotationGroups; - } - - public Annotations getAnnotationGroup(final String target) { - Annotations result = null; - for (Annotations annots : getAnnotationGroups()) { - if (target.equals(annots.getTarget())) { - result = annots; - } - } - return result; - } - - public Annotation getAnnotation(final String term) { - Annotation result = null; - for (Annotation annot : getAnnotations()) { - if (term.equals(annot.getTerm())) { - result = annot; - } - } - return result; - } - - public List<Annotation> getAnnotations() { - return annotations; - } - - 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(), 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/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java deleted file mode 100644 index e2e14f4..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.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.commons.api.edm.provider; - -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -public class Singleton extends BindingTarget { - - private static final long serialVersionUID = -3997943079062565895L; - - @Override - public Singleton setName(final String name) { - this.name = name; - return this; - } - - @Override - public Singleton setType(final String type) { - this.type = new FullQualifiedName(type); - return this; - } - - @Override - public Singleton setType(final FullQualifiedName type) { - this.type = type; - return this; - } - - @Override - public Singleton setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) { - this.navigationPropertyBindings = navigationPropertyBindings; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/StructuralType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/StructuralType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/StructuralType.java deleted file mode 100644 index 61d70c7..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/StructuralType.java +++ /dev/null @@ -1,122 +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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -public abstract class StructuralType extends AbstractEdmItem implements Named, Annotatable { - - private static final long serialVersionUID = 8662852373514258646L; - - protected String name; - - protected boolean isOpenType = false; - - protected FullQualifiedName baseType; - - protected boolean isAbstract; - - protected List<Property> properties = new ArrayList<Property>(); - - protected List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>(); - - protected final List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public StructuralType setName(final String name) { - this.name = name; - return this; - } - - public boolean isOpenType() { - return isOpenType; - } - - public StructuralType setOpenType(final boolean isOpenType) { - this.isOpenType = isOpenType; - return this; - } - - public String getBaseType() { - if (baseType != null) { - return baseType.getFullQualifiedNameAsString(); - } - return null; - } - - public FullQualifiedName getBaseTypeFQN() { - return baseType; - } - - public StructuralType setBaseType(final String baseType) { - this.baseType = new FullQualifiedName(baseType); - return this; - } - - public StructuralType setBaseType(final FullQualifiedName baseType) { - this.baseType = baseType; - return this; - } - - public boolean isAbstract() { - return isAbstract; - } - - public StructuralType setAbstract(final boolean isAbstract) { - this.isAbstract = isAbstract; - return this; - } - - public List<Property> getProperties() { - return properties; - } - - public Property getProperty(String name) { - return getOneByName(name, properties); - } - - public StructuralType setProperties(final List<Property> properties) { - this.properties = properties; - return this; - } - - public List<NavigationProperty> getNavigationProperties() { - return navigationProperties; - } - - public NavigationProperty getNavigationProperty(String name) { - return getOneByName(name, navigationProperties); - } - - public StructuralType setNavigationProperties(final List<NavigationProperty> navigationProperties) { - this.navigationProperties = navigationProperties; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Term.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Term.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Term.java deleted file mode 100644 index 45b9afe..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Term.java +++ /dev/null @@ -1,162 +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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.commons.api.edm.geo.SRID; - -public class Term extends AbstractEdmItem implements Named, Annotatable{ - - private static final long serialVersionUID = 3843929000407818103L; - - private String name; - - private String type; - - private String baseTerm; - - private List<String> appliesTo = new ArrayList<String>(); - - private boolean isCollection; - - // Facets - private String defaultValue; - - private boolean nullable = true; - - private Integer maxLength; - - private Integer precision; - - private Integer scale; - - private SRID srid; - - private List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public Term setName(final String name) { - this.name = name; - return this; - } - - public String getType() { - return type; - } - - public Term setType(final String type) { - this.type = type; - return this; - } - - public String getBaseTerm() { - return baseTerm; - } - - public Term setBaseTerm(final String baseTerm) { - this.baseTerm = baseTerm; - return this; - } - - public List<String> getAppliesTo() { - return appliesTo; - } - - public Term setAppliesTo(final List<String> appliesTo) { - this.appliesTo = appliesTo; - return this; - } - - public boolean isCollection() { - return isCollection; - } - - public Term setCollection(final boolean isCollection) { - this.isCollection = isCollection; - return this; - } - - public String getDefaultValue() { - return defaultValue; - } - - public Term setDefaultValue(final String defaultValue) { - this.defaultValue = defaultValue; - return this; - } - - public boolean isNullable() { - return nullable; - } - - public Term setNullable(final boolean nullable) { - this.nullable = nullable; - return this; - } - - public Integer getMaxLength() { - return maxLength; - } - - public Term setMaxLength(final Integer maxLength) { - this.maxLength = maxLength; - return this; - } - - public Integer getPrecision() { - return precision; - } - - public Term setPrecision(final Integer precision) { - this.precision = precision; - return this; - } - - public Integer getScale() { - return scale; - } - - public Term setScale(final Integer scale) { - this.scale = scale; - return this; - } - - public List<Annotation> getAnnotations() { - return annotations; - } - - public Term setAnnotations(final List<Annotation> annotations) { - this.annotations = annotations; - return this; - } - - public SRID getSrid() { - return srid; - } - - public Term setSrid(final SRID srid) { - this.srid = srid; - return this; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TypeDefinition.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TypeDefinition.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TypeDefinition.java deleted file mode 100644 index b886b1e..0000000 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TypeDefinition.java +++ /dev/null @@ -1,123 +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.commons.api.edm.provider; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.geo.SRID; - -public class TypeDefinition extends AbstractEdmItem implements Named, Annotatable { - - private static final long serialVersionUID = 3718980071229613048L; - - private String name; - - private FullQualifiedName underlyingType; - - // Facets - private Integer maxLength; - - private Integer precision; - - private Integer scale; - - private boolean unicode = true; - - private SRID srid; - - private final List<Annotation> annotations = new ArrayList<Annotation>(); - - public String getName() { - return name; - } - - public TypeDefinition setName(final String name) { - this.name = name; - return this; - } - - public String getUnderlyingType() { - if(underlyingType != null){ - return underlyingType.getFullQualifiedNameAsString(); - } - return null; - } - - public TypeDefinition setUnderlyingType(final String underlyingType) { - this.underlyingType = new FullQualifiedName(underlyingType); - return this; - } - - public TypeDefinition setUnderlyingType(final FullQualifiedName underlyingType) { - this.underlyingType = underlyingType; - return this; - } - - public Integer getMaxLength() { - return maxLength; - } - - public TypeDefinition setMaxLength(final Integer maxLength) { - this.maxLength = maxLength; - return this; - } - - public Integer getPrecision() { - return precision; - } - - public TypeDefinition setPrecision(final Integer precision) { - this.precision = precision; - return this; - } - - public Integer getScale() { - return scale; - } - - public TypeDefinition setScale(final Integer scale) { - this.scale = scale; - return this; - } - - public boolean isUnicode() { - return unicode; - } - - public TypeDefinition setUnicode(final boolean unicode) { - this.unicode = unicode; - return this; - } - - public SRID getSrid() { - return srid; - } - - public TypeDefinition setSrid(final SRID srid) { - this.srid = srid; - return this; - } - - @Override - public List<Annotation> getAnnotations() { - return annotations; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java index 0cea344..1490b89 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java @@ -20,9 +20,9 @@ package org.apache.olingo.commons.api.edm.provider.annotation; import java.util.List; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface Apply extends DynamicAnnotationExpression, Annotatable { +public interface Apply extends DynamicAnnotationExpression, CsdlAnnotatable { String getFunction(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java index a091fe0..49011f3 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java @@ -19,9 +19,9 @@ package org.apache.olingo.commons.api.edm.provider.annotation; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface Cast extends DynamicAnnotationExpression, Annotatable { +public interface Cast extends DynamicAnnotationExpression, CsdlAnnotatable { Integer getMaxLength(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java index 86661c2..e035efe 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.commons.api.edm.provider.annotation; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface If extends DynamicAnnotationExpression, Annotatable { +public interface If extends DynamicAnnotationExpression, CsdlAnnotatable { AnnotationExpression getGuard(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java index 6bbc6b5..c66374c 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java @@ -19,9 +19,9 @@ package org.apache.olingo.commons.api.edm.provider.annotation; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface IsOf extends DynamicAnnotationExpression, Annotatable { +public interface IsOf extends DynamicAnnotationExpression, CsdlAnnotatable { Integer getMaxLength(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java index 2f1aace..f2c5eaa 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.commons.api.edm.provider.annotation; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface LabeledElement extends DynamicAnnotationExpression, Annotatable { +public interface LabeledElement extends DynamicAnnotationExpression, CsdlAnnotatable { String getName(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java index 40345ee..a986fff 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.commons.api.edm.provider.annotation; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface Null extends DynamicAnnotationExpression, Annotatable { +public interface Null extends DynamicAnnotationExpression, CsdlAnnotatable { //No additional methods needed for now. } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java index acdf92e..d33ed9a 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.commons.api.edm.provider.annotation; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface PropertyValue extends DynamicAnnotationExpression, Annotatable { +public interface PropertyValue extends DynamicAnnotationExpression, CsdlAnnotatable { String getProperty(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java index 1344c30..10f2352 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java @@ -20,9 +20,9 @@ package org.apache.olingo.commons.api.edm.provider.annotation; import java.util.List; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface Record extends DynamicAnnotationExpression, Annotatable { +public interface Record extends DynamicAnnotationExpression, CsdlAnnotatable { List<PropertyValue> getPropertyValues();
