Moving some classes to more appropriate packages

This commit is contained in:
Francesco Chicchiriccò 2014-03-24 08:24:39 +01:00
parent c876e67076
commit 9b3e4ebfc9
46 changed files with 35 additions and 58 deletions

View File

@ -18,7 +18,6 @@
*/
package org.apache.olingo.client.core.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.net.URI;
@ -38,11 +37,10 @@ public class JSONEntryImpl extends AbstractEntry {
private String mediaETag;
public void setId(String id) throws ParseException {
public void setId(final String id) throws ParseException {
this.setCommonProperty("id", id);
}
@JsonIgnore
@Override
public URI getBaseURI() {
URI baseURI = null;

View File

@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty;
import org.apache.olingo.client.api.edm.xml.CommonProperty;
import org.apache.olingo.client.api.edm.xml.ComplexType;
import org.apache.olingo.client.core.op.ComplexTypeDeserializer;
@JsonDeserialize(using = ComplexTypeDeserializer.class)
public abstract class AbstractComplexType extends AbstractEdmItem implements ComplexType {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.core.op;
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;

View File

@ -25,7 +25,6 @@ import java.util.List;
import org.apache.olingo.client.api.edm.xml.CommonFunctionImport;
import org.apache.olingo.client.api.edm.xml.EntityContainer;
import org.apache.olingo.client.api.edm.xml.EntitySet;
import org.apache.olingo.client.core.op.EntityContainerDeserializer;
@JsonDeserialize(using = EntityContainerDeserializer.class)
public abstract class AbstractEntityContainer extends AbstractEdmItem implements EntityContainer {

View File

@ -21,7 +21,6 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.apache.olingo.client.api.edm.xml.EntitySet;
import org.apache.olingo.client.core.op.EntitySetDeserializer;
@JsonDeserialize(using = EntitySetDeserializer.class)
public abstract class AbstractEntitySet extends AbstractEdmItem implements EntitySet {

View File

@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.apache.olingo.client.api.edm.xml.EntityKey;
import org.apache.olingo.client.api.edm.xml.EntityType;
import org.apache.olingo.client.core.op.EntityTypeDeserializer;
@JsonDeserialize(using = EntityTypeDeserializer.class)
public abstract class AbstractEntityType extends AbstractComplexType implements EntityType {

View File

@ -25,7 +25,6 @@ import java.util.List;
import org.apache.olingo.client.api.edm.xml.EnumType;
import org.apache.olingo.client.api.edm.xml.Member;
import org.apache.olingo.client.core.op.EnumTypeDeserializer;
@JsonDeserialize(using = EnumTypeDeserializer.class)
public abstract class AbstractEnumType extends AbstractEdmItem implements EnumType {

View File

@ -24,7 +24,6 @@ import org.apache.olingo.client.api.edm.xml.ComplexType;
import org.apache.olingo.client.api.edm.xml.EntityType;
import org.apache.olingo.client.api.edm.xml.EnumType;
import org.apache.olingo.client.api.edm.xml.Schema;
import org.apache.olingo.client.core.op.SchemaDeserializer;
@JsonDeserialize(using = SchemaDeserializer.class)
public abstract class AbstractSchema extends AbstractEdmItem implements Schema {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.core.op;
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractComplexType;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;

View File

@ -18,7 +18,6 @@
*/
package org.apache.olingo.client.core.edm.xml;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import com.fasterxml.jackson.core.JsonParser;

View File

@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml;
import org.apache.olingo.client.core.edm.xml.v4.ReferenceImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import com.fasterxml.jackson.core.JsonParser;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.core.op;
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEntityContainer;
import org.apache.olingo.client.core.edm.xml.v3.AssociationSetImpl;
import org.apache.olingo.client.core.edm.xml.v4.ActionImportImpl;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.core.op;
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -25,9 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.EntityKeyImpl;
import org.apache.olingo.client.core.edm.xml.PropertyRefImpl;
public class EntityKeyDeserializer extends AbstractEdmDeserializer<EntityKeyImpl> {
@Override

View File

@ -25,7 +25,6 @@ import java.util.List;
import org.apache.olingo.client.api.edm.xml.EntityKey;
import org.apache.olingo.client.api.edm.xml.PropertyRef;
import org.apache.olingo.client.core.op.EntityKeyDeserializer;
@JsonDeserialize(using = EntityKeyDeserializer.class)
public class EntityKeyImpl extends AbstractEdmItem implements EntityKey {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.core.op;
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEntitySet;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.edm.xml.v4.NavigationPropertyBindingImpl;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.core.op;
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -26,8 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEntityType;
import org.apache.olingo.client.core.edm.xml.EntityKeyImpl;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.core.op;
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEnumType;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;

View File

@ -27,7 +27,6 @@ import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.api.edm.xml.v3.ParameterMode;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
public class ParameterDeserializer extends AbstractEdmDeserializer<AbstractParameter> {

View File

@ -24,7 +24,6 @@ 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.AbstractEdmDeserializer;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.core.op;
package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.AbstractSchema;
import org.apache.olingo.client.core.edm.xml.v3.AssociationImpl;
import org.apache.olingo.client.core.edm.xml.v3.UsingImpl;
import org.apache.olingo.client.core.edm.xml.v3.ValueTermImpl;

View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> {

View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class AssociationDeserializer extends AbstractEdmDeserializer<AssociationImpl> {

View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class AssociationSetDeserializer extends AbstractEdmDeserializer<AssociationSetImpl> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class FunctionImportDeserializer extends AbstractEdmDeserializer<FunctionImportImpl> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.PropertyRefImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class ReferentialConstraintRoleDeserializer extends AbstractEdmDeserializer<ReferentialConstraintRoleImpl> {

View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class TypeAnnotationDeserializer extends AbstractEdmDeserializer<TypeAnnotationImpl> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class ActionDeserializer extends AbstractEdmDeserializer<ActionImpl> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.v4.annotation.DynExprConstructImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class AnnotationDeserializer extends AbstractEdmDeserializer<AnnotationImpl> {

View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class FunctionDeserializer extends AbstractEdmDeserializer<FunctionImpl> {

View File

@ -19,7 +19,7 @@
package org.apache.olingo.client.core.edm.xml.v4;
import org.apache.olingo.client.core.edm.xml.OnDeleteImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import java.net.URI;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class ReferenceDeserializer extends AbstractEdmDeserializer<ReferenceImpl> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class ReturnTypeDeserializer extends AbstractEdmDeserializer<ReturnTypeImpl> {

View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class SingletonDeserializer extends AbstractEdmDeserializer<SingletonImpl> {

View File

@ -28,7 +28,7 @@ import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.edm.xml.v4.CSDLElement;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class TermDeserializer extends AbstractEdmDeserializer<TermImpl> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class TypeDefinitionDeserializer extends AbstractEdmDeserializer<TypeDefinitionImpl> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class ApplyDeserializer extends AbstractEdmDeserializer<Apply> {

View File

@ -27,7 +27,7 @@ import java.io.IOException;
import java.math.BigInteger;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class CastDeserializer extends AbstractEdmDeserializer<Cast> {

View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class CollectionDeserializer extends AbstractEdmDeserializer<Collection> {

View File

@ -28,7 +28,7 @@ import java.io.IOException;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ClassUtils;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class DynExprConstructDeserializer extends AbstractEdmDeserializer<DynExprConstructImpl> {

View File

@ -27,7 +27,7 @@ import java.io.IOException;
import java.math.BigInteger;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class IsOfDeserializer extends AbstractEdmDeserializer<IsOf> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class LabeledElementDeserializer extends AbstractEdmDeserializer<LabeledElement> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class NullDeserializer extends AbstractEdmDeserializer<Null> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class PropertyValueDeserializer extends AbstractEdmDeserializer<PropertyValue> {

View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class RecordDeserializer extends AbstractEdmDeserializer<Record> {

View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import java.io.IOException;
import org.apache.olingo.client.core.op.AbstractEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
public class UrlRefDeserializer extends AbstractEdmDeserializer<UrlRef> {