From 1274b1e725f05404fc30b8721e319721c36c8940 Mon Sep 17 00:00:00 2001
From: Stephan Klevenz <stephan.klevenz@sap.com>
Date: Fri, 21 Mar 2014 17:31:15 +0100
Subject: [PATCH] [OLINGO-206] singleton validation added

---
 .../core/uri/validator/SystemQueryValidator.java   |  1 +
 .../core/uri/validator/UriEdmValidatorTest.java    | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/SystemQueryValidator.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/SystemQueryValidator.java
index b29413647..31604b264 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/SystemQueryValidator.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/SystemQueryValidator.java
@@ -237,6 +237,7 @@ public class SystemQueryValidator {
     case root:
       break;
     case singleton:
+      idx = 9;
       break;
     case value: {
       int secondLastPathSegmentIndex = uriInfo.getUriResourceParts().size() - 2;
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/validator/UriEdmValidatorTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/validator/UriEdmValidatorTest.java
index 5f5758bd7..494f71b08 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/validator/UriEdmValidatorTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/validator/UriEdmValidatorTest.java
@@ -57,6 +57,7 @@ public class UriEdmValidatorTest {
   private static final String URI_PROPERTY_PRIMITIVE_COLLECTION_COUNT =
       "/ESCollAllPrim/CollPropertyString/$count";
   private static final String URI_PROPERTY_PRIMITIVE_VALUE = "/ESAllPrim(1)/PropertyString/$value";
+  private static final String URI_SINGLETON = "/SI";
 
   private static final String QO_FILTER = "$filter='1' eq '1'";
   private static final String QO_FORMAT = "$format=bla";
@@ -121,6 +122,9 @@ public class UriEdmValidatorTest {
       { URI_PROPERTY_PRIMITIVE_COLLECTION, QO_SKIPTOKEN }, { URI_PROPERTY_PRIMITIVE_COLLECTION, QO_TOP },
 
       { URI_PROPERTY_PRIMITIVE_VALUE, QO_FORMAT },
+
+      { URI_SINGLETON, QO_FORMAT }, { URI_SINGLETON, QO_EXPAND }, { URI_SINGLETON, QO_SELECT },
+      { URI_SINGLETON, QO_LEVELS },
   };
 
   private String[][] urisWithNonValidSystemQueryOptions = {
@@ -210,6 +214,9 @@ public class UriEdmValidatorTest {
       { URI_PROPERTY_PRIMITIVE_VALUE, QO_SKIPTOKEN }, { URI_PROPERTY_PRIMITIVE_VALUE, QO_LEVELS },
       { URI_PROPERTY_PRIMITIVE_VALUE, QO_TOP },
 
+      { URI_SINGLETON, QO_FILTER }, { URI_SINGLETON, QO_ID }, { URI_SINGLETON, QO_COUNT },
+      /* { URI_SINGLETON, QO_ORDERBY }, *//* { URI_SINGLETON, QO_SEARCH }, */{ URI_SINGLETON, QO_SKIP },
+      { URI_SINGLETON, QO_SKIPTOKEN }, { URI_SINGLETON, QO_TOP },
   };
   private Parser parser;
 
@@ -219,9 +226,10 @@ public class UriEdmValidatorTest {
   }
 
   @Test
-  @Ignore
-  public void bla() throws Exception {
-    String[][] m = { { URI_PROPERTY_PRIMITIVE_VALUE, QO_SELECT } };
+//  @Ignore
+      public
+      void bla() throws Exception {
+    String[][] m = { { URI_SINGLETON, QO_SELECT } };
     String[] uris = constructUri(m);
     System.out.println(uris[0]);