Apache/olingo-odata4
1
0
Fork 0
mirror of https://github.com/apache/olingo-odata4.git synced 2025-03-04 15:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into olingo200

Browse Source
This commit is contained in:
Francesco Chicchiriccò 2014-03-11 14:28:55 +01:00
commit 4bcc996472
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/ConcurrencyMode.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.odata4.client.api.edm;
package org.apache.olingo.client.api.edm;
public enum ConcurrencyMode {

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/StoreGeneratedPattern.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.odata4.client.api.edm;
package org.apache.olingo.client.api.edm;
public enum StoreGeneratedPattern {

4
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java
View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.client.api.edm.StoreGeneratedPattern;
import org.apache.olingo.client.api.edm.xml.CommonProperty;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.odata4.client.api.edm.ConcurrencyMode;
import org.apache.olingo.odata4.client.api.edm.StoreGeneratedPattern;
public interface Property extends CommonProperty {

14
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java
View File

@ -18,20 +18,20 @@
*/
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.client.api.edm.StoreGeneratedPattern;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.odata4.client.api.edm.ConcurrencyMode;
import org.apache.olingo.odata4.client.api.edm.StoreGeneratedPattern;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
public class PropertyDeserializer extends AbstractEdmDeserializer<AbstractProperty> {

4
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java
View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.client.api.edm.StoreGeneratedPattern;
import org.apache.olingo.client.api.edm.xml.v3.Property;
import org.apache.olingo.client.core.edm.xml.AbstractProperty;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.odata4.client.api.edm.ConcurrencyMode;
import org.apache.olingo.odata4.client.api.edm.StoreGeneratedPattern;
public class PropertyImpl extends AbstractProperty implements Property {