You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/03/06 15:14:43 UTC
olingo-odata4 git commit: [OLINGO-575] Cleanup todos
Repository: olingo-odata4
Updated Branches:
refs/heads/master 07c37106e -> be7f0fd1d
[OLINGO-575] Cleanup todos
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/be7f0fd1
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/be7f0fd1
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/be7f0fd1
Branch: refs/heads/master
Commit: be7f0fd1db203dc1603322326c147abdddc99585
Parents: 07c3710
Author: Christian Amend <ch...@apache.org>
Authored: Fri Mar 6 15:14:19 2015 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Mar 6 15:14:19 2015 +0100
----------------------------------------------------------------------
.../fit/proxy/v4/APIBasicDesignTestITCase.java | 49 --------------------
.../fit/tecsvc/http/BasicBatchITCase.java | 1 -
.../olingo/fit/v4/PropertyValueTestITCase.java | 11 ++---
.../apache/olingo/client/core/uri/URIUtils.java | 22 +--------
.../commons/core/edm/EdmImplCachingTest.java | 35 +++++++-------
.../commons/core/edm/EdmImplCallCreateTest.java | 9 ++--
.../serialization/AtomDeserializerTest.java | 3 --
.../api/edm/provider/ReferentialConstraint.java | 1 -
.../FixedFormatDeserializerImpl.java | 1 -
.../core/edm/provider/EdmComplexTypeImpl.java | 2 -
.../edm/provider/EdmEntityContainerImpl.java | 2 -
.../core/edm/provider/EdmEntitySetImpl.java | 2 -
.../core/edm/provider/EdmEntityTypeImpl.java | 2 -
.../edm/provider/EdmFunctionImportImpl.java | 1 -
.../server/core/edm/provider/EdmMemberImpl.java | 2 -
.../edm/provider/EdmNavigationPropertyImpl.java | 2 -
.../core/edm/provider/EdmOperationImpl.java | 2 -
.../edm/provider/EdmOperationImportImpl.java | 2 -
.../core/edm/provider/EdmParameterImpl.java | 2 -
.../core/edm/provider/EdmPropertyImpl.java | 2 -
.../core/edm/provider/EdmProviderImpl.java | 9 ++--
.../provider/EdmReferentialConstraintImpl.java | 2 -
.../server/core/edm/provider/EdmSchemaImpl.java | 18 +++----
.../core/edm/provider/EdmSingletonImpl.java | 2 -
.../edm/provider/EdmTypeDefinitionImpl.java | 2 -
.../server/core/uri/validator/UriValidator.java | 2 -
26 files changed, 35 insertions(+), 153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
index 9581734..23c6830 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
@@ -416,55 +416,6 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase {
container.getProducts().getByKey(1012).operations().getProductDetails(1);
assertEquals(1, result.execute().size());
}
-
-//CHECKSTYLE:OFF (Maven checkstyle)
- // TODO: check replacement
-// @Test
-// public void workingWithComplexCollections() throws IOException {
-// // ---------------------------------------
-// // Instantiate V3 Service (Currently, complex collections not provided by V4 service)
-// // ---------------------------------------
-// org.apache.olingo.fit.proxy.v3.staticservice.Service<org.apache.olingo.client.api.v3.EdmEnabledODataClient> v3serv =
-// org.apache.olingo.fit.proxy.v3.staticservice.Service.getV3(
-// "http://localhost:9080/stub/StaticService/V30/Static.svc");
-// v3serv.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
-// final DefaultContainer v3cont = v3serv.getEntityContainer(DefaultContainer.class);
-// assertNotNull(v3cont);
-// v3serv.getContext().detachAll();
-// // ---------------------------------------
-//
-// final ContactDetailsCollection bci = v3cont.getCustomer().getByKey(-10).getBackupContactInfo(); // 1 HTTP Request
-// assertNotNull(bci);
-// assertTrue(bci.isEmpty());
-//
-// bci.execute();
-// assertFalse(bci.isEmpty());
-// assertEquals(9, bci.size());
-//
-// final PhoneCollection phoneCollection = bci.iterator().next().getMobilePhoneBag(); // No new HTTP Request
-// assertFalse(phoneCollection.isEmpty());
-//
-// assertEquals("jlessdhjbgglmofcyßucßqbrfßppgzvygdyssßpehkrdetitmßfddsplccvussrvidmkodchdfzjvfgossbciq",
-// bci.iterator().next().getHomePhone().getPhoneNumber()); // No new HTTP Request
-//
-// // assertNotNull(v3cont.getOrder().getByKey(8).getCustomer().getBackupContactInfo().execute().iterator().next().
-// // getHomePhone().getPhoneNumber());
-// // Not supported by the test service BTW generates a single request as expected:
-// // <service root>/Order(8)/Customer/BackupContactInfo
-// v3serv.getContext().detachAll();
-//
-// // Static test service doesn't support query options about complexes: the following provides just a client example
-// v3cont.getCustomer().getByKey(-10).getBackupContactInfo().
-// select("HomePhone").
-// filter("HomePhone eq 12345").
-// skip(1).
-// top(10).
-// orderBy("HomePhone").
-// execute(); // New HTTP Request
-//
-// v3serv.getContext().detachAll();
-// }
-//CHECKSTYLE:ON (Maven checkstyle)
@Test
public void workingWithPrimitiveCollections() throws IOException {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java
index 1c1b869..025f57c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java
@@ -156,7 +156,6 @@ public class BasicBatchITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
- // TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
index 7b0e0bb..12fd772 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
@@ -18,6 +18,11 @@
*/
package org.apache.olingo.fit.v4;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
@@ -27,15 +32,9 @@ import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
import org.apache.olingo.commons.api.domain.ODataProperty;
import org.apache.olingo.commons.api.domain.ODataValuable;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
-import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
index 12e5573..43df061 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
@@ -52,7 +52,6 @@ import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
-import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.core.edm.primitivetype.EdmBinary;
import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTimeOffset;
@@ -143,18 +142,6 @@ public final class URIUtils {
return uri.normalize();
}
- // TODO: Delete prefix method since these are not relevant in V4
- private static String prefix(final EdmPrimitiveTypeKind typeKind) {
- String result = StringUtils.EMPTY;
- return result;
- }
-
-//TODO: Delete suffix method since these are not relevant in V4
- private static String suffix(final EdmPrimitiveTypeKind typeKind) {
- String result = StringUtils.EMPTY;
- return result;
- }
-
private static String timestamp(final Timestamp timestamp)
throws UnsupportedEncodingException, EdmPrimitiveTypeException {
@@ -242,9 +229,8 @@ public final class URIUtils {
: (obj instanceof Boolean)
? BooleanUtils.toStringTrueFalse((Boolean) obj)
: (obj instanceof UUID)
- ? prefix(EdmPrimitiveTypeKind.Guid)
- + obj.toString()
- + suffix(EdmPrimitiveTypeKind.Guid)
+ ? obj.toString()
+
: (obj instanceof byte[])
? EdmBinary.getInstance().toUriLiteral(Hex.encodeHexString((byte[]) obj))
: (obj instanceof Timestamp)
@@ -256,19 +242,15 @@ public final class URIUtils {
: (obj instanceof BigDecimal)
? EdmDecimal.getInstance().valueToString(obj, null, null,
Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null)
- + suffix(EdmPrimitiveTypeKind.Decimal)
: (obj instanceof Double)
? EdmDouble.getInstance().valueToString(obj, null, null,
Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null)
- + suffix(EdmPrimitiveTypeKind.Double)
: (obj instanceof Float)
? EdmSingle.getInstance().valueToString(obj, null, null,
Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null)
- + suffix(EdmPrimitiveTypeKind.Single)
: (obj instanceof Long)
? EdmInt64.getInstance().valueToString(obj, null, null,
Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null)
- + suffix(EdmPrimitiveTypeKind.Int64)
: (obj instanceof Geospatial)
? URLEncoder.encode(EdmPrimitiveTypeFactory.getInstance(
((Geospatial) obj).getEdmPrimitiveTypeKind()).
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java
index f358543..453a01a 100644
--- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java
+++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java
@@ -18,6 +18,19 @@
*/
package org.apache.olingo.commons.core.edm;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmAction;
@@ -35,19 +48,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.junit.Before;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
public class EdmImplCachingTest {
private final FullQualifiedName NAME1 = new FullQualifiedName("testNamespace1", "testName1");
@@ -418,20 +418,17 @@ public class EdmImplCachingTest {
@Override
protected EdmTerm createTerm(final FullQualifiedName termName) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
protected EdmAnnotations createAnnotationGroup(final FullQualifiedName target) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
protected List<EdmAnnotation> createAnnotations(final FullQualifiedName annotatedName) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java
index 87fe0e6..ae1e4b7 100644
--- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java
+++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java
@@ -282,20 +282,17 @@ public class EdmImplCallCreateTest {
@Override
protected EdmTerm createTerm(final FullQualifiedName termName) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
protected EdmAnnotations createAnnotationGroup(final FullQualifiedName targetName) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
protected List<EdmAnnotation> createAnnotations(final FullQualifiedName annotatedName) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java
index 0c47160..062f46b 100644
--- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java
+++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java
@@ -78,7 +78,6 @@ public class AtomDeserializerTest {
" </content>\r\n" +
" </entry>";
- //TODO: THis was a test for V3
final AtomDeserializer deserializer = new AtomDeserializer();
final InputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"));
final ResWrap<Entity> entity = deserializer.toEntity(in);
@@ -226,7 +225,6 @@ public class AtomDeserializerTest {
" </metadata:properties>\r\n" +
" </content>\r\n" +
" </entry>";
- //TODO: THis was a test for V3
final AtomDeserializer deserializer = new AtomDeserializer();
final InputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"));
final ResWrap<Entity> entity = deserializer.toEntity(in);
@@ -318,7 +316,6 @@ public class AtomDeserializerTest {
" </metadata:properties>\r\n" +
" </content>\r\n" +
" </entry>";
- //TODO: THis was a test for V3
final AtomDeserializer deserializer = new AtomDeserializer();
final InputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"));
final ResWrap<Entity> entity = deserializer.toEntity(in);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ReferentialConstraint.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ReferentialConstraint.java
index a834707..bc444fe 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ReferentialConstraint.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ReferentialConstraint.java
@@ -20,7 +20,6 @@ package org.apache.olingo.server.api.edm.provider;
public class ReferentialConstraint {
- // TODO: check data type
private String property;
private String referencedProperty;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java
index a34aa95..493358a 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java
@@ -49,7 +49,6 @@ public class FixedFormatDeserializerImpl implements FixedFormatDeserializer {
return result.toByteArray();
}
- // TODO: Deserializer
@Override
public List<BatchRequestPart> parseBatchRequest(InputStream content, String boundary, BatchOptions options)
throws BatchDeserializerException {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java
index 36c5193..0fbddbe 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java
@@ -69,13 +69,11 @@ public class EdmComplexTypeImpl extends AbstractEdmComplexType {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java
index 74b2e4a..3cf7bd2 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java
@@ -198,13 +198,11 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java
index a2926eb..c657a02 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java
@@ -48,13 +48,11 @@ public class EdmEntitySetImpl extends EdmBindingTargetImpl implements EdmEntityS
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java
index 4dff2ba..4a255dd 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java
@@ -100,13 +100,11 @@ public class EdmEntityTypeImpl extends AbstractEdmEntityType {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java
index e07eb9f..f832b39 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java
@@ -65,7 +65,6 @@ public class EdmFunctionImportImpl extends EdmOperationImportImpl implements Edm
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java
index 5ffe031..c6bdd47 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java
@@ -34,13 +34,11 @@ public class EdmMemberImpl extends AbstractEdmMember {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java
index 7562360..ab41a86 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java
@@ -107,13 +107,11 @@ public class EdmNavigationPropertyImpl extends AbstractEdmNavigationProperty {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java
index 0b5a8f2..75d47d9 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java
@@ -87,13 +87,11 @@ public abstract class EdmOperationImpl extends AbstractEdmOperation {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java
index 2cc85d0..fc1ab31 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java
@@ -36,13 +36,11 @@ public abstract class EdmOperationImportImpl extends AbstractEdmOperationImport
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java
index 53b46d2..8a1e840 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java
@@ -74,13 +74,11 @@ public class EdmParameterImpl extends AbstractEdmParameter {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/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 290a952..3f6b8d1 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
@@ -108,13 +108,11 @@ public class EdmPropertyImpl extends AbstractEdmProperty {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java
index baf8093..e5f35fd 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java
@@ -328,19 +328,16 @@ public class EdmProviderImpl extends AbstractEdm {
@Override
protected EdmTerm createTerm(final FullQualifiedName termName) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
protected EdmAnnotations createAnnotationGroup(final FullQualifiedName targetName) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
protected List<EdmAnnotation> createAnnotations(final FullQualifiedName annotatedName) {
- // TODO: implement
- return null;
+ throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java
index 7007740..f22d514 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java
@@ -32,13 +32,11 @@ public class EdmReferentialConstraintImpl extends AbstractEdmReferentialConstrai
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java
index b617db9..8f8ccff 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java
@@ -18,6 +18,9 @@
*/
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.EdmAction;
import org.apache.olingo.commons.api.edm.EdmAnnotation;
@@ -40,10 +43,6 @@ import org.apache.olingo.server.api.edm.provider.Function;
import org.apache.olingo.server.api.edm.provider.Schema;
import org.apache.olingo.server.api.edm.provider.TypeDefinition;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
public class EdmSchemaImpl extends AbstractEdmSchema {
private final Schema schema;
@@ -144,31 +143,26 @@ public class EdmSchemaImpl extends AbstractEdmSchema {
@Override
protected List<EdmTerm> createTerms() {
- // TODO: implement
- return Collections.emptyList();
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
protected List<EdmAnnotations> createAnnotationGroups() {
- // TODO: implement
- return Collections.emptyList();
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
protected List<EdmAnnotation> createAnnotations() {
- // TODO: implement
- return Collections.emptyList();
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java
index 41efc54..7bf41d8 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java
@@ -40,13 +40,11 @@ public class EdmSingletonImpl extends EdmBindingTargetImpl implements EdmSinglet
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/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 0f8c808..0b830a8 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
@@ -85,13 +85,11 @@ public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition {
@Override
public EdmAnnotation getAnnotation(final EdmTerm term) {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public List<EdmAnnotation> getAnnotations() {
- // TODO: implement
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/be7f0fd1/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
index aa32c83..81d1e4e 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java
@@ -652,12 +652,10 @@ public class UriValidator {
if (!edmPrimitiveType.validate(edmPrimitiveType.fromUriLiteral(value),
property.isNullable(), property.getMaxLength(),
property.getPrecision(), property.getScale(), property.isUnicode())) {
- // TODO: Check exception here
throw new UriValidationException("PrimitiveTypeException",
UriValidationException.MessageKeys.INVALID_KEY_PROPERTY, name);
}
} catch (EdmPrimitiveTypeException e) {
- // TODO: Check exception here
throw new UriValidationException("PrimitiveTypeException", e,
UriValidationException.MessageKeys.INVALID_KEY_PROPERTY, name);
}