fit server metadatas loaded from res
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cf17331f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cf17331f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cf17331f Branch: refs/heads/olingo-266-tecsvc Commit: cf17331fc701ede0d585c602653dc7cb5d6bffbb Parents: 377ddb9 Author: fmartelli <[email protected]> Authored: Wed May 21 15:10:42 2014 +0200 Committer: fmartelli <[email protected]> Committed: Wed May 21 15:10:42 2014 +0200 ---------------------------------------------------------------------- .../org/apache/olingo/fit/AbstractServices.java | 2 +- .../apache/olingo/fit/V3ActionOverloading.java | 2 +- .../java/org/apache/olingo/fit/V3OpenType.java | 2 +- .../org/apache/olingo/fit/V3PrimitiveKeys.java | 2 +- .../main/java/org/apache/olingo/fit/V4Demo.java | 2 +- .../java/org/apache/olingo/fit/V4OpenType.java | 2 +- .../org/apache/olingo/fit/V4Vocabularies.java | 4 ++-- .../org/apache/olingo/fit/utils/FSManager.java | 20 +++++++++++++++----- 8 files changed, 23 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cf17331f/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java index 973833e..e8c0be5 100644 --- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java +++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java @@ -188,7 +188,7 @@ public abstract class AbstractServices { protected Response getMetadata(final String filename) { try { - return xml.createResponse(null, FSManager.instance(version).readFile(filename, Accept.XML), null, Accept.XML); + return xml.createResponse(null, FSManager.instance(version).readRes(filename, Accept.XML), null, Accept.XML); } catch (Exception e) { return xml.createFaultResponse(Accept.XML.toString(version), e); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cf17331f/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java index 79a8d03..a457efb 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java +++ b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java @@ -51,7 +51,7 @@ import org.springframework.stereotype.Service; public class V3ActionOverloading extends V3Services { public V3ActionOverloading() throws Exception { - super(new Metadata(FSManager.instance(ODataServiceVersion.V30).readFile( + super(new Metadata(FSManager.instance(ODataServiceVersion.V30).readRes( "actionOverloading" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)), Accept.XML), ODataServiceVersion.V30)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cf17331f/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java index c112b99..23d644b 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java +++ b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java @@ -55,7 +55,7 @@ public class V3OpenType extends V3Services { public V3OpenType() throws Exception { super(new Metadata(FSManager.instance(ODataServiceVersion.V30). - readFile("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)), + readRes("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)), Accept.XML), ODataServiceVersion.V30)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cf17331f/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java b/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java index 3b159af..d235bc0 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java +++ b/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java @@ -47,7 +47,7 @@ public class V3PrimitiveKeys extends V3Services { public Response getMetadata() { try { return xml.createResponse( - null, FSManager.instance(version).readFile("primitiveKeysMetadata", Accept.XML), null, Accept.XML); + null, FSManager.instance(version).readRes("primitiveKeysMetadata", Accept.XML), null, Accept.XML); } catch (Exception e) { return xml.createFaultResponse(Accept.XML.toString(version), e); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cf17331f/fit/src/main/java/org/apache/olingo/fit/V4Demo.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java index 8944962..c308a08 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java @@ -52,7 +52,7 @@ public class V4Demo extends V4Services { public V4Demo() throws Exception { super(new Metadata(FSManager.instance(ODataServiceVersion.V40). - readFile("demo" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)), + readRes("demo" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)), Accept.XML), ODataServiceVersion.V40)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cf17331f/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java index fd29039..b76293a 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java @@ -51,7 +51,7 @@ public class V4OpenType extends V4Services { public V4OpenType() throws Exception { super(new Metadata(FSManager.instance(ODataServiceVersion.V40). - readFile("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)), + readRes("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)), Accept.XML), ODataServiceVersion.V40)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cf17331f/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java index 8271e53..5d64457 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java @@ -42,7 +42,7 @@ public class V4Vocabularies { private final XMLUtilities xml; public V4Vocabularies() throws Exception { - this.metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readFile( + this.metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readRes( "vocabularies-" + Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA), Accept.XML), ODataServiceVersion.V40); this.xml = new XMLUtilities(ODataServiceVersion.V40, metadata); @@ -55,7 +55,7 @@ public class V4Vocabularies { try { return xml.createResponse( null, - FSManager.instance(ODataServiceVersion.V40).readFile( + FSManager.instance(ODataServiceVersion.V40).readRes( "vocabularies-" + Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA), Accept.XML), null, Accept.XML); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cf17331f/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java index 4eac3a0..e529b45 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java @@ -78,7 +78,9 @@ public class FSManager { final String absoluteBaseFolder = basePath.getURL().getPath(); for (FileObject fo : find(basePath, null)) { - if (fo.getType() == FileType.FILE) { + if (fo.getType() == FileType.FILE + && !fo.getName().getBaseName().contains("Metadata") + && !fo.getName().getBaseName().contains("metadata")) { final String path = fo.getURL().getPath().replace(absoluteBaseFolder, "//" + version.name()); putInMemory(fo.getContent().getInputStream(), path); } @@ -137,16 +139,24 @@ public class FSManager { } } - public InputStream readFile(final String relativePath) { - return readFile(relativePath, null); + public InputStream readRes(final String relativePath, final Accept accept) { + return readFile(relativePath, accept, RES_PREFIX); } public InputStream readFile(final String relativePath, final Accept accept) { + return readFile(relativePath, accept, MEM_PREFIX); + } + + public InputStream readFile(final String relativePath) { + return readFile(relativePath, null, MEM_PREFIX); + } + + private InputStream readFile(final String relativePath, final Accept accept, final String fs) { final String path = getAbsolutePath(relativePath, accept); - LOG.info("Read {}", path); + LOG.info("Read {}{}", fs, path); try { - final FileObject fileObject = fsManager.resolveFile(MEM_PREFIX + path); + final FileObject fileObject = fsManager.resolveFile(fs + path); if (!fileObject.exists()) { LOG.warn("In-memory path '{}' not found", path);
