You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/05/22 13:43:24 UTC
[16/51] [abbrv] [partial] Removing /ODataJClient: merge complete
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/entityType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/entityType.vm b/ODataJClient/maven-plugin/src/main/resources/entityType.vm
deleted file mode 100644
index 1b11e75..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/entityType.vm
+++ /dev/null
@@ -1,109 +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.
- *#
-#set( $clsSuffix = ".class" )
-package ${package};
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-#if( $keyRef )@KeyRef(${keyRef}.class)#end
-
-@Namespace("$namespace")
-@EntityType(name = "$entityType.Name",
- openType = $entityType.isOpenType(),
- hasStream = $entityType.isHasStream(),
- isAbstract = $entityType.isAbstractEntityType(),
- baseType = "#if($utility.isNotBlank())$entityType.getBaseType()#end")
-#set($baseTypeName = ${schemaName})
-public interface $utility.capitalize($entityType.Name) extends #if( $baseType )$baseType#{elseif}( $entityType.isOpenType() )AbstractOpenType#{else}Serializable#end {
-
-#set( $keys = [] )
-#foreach($key in $entityType.Key.PropertyRefs)
- #if(!$keys.add($key.Name)) #stop #end
-#end
-
-#foreach($property in $entityType.Properties)
- #set($fcprops = $utility.getFcProperties($property) )
- #if($keys.contains($property.Name))@Key#end
-
- @Property(name = "$property.Name",
- type = "$property.Type",
- nullable = $property.Nullable,
- defaultValue = "#if($property.getDefaultValue())$property.getDefaultValue()#end",
- maxLenght = #if($property.getMaxLength() && !$property.getMaxLength().equalsIgnoreCase("max"))$property.getMaxLength()#{else}Integer.MAX_VALUE#end,
- fixedLenght = #if($property.isFixedLength())$property.isFixedLength()#{else}false#end,
- precision = #if($property.getPrecision())$property.getPrecision()#{else}0#end,
- scale = #if($property.getScale())$property.getScale()#{else}0#end,
- unicode = #if($property.isUnicode())$property.isUnicode()#{else}false#end,
- collation = "#if($property.getCollation())$property.getCollation()#end",
- srid = "#if($property.getSRID())$property.getSRID()#end",
- concurrencyMode = #if($property.getConcurrencyMode())ConcurrencyMode.$property.getConcurrencyMode()#{else}ConcurrencyMode.None#end,
- fcSourcePath = "#if($fcprops.containsKey("fcSourcePath"))$fcprops.get("fcSourcePath")#end",
- fcTargetPath = "#if($fcprops.containsKey("fcTargetPath"))$fcprops.get("fcTargetPath")#end",
- fcContentKind = #if($fcprops.containsKey("fcContentKind"))EdmContentKind.$fcprops.get("fcContentKind")#{else}EdmContentKind.text#end,
- fcNSPrefix = "#if($fcprops.containsKey("fcNSPrefix"))$fcprops.get("fcNSPrefix")#end",
- fcNSURI = "#if($fcprops.containsKey("fcNSURI"))$fcprops.get("fcNSURI")#end",
- fcKeepInContent = #if($fcprops.containsKey("fcKeepInContent"))$fcprops.get("fcKeepInContent")#{else}false#end)
- public $utility.getJavaType($property.Type) get$utility.capitalize($property.Name)();
-
- public void set$utility.capitalize($property.Name)(final $utility.getJavaType($property.Type) _$utility.uncapitalize($property.Name));
-
-#end
-
-#parse( "${odataVersion}/entityType.vm" )
-
-#if($entityType.isHasStream())
- public void setStream(java.io.InputStream stream);
-
- public java.io.InputStream getStream();
-#end
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/entityTypeKey.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/entityTypeKey.vm b/ODataJClient/maven-plugin/src/main/resources/entityTypeKey.vm
deleted file mode 100644
index 10d29e9..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/entityTypeKey.vm
+++ /dev/null
@@ -1,70 +0,0 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *#
-package ${package};
-
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityKey;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@CompoundKey
-public class $keyRef extends AbstractEntityKey {
-#set ( $count = 0 )
-#foreach ($entry in $keys.entrySet())
-
- private $entry.getValue() _$utility.uncapitalize($entry.getKey());
-
- @CompoundKeyElement(name = "$entry.getKey()", position = $count)
- public $entry.getValue() get$utility.capitalize($entry.getKey())() {
- return _$utility.uncapitalize($entry.getKey());
- }
-
- public void set$utility.capitalize($entry.getKey())(final $entry.getValue() _$utility.uncapitalize($entry.getKey())) {
- this._$utility.uncapitalize($entry.getKey()) = _$utility.uncapitalize($entry.getKey());
- }#*
- *##set ( $count = $count + 1 )
-
-#end}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/enumType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/enumType.vm b/ODataJClient/maven-plugin/src/main/resources/enumType.vm
deleted file mode 100644
index 09343de..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/enumType.vm
+++ /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 ${package};
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EnumType;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-
-#set( $enumName = $utility.capitalize($enumType.Name) )
-#set( $count = $enumType.Members.size() )
-#if( $enumType.UnderlyingType )
- #set( $javatype = $utility.getJavaType($enumType.UnderlyingType) )
-#else
- #set( $javatype = $utility.getJavaType("Edm.Int32") )
-#end
-
-@Namespace("$namespace")
-@EnumType(name = "$enumType.Name",
- #if( $enumType.UnderlyingType )underlyingType = EdmSimpleType.$utility.getEdmSimpleType($enumType.UnderlyingType).name(),
- #{end}isFlags = $enumType.Flags)
-public enum $enumName {
-#foreach ($member in $enumType.Members)#*
- *##set( $count = $count - 1 )
- $member.Name#if( $member.Value )($member.Value)#set( $valued = 1 )#end#if( $count > 0 ),#elseif( $count <= 0 );#end
-
-#end
-
-#if( $valued )
- private $javatype value;
-
- public $javatype getValue(){
- return this.value;
- }
-
- private $enumName($javatype value){
- this.value=value;
- }
-#end
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/package-info.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/package-info.vm b/ODataJClient/maven-plugin/src/main/resources/package-info.vm
deleted file mode 100644
index ce11c6a..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/package-info.vm
+++ /dev/null
@@ -1,20 +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 $package;
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/services.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/services.vm b/ODataJClient/maven-plugin/src/main/resources/services.vm
deleted file mode 100644
index 94480f3..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/services.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#foreach ($service in $services)
-$service
-#end
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/singleton.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/singleton.vm b/ODataJClient/maven-plugin/src/main/resources/singleton.vm
deleted file mode 100644
index 8028d51..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/singleton.vm
+++ /dev/null
@@ -1,49 +0,0 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *#
-package ${package};
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.Singleton;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-#parse( "${odataVersion}/singleton.vm" )
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v3/container.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v3/container.vm b/ODataJClient/maven-plugin/src/main/resources/v3/container.vm
deleted file mode 100644
index 6b71e30..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v3/container.vm
+++ /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.
- *#
-#foreach($operation in $container.FunctionImports)
- #if( !$operation.isIsBindable() )
- @Operation(name = "$operation.Name" #if($operation.EntitySet),
- entitySet = $operation.EntitySet$clsSuffix#end #if($operation.EntitySetPath),
- entitySetPath = $operation.EntitySetPath#end #if($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end #if($operation.isIsSideEffecting),
- isSideEffecting = $operation.isIsSideEffecting#end #if($operation.HttpMethod),
- httpMethod = HttpMethod.$operation.HttpMethod#end #if($operation.ReturnType),
- returnType = "$operation.ReturnType"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if ($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end#*
- *##end);
- #end
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v3/entityCollection.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v3/entityCollection.vm b/ODataJClient/maven-plugin/src/main/resources/v3/entityCollection.vm
deleted file mode 100644
index 9c168ac..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v3/entityCollection.vm
+++ /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.
- *#
-#foreach($operation in $utility.getFunctionImportsBoundTo($entityType.Name, true))
- @Operation(name = "$operation.Name" #if ($operation.EntitySet),
- entitySet = $operation.EntitySet$clsSuffix#end #if ($operation.EntitySetPath),
- entitySetPath = $operation.EntitySetPath#end #if ($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end #if ($operation.isIsSideEffecting),
- isSideEffecting = $operation.isIsSideEffecting#end #if ($operation.HttpMethod),
- httpMethod = HttpMethod.$operation.HttpMethod#end #if ($operation.ReturnType),
- returnType = "$operation.ReturnType"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, true) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if ($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v3/entitySet.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v3/entitySet.vm b/ODataJClient/maven-plugin/src/main/resources/v3/entitySet.vm
deleted file mode 100644
index 86f2bad..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v3/entitySet.vm
+++ /dev/null
@@ -1,19 +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.
- *#
-@EntitySet(name = "$entitySet.Name")
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v3/entityType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v3/entityType.vm b/ODataJClient/maven-plugin/src/main/resources/v3/entityType.vm
deleted file mode 100644
index 0027353..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v3/entityType.vm
+++ /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.
- *#
-#foreach($property in $entityType.NavigationProperties)
- #set( $type = $utility.getNavigationType($property) )
- #set( $binding = $utility.getNavigationBindingDetails($property) )
-
- @NavigationProperty(name = "$property.Name",
- type = "$type",
- targetSchema = "$binding.Schema.Namespace",
- targetContainer = "$binding.Container.Name",
- targetEntitySet = "$binding.EntitySet.Name")
- public $utility.getJavaType($type) get$utility.capitalize($property.Name)();
-
- public void set$utility.capitalize($property.Name)(final $utility.getJavaType($type) _$utility.uncapitalize($property.Name));
-
-#end
-
-#foreach($operation in $utility.getFunctionImportsBoundTo($entityType.Name, false))
- @Operation(name = "$operation.Name" #if($operation.EntitySet),
- entitySet = $operation.EntitySet$clsSuffix#end #if($operation.EntitySetPath),
- entitySetPath = $operation.EntitySetPath#end #if($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end #if($operation.isIsSideEffecting),
- isSideEffecting = $operation.isIsSideEffecting#end #if($operation.HttpMethod),
- httpMethod = HttpMethod.$operation.HttpMethod#end #if($operation.ReturnType),
- returnType = "$operation.ReturnType"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/container.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/container.vm b/ODataJClient/maven-plugin/src/main/resources/v4/container.vm
deleted file mode 100644
index 8b54fd2..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/container.vm
+++ /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.
- *#
-#foreach($operation in $container.FunctionImports)
-#set( $function = $utility.getFunctionByName($operation.Function) )
- @Operation(name = "$function.Name",
- isSideEffecting = false#if($function.EntitySetPath),
- entitySetPath = "$function.EntitySetPath"#end#if($function.isIsComposable),
- isComposable = $function.isIsComposable#end#if($function.ReturnType),
- returnType = "$function.ReturnType.Type"#end)
- #if($function.ReturnType)$utility.getJavaType($function.ReturnType.Type)#{else}void#end $utility.uncapitalize($function.Name)(
- #if($function.Parameters)
- #set( $count = $function.Parameters.size() )#*
- *##foreach($param in $function.Parameters)#*
- *##set( $count = $count - 1 )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if ($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end#*
- *##end);
-#end
-
-#foreach($operation in $container.ActionImports)
-#set( $action = $utility.getActionByName($operation.Action) )
- @Operation(name = "$action.Name",
- httpMethod = HttpMethod.POST#if($action.EntitySetPath),
- entitySetPath = "$action.EntitySetPath"#end#if($action.ReturnType),
- returnType = "$action.ReturnType.Type"#end)
- #if($action.ReturnType)$utility.getJavaType($action.ReturnType.Type)#{else}void#end $utility.uncapitalize($action.Name)(
- #if($action.Parameters)
- #set( $count = $action.Parameters.size() )#*
- *##foreach($param in $action.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/entityCollection.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/entityCollection.vm b/ODataJClient/maven-plugin/src/main/resources/v4/entityCollection.vm
deleted file mode 100644
index de5b1af..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/entityCollection.vm
+++ /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.
- *#
-#foreach($operation in $utility.getFunctionsBoundTo($entityType.Name, true))
- @Operation(name = "$operation.Name",
- isSideEffecting = false#if($operation.EntitySetPath),
- entitySetPath = "$operation.EntitySetPath"#end#if($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end#if($operation.ReturnType),
- returnType = "$operation.ReturnType.Type"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
-
-#foreach($operation in $utility.getActionsBoundTo($entityType.Name, true))
- @Operation(name = "$operation.Name",
- httpMethod = HttpMethod.POST#if($operation.EntitySetPath),
- entitySetPath = "$operation.EntitySetPath"#end#if($operation.ReturnType),
- returnType = "$operation.ReturnType.Type"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/entitySet.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/entitySet.vm b/ODataJClient/maven-plugin/src/main/resources/v4/entitySet.vm
deleted file mode 100644
index b6a8c91..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/entitySet.vm
+++ /dev/null
@@ -1,19 +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.
- *#
-@EntitySet(name = "$entitySet.Name", includeInServiceDocument = $entitySet.isIncludeInServiceDocument())
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/entityType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/entityType.vm b/ODataJClient/maven-plugin/src/main/resources/v4/entityType.vm
deleted file mode 100644
index f7ac0c1..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/entityType.vm
+++ /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.
- *#
-#foreach($property in $entityType.NavigationProperties)
- #set( $type = $utility.getNavigationType($property) )
- #set( $binding = $utility.getNavigationBindingDetails("${schemaName}.${entityType.Name}", $property) )
-
- @NavigationProperty(name = "$property.Name",
- type = "$type",
- targetSchema = "$binding.Schema.Namespace",
- targetContainer = "$binding.Container.Name",
- targetEntitySet = "$binding.EntitySet.Name")
- public $utility.getJavaType($type) get$utility.capitalize($property.Name)();
-
- public void set$utility.capitalize($property.Name)(final $utility.getJavaType($type) _$utility.uncapitalize($property.Name));
-
-#end
-
-#foreach($operation in $utility.getFunctionsBoundTo($entityType.Name, false))
- @Operation(name = "$operation.Name",
- isSideEffecting = false#if($operation.EntitySetPath),
- entitySetPath = "$operation.EntitySetPath"#end#if($operation.ReturnType),
- returnType = "$operation.ReturnType.Type"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
-
-#foreach($operation in $utility.getActionsBoundTo($entityType.Name, false))
- @Operation(name = "$operation.Name",
- httpMethod = HttpMethod.POST#if($operation.EntitySetPath),
- entitySetPath = "$operation.EntitySetPath"#end#if($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end#if($operation.ReturnType),
- returnType = "$operation.ReturnType.Type"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/singleton.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/singleton.vm b/ODataJClient/maven-plugin/src/main/resources/v4/singleton.vm
deleted file mode 100644
index bdad839..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/singleton.vm
+++ /dev/null
@@ -1,37 +0,0 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *#
-#set( $keys = $utility.getEntityKeyType($singleton) )
-#if( $keys.size() > 1 )
- #set( $type = $utility.getEdmType($singleton).EntityType.Name + "Key" )
-#elseif( $keys.size() == 1 )
- #set( $type = $keys.values().iterator().next() )
-#else
- #set( $type = "" )
-#end
-
-@Singleton(name = "$singleton.Name")
-public interface $utility.capitalize($singleton.Name) extends AbstractEntitySet<$utility.getJavaType($singleton.Type), $type, $utility.getJavaType($singleton.Type)Collection> {
-
-#foreach( $dos in $utility.getDescendantsOrSelf($utility.getEdmType($singleton)) )
- #set( $djt = $utility.getJavaType($dos) )
- #set( $sIdx = $djt.lastIndexOf('.') + 1 )
- $djt new$djt.substring($sIdx)();
- ${djt}Collection new$djt.substring($sIdx)Collection();
-#end
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/pom.xml b/ODataJClient/pom.xml
deleted file mode 100644
index 0b37e23..0000000
--- a/ODataJClient/pom.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <name>Client OData library for Java</name>
- <description>Java client API for OData 3.0 services</description>
-
- <url>https://github.com/MSOpenTech/ODataJClient</url>
-
- <inceptionYear>2013</inceptionYear>
-
- <organization>
- <name>MS OpenTech</name>
- <url>http://msopentech.com/</url>
- </organization>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <id>eduardk</id>
- <name>Eduard Koller</name>
- <email>eduardk@microsoft.com</email>
- </developer>
- <developer>
- <id>ilgrosso</id>
- <name> Francesco Chicchiriccò</name>
- <email>francesco.chicchiricco@tirasa.net</email>
- </developer>
- <developer>
- <id>fmartelli</id>
- <name>Fabio Martelli</name>
- <email>fabio.martelli@tirasa.net</email>
- </developer>
- </developers>
-
- <scm>
- <url>https://github.com/MSOpenTech/ODataJClient.git</url>
- <connection>scm:git:git@github.com:MSOpenTech/ODataJClient.git</connection>
- <developerConnection>scm:git:git@github.com:MSOpenTech/ODataJClient.git</developerConnection>
- <tag>HEAD</tag>
- </scm>
-
- <prerequisites>
- <maven>[3.0.3,)</maven>
- </prerequisites>
-
- <properties>
- <targetJdk>1.6</targetJdk>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <hc.client.version>4.2.6</hc.client.version>
- <jackson.version>2.3.1</jackson.version>
-
- <commons.io.version>2.4</commons.io.version>
- <commons.lang3.version>3.2.1</commons.lang3.version>
- <commons.beanutils.version>1.8.3</commons.beanutils.version>
-
- <sl4j.version>1.7.5</sl4j.version>
-
- <velocity.version>1.7</velocity.version>
-
- <maven.plugin.api.version>3.1.0</maven.plugin.api.version>
- <maven.plugin.tools.version>3.2</maven.plugin.tools.version>
-
- <skip.it.tests>true</skip.it.tests>
- <main.basedir>${project.basedir}</main.basedir>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons.lang3.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>${commons.beanutils.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${hc.client.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
- <version>0.9.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>${velocity.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven.plugin.api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>${maven.plugin.tools.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${sl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${sl4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>junit-benchmarks</artifactId>
- <version>0.7.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>${targetJdk}</source>
- <target>${targetJdk}</target>
- <showWarnings>true</showWarnings>
- <showDeprecation>true</showDeprecation>
- <!--<compilerArgument>-Xlint:unchecked</compilerArgument>-->
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>jarjar-maven-plugin</artifactId>
- <version>1.8</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.8</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <encoding>utf-8</encoding>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <skipTests>${skip.it.tests}</skipTests>
-
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <encoding>utf-8</encoding>
- <runOrder>alphabetical</runOrder>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- </plugin>
-
- <!-- mvn release:prepare && mvn release:perform -Dgoals=install -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <tagNameFormat>odatajclient-@{project.version}</tagNameFormat>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.10.b1</version>
- <configuration>
- <header>${main.basedir}/src/main/resources/header.txt</header>
- <strictCheck>true</strictCheck>
- <failIfMissing>true</failIfMissing>
- <aggregate>true</aggregate>
- <useDefaultExcludes>true</useDefaultExcludes>
- <useDefaultMapping>true</useDefaultMapping>
- <excludes>
- <exclude>LICENSE</exclude>
- <exclude>nb*.xml</exclude>
- <exclude>**/META-INF/services/**</exclude>
- <exclude>**/META-INF/MANIFEST.MF</exclude>
- <exclude>**/*.css</exclude>
- <exclude>**/*.js</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.csv</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.xls</exclude>
- <exclude>**/build-copy-javadoc-files.xml</exclude>
- <exclude>**/maven-eclipse.xml</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.log</exclude>
- <exclude>.externalToolBuilders/**</exclude>
- <exclude>.git/**</exclude>
- <exclude>.idea/**</exclude>
- <exclude>**/.*</exclude>
- <exclude>yworks*/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>check-headers</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- Put LICENSE file in all javadoc artifacts -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-javadoc-legal-files</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/apidocs/META-INF</outputDirectory>
- <resources>
- <resource>
- <directory>..</directory>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if any artifacts are missing legal files -->
- <strict>true</strict>
- <requiredFiles>
- <requiredFile>LICENSE</requiredFile>
- </requiredFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
-
- <properties>
- <skip.it.tests>false</skip.it.tests>
-
- <log.directory>${project.build.directory}/log</log.directory>
-
- <tomcat.version>7.0.47</tomcat.version>
-
- <cargo.servlet.port>9080</cargo.servlet.port>
- <cargo.tomcat.ajp.port>9889</cargo.tomcat.ajp.port>
- <cargo.rmi.port>9805</cargo.rmi.port>
- <cargo.log>${log.directory}/cargo.log</cargo.log>
- <cargo.output>${log.directory}/cargo-output.log</cargo.output>
- </properties>
-
- <build>
- <defaultGoal>clean install</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>enforce-property</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>test.base.url</property>
- <message>You must set 'test.base.url' property!</message>
- <regex>http(s)?://.*</regex>
- <regexMessage>The test.base.url property must be a valid HTTP(S) URL.</regexMessage>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.7</version>
- <configuration>
- <container>
- <containerId>tomcat7x</containerId>
- <zipUrlInstaller>
- <url>http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
- <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
- <extractDir>${project.build.directory}/cargo/extract</extractDir>
- </zipUrlInstaller>
- <log>${cargo.log}</log>
- <output>${cargo.output}</output>
- </container>
- <configuration>
- <type>standalone</type>
- <properties>
- <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
- <cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
- <cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
-
- <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs>-->
- <cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
- </properties>
- <files>
- <file>
- <file>${project.build.directory}/test-classes/esigate.properties</file>
- <todir>lib</todir>
- </file>
- </files>
- <configfiles>
- <configfile>
- <file>${project.build.directory}/test-classes/context.xml</file>
- <todir>conf/</todir>
- <tofile>context.xml</tofile>
- </configfile>
- <configfile>
- <file>${project.build.directory}/test-classes/tomcat-users.xml</file>
- <todir>conf/</todir>
- <tofile>tomcat-users.xml</tofile>
- </configfile>
- </configfiles>
- </configuration>
- <deployables>
- <deployable>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-test-service</artifactId>
- <type>war</type>
- <properties>
- <context>/</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>test-service</module>
- </modules>
- </profile>
-
- <profile>
- <id>nexus-release-profile</id>
- <distributionManagement>
- <snapshotRepository>
- <id>sonatype-nexus-snapshots</id>
- <name>Sonatype Nexus Snapshots</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- <repository>
- <id>sonatype-nexus-staging</id>
- <name>Nexus Release Repository</name>
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository>
- </distributionManagement>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <mavenExecutorId>forked-path</mavenExecutorId>
- </configuration>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <modules>
- <module>maven-plugin</module>
- <module>engine-xml</module>
- <module>engine</module>
- <module>extensions</module>
- <module>proxy</module>
- </modules>
-
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/pom.xml b/ODataJClient/proxy/pom.xml
deleted file mode 100644
index 74cd27f..0000000
--- a/ODataJClient/proxy/pom.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
-
- <name>Client OData library for Java: Proxy </name>
- <description>Java client API for OData 3.0 services: Proxy</description>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <packaging>jar</packaging>
-
- <properties>
- <main.basedir>${project.parent.basedir}</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>junit-benchmarks</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>**/*PerfTestITCase.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-test-service</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- </testResource>
- <testResource>
- <directory>${basedir}/../test-service/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>perf</id>
-
- <properties>
- <skip.it.tests>false</skip.it.tests>
- </properties>
-
- <build>
- <defaultGoal>clean verify</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <systemPropertyVariables>
- <propertyName>org.slf4j.simpleLogger.defaultLogLevel</propertyName>
- <org.slf4j.simpleLogger.defaultLogLevel>ERROR</org.slf4j.simpleLogger.defaultLogLevel>
- </systemPropertyVariables>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>perf-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/*PerfTestITCase.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractComplexType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractComplexType.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractComplexType.java
deleted file mode 100644
index 79043d5..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractComplexType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public abstract class AbstractComplexType implements Serializable {
-
- private static final long serialVersionUID = 5894564747020768401L;
-
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractContainer.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractContainer.java
deleted file mode 100644
index 41a72a6..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractContainer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-
-/**
- * Interface for container operations.
- */
-public abstract interface AbstractContainer extends Serializable {
-
- /**
- * Flushes all pending changes to the OData service.
- */
- void flush();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityCollection.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityCollection.java
deleted file mode 100644
index 31b3eeb..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityCollection.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-public abstract interface AbstractEntityCollection<T extends Serializable> extends Collection<T>, Serializable {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityKey.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityKey.java
deleted file mode 100644
index 04df4ed..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityKey.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 com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public abstract class AbstractEntityKey implements Serializable {
-
- private static final long serialVersionUID = 1662634743346775238L;
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntitySet.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntitySet.java
deleted file mode 100644
index 74f5948..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntitySet.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-
-/**
- * Interface for synchronous CRUD operations on an EntitySet.
- */
-public abstract interface AbstractEntitySet<
- T extends Serializable, KEY extends Serializable, EC extends AbstractEntityCollection<T>>
- extends Iterable<T>, Serializable {
-
- /**
- * Returns whether an entity with the given id exists.
- *
- * @param key must not be null
- * @return true if an entity with the given id exists, false otherwise
- * @throws IllegalArgumentException in case the given key is null
- */
- Boolean exists(KEY key) throws IllegalArgumentException;
-
- /**
- * Retrieves an entity by its key.
- *
- * @param key must not be null
- * @return the entity with the given id or null if none found
- * @throws IllegalArgumentException in case the given key is null
- */
- T get(KEY key) throws IllegalArgumentException;
-
- /**
- * Retrieves an entity by its key, considering polymorphism.
- *
- * @param key must not be null
- * @param reference entity class to be returned
- * @return the entity with the given id or null if none found
- * @throws IllegalArgumentException in case the given key is null
- */
- <S extends T> S get(KEY key, Class<S> reference) throws IllegalArgumentException;
-
- /**
- * Returns the number of entities available.
- *
- * @return the number of entities
- */
- Long count();
-
- /**
- * Returns all instances.
- *
- * @return all entities
- */
- EC getAll();
-
- /**
- * Returns all instances of the given subtype.
- *
- * @param reference entity collection class to be returned
- * @return all entities of the given subtype
- */
- <S extends T, SEC extends AbstractEntityCollection<S>> SEC getAll(Class<SEC> reference);
-
- /**
- * Deletes the entity with the given key.
- *
- * @param key must not be null
- * @throws IllegalArgumentException in case the given key is null
- */
- void delete(KEY key) throws IllegalArgumentException;
-
- /**
- * Deletes the given entities in a batch.
- *
- * @param entities to be deleted
- */
- <S extends T> void delete(Iterable<S> entities);
-
- /**
- * Create an instance of <tt>Query</tt>.
- *
- * @return the new query instance
- */
- Query<T, EC> createQuery();
-
- /**
- * Create an instance of <tt>Query</tt>.
- *
- * @return the new query instance
- */
- <S extends T, SEC extends AbstractEntityCollection<S>> Query<S, SEC> createQuery(Class<SEC> reference);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractOpenType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractOpenType.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractOpenType.java
deleted file mode 100644
index 5ddbe25..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractOpenType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-public abstract interface AbstractOpenType extends Serializable {
-
- void addAdditionalProperty(String name, Object value);
-
- Object getAdditionalProperty(String name);
-
- Collection<String> getAdditionalPropertyNames();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AsyncCall.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AsyncCall.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AsyncCall.java
deleted file mode 100644
index e21e069..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AsyncCall.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.proxy.api;
-
-import com.msopentech.odatajclient.engine.client.Configuration;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public abstract class AsyncCall<V> implements Future<V> {
-
- private final Future<V> future;
-
- public AsyncCall(final Configuration configuration) {
- this.future = configuration.getExecutor().submit(new Callable<V>() {
-
- @Override
- public V call() throws Exception {
- return AsyncCall.this.call();
- }
- });
- }
-
- public abstract V call();
-
- @Override
- public boolean cancel(final boolean mayInterruptIfRunning) {
- return this.future.cancel(mayInterruptIfRunning);
- }
-
- @Override
- public boolean isCancelled() {
- return this.future.isCancelled();
- }
-
- @Override
- public boolean isDone() {
- return this.future.isDone();
- }
-
- @Override
- public V get() throws InterruptedException, ExecutionException {
- return this.future.get();
- }
-
- @Override
- public V get(final long timeout, final TimeUnit unit)
- throws InterruptedException, ExecutionException, TimeoutException {
-
- return this.future.get(timeout, unit);
- }
-}