Repository: olingo-odata4 Updated Branches: refs/heads/master 718903319 -> 66097e3dd
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataComplexValueImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataComplexValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataComplexValueImpl.java index 41e6cf7..d3609d0 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataComplexValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataComplexValueImpl.java @@ -24,8 +24,6 @@ import org.apache.olingo.commons.core.domain.AbstractODataComplexValue; public class ODataComplexValueImpl extends AbstractODataComplexValue<ODataProperty> { - private static final long serialVersionUID = 1143925901934898802L; - public ODataComplexValueImpl(final String typeName) { super(typeName); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java index 972e796..817c2bf 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java @@ -28,8 +28,6 @@ import java.util.List; public class ODataEntityImpl extends AbstractODataEntity implements ODataEntity { - private static final long serialVersionUID = 1728326493032709855L; - private final List<ODataProperty> properties = new ArrayList<ODataProperty>(); public ODataEntityImpl(final FullQualifiedName typeName) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java index 9709978..5fd14d5 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java @@ -28,8 +28,6 @@ import java.util.List; public class ODataEntitySetImpl extends AbstractODataEntitySet implements ODataEntitySet { - private static final long serialVersionUID = -8127933181196033586L; - private final List<ODataEntity> entities = new ArrayList<ODataEntity>(); public ODataEntitySetImpl() {} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPrimitiveValueImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPrimitiveValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPrimitiveValueImpl.java index 9c098db..8517c22 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPrimitiveValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPrimitiveValueImpl.java @@ -23,8 +23,6 @@ import org.apache.olingo.commons.core.domain.AbstractODataPrimitiveValue; public class ODataPrimitiveValueImpl extends AbstractODataPrimitiveValue { - private static final long serialVersionUID = -5201738902625613179L; - public static class BuilderImpl extends AbstractBuilder { private final ODataPrimitiveValueImpl instance; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPropertyImpl.java index 7a48ce9..aeca313 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataPropertyImpl.java @@ -26,8 +26,6 @@ import org.apache.olingo.commons.core.domain.AbstractODataProperty; public class ODataPropertyImpl extends AbstractODataProperty implements ODataProperty { - private static final long serialVersionUID = 4851331227420757747L; - public ODataPropertyImpl(final String name, final ODataValue value) { super(name, value); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java index 7d944e5..6f29af3 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java @@ -29,8 +29,6 @@ import java.util.List; public class ODataCollectionValueImpl extends AbstractODataCollectionValue<ODataValue> implements ODataValue { - private static final long serialVersionUID = 5887168245885401351L; - public ODataCollectionValueImpl(final String typeName) { super(typeName); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java index af38fad..9a3ed7b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java @@ -33,8 +33,6 @@ import java.util.Map; public class ODataComplexValueImpl extends AbstractODataComplexValue<ODataProperty> implements ODataLinkedComplexValue { - private static final long serialVersionUID = 1143925901934898802L; - /** * Navigation links (might contain in-line entities or entity sets). */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java index 08f5f79..8722d7d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java @@ -25,8 +25,6 @@ import java.net.URI; public class ODataDeletedEntityImpl extends ODataItem implements ODataDeletedEntity { - private static final long serialVersionUID = -3841730551749114664L; - private URI id; private Reason reason; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java index 5cb5ee8..18e7655 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java @@ -28,8 +28,6 @@ import java.util.List; public class ODataDeltaImpl extends ODataEntitySetImpl implements ODataDelta { - private static final long serialVersionUID = -418357452933455313L; - private final List<ODataDeletedEntity> deletedEntities = new ArrayList<ODataDeletedEntity>(); private final List<ODataDeltaLink> addedLinks = new ArrayList<ODataDeltaLink>(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java index f95f0b4..a0d18e6 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java @@ -28,8 +28,6 @@ import java.util.List; public class ODataDeltaLinkImpl extends ODataItem implements ODataDeltaLink { - private static final long serialVersionUID = -6686550836508873044L; - private URI source; private String relationship; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java index 5c506c3..24063f4 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java @@ -18,20 +18,17 @@ */ package org.apache.olingo.commons.core.domain.v4; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; -import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataProperty; import org.apache.olingo.commons.api.domain.v4.ODataSingleton; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.domain.AbstractODataEntity; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - -public class ODataEntityImpl extends AbstractODataEntity implements ODataEntity, ODataSingleton { - - private static final long serialVersionUID = -3997704808753685990L; +public class ODataEntityImpl extends AbstractODataEntity implements ODataSingleton { /** * Entity id. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java index dc819f2..e979869 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java @@ -29,8 +29,6 @@ import java.util.List; public class ODataEntitySetImpl extends AbstractODataEntitySet implements ODataEntitySet { - private static final long serialVersionUID = -8127933181196033586L; - private URI deltaLink; private final List<ODataEntity> entities = new ArrayList<ODataEntity>(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEnumValueImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEnumValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEnumValueImpl.java index f9115f5..52c8898 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEnumValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEnumValueImpl.java @@ -24,8 +24,6 @@ import org.apache.olingo.commons.api.domain.v4.ODataLinkedComplexValue; public class ODataEnumValueImpl extends AbstractODataValue implements ODataEnumValue { - private static final long serialVersionUID = 5830261159033325828L; - private final String value; public ODataEnumValueImpl(final String typeName, final String value) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPrimitiveValueImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPrimitiveValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPrimitiveValueImpl.java index 1cb4d6a..97f252d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPrimitiveValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPrimitiveValueImpl.java @@ -26,8 +26,6 @@ import org.apache.olingo.commons.core.domain.AbstractODataPrimitiveValue; public class ODataPrimitiveValueImpl extends AbstractODataPrimitiveValue implements ODataValue { - private static final long serialVersionUID = -5201738902625613179L; - public static class BuilderImpl extends AbstractBuilder { private final ODataPrimitiveValueImpl instance; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java index 304333d..84a35dc 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java @@ -33,8 +33,6 @@ import java.util.List; public class ODataPropertyImpl extends AbstractODataProperty implements ODataProperty { - private static final long serialVersionUID = 4851331227420757747L; - private final ODataValuable valuable; private final List<ODataAnnotation> annotations = new ArrayList<ODataAnnotation>(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java index 896d2c5..1382389 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java @@ -55,7 +55,7 @@ public abstract class AbstractEdmNavigationProperty extends EdmElementImpl imple if (partnerNavigationProperty == null) { String partner = internatGetPartner(); if (partner != null) { - EdmStructuredType type = (EdmStructuredType) getType(); + EdmStructuredType type = getType(); EdmNavigationProperty property = null; final String[] split = partner.split("/"); for (String element : split) { @@ -64,7 +64,7 @@ public abstract class AbstractEdmNavigationProperty extends EdmElementImpl imple throw new EdmException("Cannot find navigation property with name: " + element + " at type " + type.getName()); } - type = (EdmStructuredType) property.getType(); + type = property.getType(); } partnerNavigationProperty = property; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java index 95413ae..ac1c83d 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java @@ -18,8 +18,10 @@ */ package org.apache.olingo.server.core.edm.provider; +import java.util.ArrayList; +import java.util.List; + import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmMember; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; @@ -29,10 +31,7 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.server.api.edm.provider.EnumMember; import org.apache.olingo.server.api.edm.provider.EnumType; -import java.util.ArrayList; -import java.util.List; - -public class EdmEnumTypeImpl extends AbstractEdmEnumType implements EdmEnumType { +public class EdmEnumTypeImpl extends AbstractEdmEnumType { private final EdmPrimitiveType underlyingType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java index e55bb35..290a952 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.server.core.edm.provider; +import java.util.List; + import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmMapping; -import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.geo.SRID; @@ -29,9 +30,7 @@ import org.apache.olingo.commons.core.edm.AbstractEdmProperty; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.server.api.edm.provider.Property; -import java.util.List; - -public class EdmPropertyImpl extends AbstractEdmProperty implements EdmProperty { +public class EdmPropertyImpl extends AbstractEdmProperty { private final FullQualifiedName structuredTypeName; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java index b1f00c9..0f8c808 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java @@ -18,22 +18,21 @@ */ package org.apache.olingo.server.core.edm.provider; +import java.util.List; + import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmTerm; -import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.geo.SRID; import org.apache.olingo.commons.core.edm.AbstractEdmTypeDefinition; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.server.api.edm.provider.TypeDefinition; -import java.util.List; - -public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition implements EdmTypeDefinition { +public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition { private TypeDefinition typeDefinition; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-tecsvc/src/main/version/version.html ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/version/version.html b/lib/server-tecsvc/src/main/version/version.html index a7d74f4..7bc2ddd 100644 --- a/lib/server-tecsvc/src/main/version/version.html +++ b/lib/server-tecsvc/src/main/version/version.html @@ -17,32 +17,21 @@ under the License. --> -<table border="1" rules="groups" > - <thead> - <tr> - <th colspan=2>Version Information</th> - </tr> - </thead> +<table> + <thead> + <tr><th colspan=2>Version Information</th></tr> + </thead> - <tfoot> - <tr> - <td>Home</td> - <td><a href="http://olingo.apache.org"; target="self">Apache - Olingo</a></td> - </tr> - </tfoot> + <tfoot> + <tr> + <td>Home</td> + <td><a href="http://olingo.apache.org/"; target="self">Apache Olingo</a></td> + </tr> + </tfoot> - <tbody> - <td>name</td> - <td>${name}</td> - </tr> - <tr> - <td>version</td> - <td>${version}</td> - </tr> - <tr> - <td>timestamp</td> - <td>${timestamp}</td> - </tr> - </tbody> + <tbody> + <tr><td>name</td><td>${name}</td></tr> + <tr><td>version</td><td>${version}</td></tr> + <tr><td>timestamp</td><td>${timestamp}</td></tr> + </tbody> </table> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-tecsvc/src/main/webapp/css/olingo.css ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/webapp/css/olingo.css b/lib/server-tecsvc/src/main/webapp/css/olingo.css index b71723b..5b9deec 100644 --- a/lib/server-tecsvc/src/main/webapp/css/olingo.css +++ b/lib/server-tecsvc/src/main/webapp/css/olingo.css @@ -74,15 +74,16 @@ h6 { } .logo { - float: left; + float: right; } -hr { +hr, thead, tfoot { margin: 9px 0; border-top: 1px solid #8904B1; border-bottom: 1px solid #8904B1; } +table { border-collapse: collapse; border: 1px solid #8904B1; } .version { font-family: "Courier New", monospace; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-tecsvc/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/webapp/index.jsp b/lib/server-tecsvc/src/main/webapp/index.jsp index 0a72eb4..788390f 100644 --- a/lib/server-tecsvc/src/main/webapp/index.jsp +++ b/lib/server-tecsvc/src/main/webapp/index.jsp @@ -1,5 +1,4 @@ -<%@ page language="java" contentType="text/html; UTF-8" - pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -22,54 +21,35 @@ <!DOCTYPE html> <html> -<header> +<head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>Apache Olingo - OData 4.0</title> - <link type="text/css" rel="stylesheet" href="css/olingo.css"> - -</header> +</head> <body> - <div> - <h1> - Olingo OData 4.0 - <div class="logo"> + <div class="logo"> <img height="40" src="img/OlingoOrangeTM.png" /> - </div> - </h1> + </div> + <h1>Olingo OData 4.0</h1> <hr> - </div> - <h2>Technical Service</h2> - <div> - - - + <h2>Technical Service</h2> <ul> - <li><a href="odata.svc/">Service Document</a></li> - <li><a href="odata.svc/$metadata">Metadata</a></li> + <li><a href="odata.svc/">Service Document</a></li> + <li><a href="odata.svc/$metadata">Metadata</a></li> + <li>Entity Set <a href="odata.svc/ESAllPrim">ESAllPrim</a></li> + <li>Entity <a href="odata.svc/ESAllPrim(32767)">ESAllPrim(32767)</a></li> </ul> - </div> - <p> - <hr> - <p> - <div class="version"> - <% - String version = "gen/version.html"; - - try { - %> - <jsp:include page='<%=version%>' /> - <% - } catch (Exception e) { - %> - <p>IDE Build</p> - <% - } - %> - </div> - - + <hr> + <div class="version"> + <% String version = "gen/version.html"; + try { + %> + <jsp:include page='<%=version%>' /> + <%} catch (Exception e) { + %> + <p>IDE Build</p> + <%}%> + </div> </body> - -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/StringHelper.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/StringHelper.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/StringHelper.java index 52c4599..6ae4b5a 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/StringHelper.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/StringHelper.java @@ -200,6 +200,8 @@ public class StringHelper { } private static class TestUtilRuntimeException extends RuntimeException { + private static final long serialVersionUID = 8759664297317490186L; + @SuppressWarnings("unused") public TestUtilRuntimeException(String message, Throwable cause) { } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java index 9cb04fc..f778edc 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java @@ -200,7 +200,7 @@ public class UriResourceImplTest { assertEquals("", impl.toString()); // function - EdmFunction function = (EdmFunction) edm.getEntityContainer(null).getFunctionImport("FINRTInt16") + EdmFunction function = edm.getEntityContainer(null).getFunctionImport("FINRTInt16") .getUnboundFunction(new ArrayList<String>()); assertNotNull(function); impl.setFunction(function); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java index 81a192f..a310c8d 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java @@ -97,7 +97,7 @@ public class ExpressionTest { @Test public void testEnumerationExpression() throws ExpressionVisitException, ODataApplicationException { EnumerationImpl expression = new EnumerationImpl(); - EdmEnumType type = (EdmEnumType) edm.getEnumType(EnumTypeProvider.nameENString); + EdmEnumType type = edm.getEnumType(EnumTypeProvider.nameENString); assertNotNull(type); expression.setType(type); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java index 62463f5..ad8eeee 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java @@ -301,7 +301,7 @@ public class FilterValidator implements TestValidator { public FilterValidator is(final String expectedFilterAsString) { try { - String actualFilterAsText = FilterTreeToText.Serialize((FilterOptionImpl) filter); + String actualFilterAsText = FilterTreeToText.Serialize(filter); assertEquals(expectedFilterAsString, actualFilterAsText); } catch (ExpressionVisitException e) { fail("Exception occured while converting the filterTree into text" + "\n"
