olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rare...@apache.org
Subject olingo-odata4 git commit: OLINGO-1318: incresing the method scope for the load core vocabularies
Date Tue, 20 Nov 2018 17:30:23 GMT
Repository: olingo-odata4
Updated Branches:
  refs/heads/master c37d40f15 -> b1640c596


OLINGO-1318: incresing the method scope for the load core vocabularies


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b1640c59
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b1640c59
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b1640c59

Branch: refs/heads/master
Commit: b1640c596cc307497cc0cb45ad309d289301db31
Parents: c37d40f
Author: Ramesh Reddy <rareddy@jboss.org>
Authored: Tue Nov 20 11:30:00 2018 -0600
Committer: Ramesh Reddy <rareddy@jboss.org>
Committed: Tue Nov 20 11:30:00 2018 -0600

----------------------------------------------------------------------
 .../main/java/org/apache/olingo/server/core/MetadataParser.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b1640c59/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java
b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java
index 63b33d7..825ec13 100644
--- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java
+++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/MetadataParser.java
@@ -288,7 +288,7 @@ public class MetadataParser {
     }
   }
   
-  private void loadCoreVocabulary(SchemaBasedEdmProvider provider,
+  public void loadCoreVocabulary(SchemaBasedEdmProvider provider,
       String namespace) throws XMLStreamException {
     if("Org.OData.Core.V1".equalsIgnoreCase(namespace)) {
       loadLocalVocabularySchema(provider, "Org.OData.Core.V1", "Org.OData.Core.V1.xml");
@@ -296,6 +296,8 @@ public class MetadataParser {
       loadLocalVocabularySchema(provider, "Org.OData.Capabilities.V1", "Org.OData.Capabilities.V1.xml");
     } else if ("Org.OData.Measures.V1".equalsIgnoreCase(namespace)) {
       loadLocalVocabularySchema(provider, "Org.OData.Measures.V1", "Org.OData.Measures.V1.xml");
+    } else {
+    	throw new XMLStreamException("Unknown namespace to load vocabulary");
     }
   }
 


Mime
View raw message