You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/05/21 15:14:51 UTC
[1/2] git commit: fit server metadatas loaded from res
Repository: olingo-odata4
Updated Branches:
refs/heads/master 35e89699e -> a57926bf8
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/master
Commit: cf17331fc701ede0d585c602653dc7cb5d6bffbb
Parents: 377ddb9
Author: fmartelli <fa...@gmail.com>
Authored: Wed May 21 15:10:42 2014 +0200
Committer: fmartelli <fa...@gmail.com>
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);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata4
Posted by fm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a57926bf
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a57926bf
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a57926bf
Branch: refs/heads/master
Commit: a57926bf8d76bbb8772079eaf3ae15ec89889de5
Parents: cf17331 35e8969
Author: fmartelli <fa...@gmail.com>
Authored: Wed May 21 15:11:17 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Wed May 21 15:11:17 2014 +0200
----------------------------------------------------------------------
.../commons/AbstractInvocationHandler.java | 30 ++-
.../AbstractStructuredInvocationHandler.java | 4 +-
.../commons/EntitySetInvocationHandler.java | 11 +-
.../olingo/ext/proxy/commons/FilterImpl.java | 2 +-
.../commons/OperationInvocationHandler.java | 5 +-
.../olingo/ext/proxy/commons/SearchImpl.java | 2 +-
.../java/org/apache/olingo/fit/V4Services.java | 31 ++-
.../resources/V40/Accounts/102/entity.full.json | 34 +++
.../main/resources/V40/Accounts/102/entity.xml | 55 ++++
.../V40/Accounts/102/links/MyGiftCard.full.json | 15 ++
.../V40/Accounts/102/links/MyGiftCard.xml | 41 +++
.../MyPaymentInstruments(102901).full.json | 16 ++
.../102/links/MyPaymentInstruments(102901).xml | 40 +++
.../MyPaymentInstruments(102902).full.json | 16 ++
.../102/links/MyPaymentInstruments(102902).xml | 40 +++
.../102/links/MyPaymentInstruments.full.json | 62 +++++
.../Accounts/102/links/MyPaymentInstruments.xml | 95 +++++++
.../olingo/fit/v3/AbstractTestITCase.java | 4 +-
.../fit/v3/ActionOverloadingTestITCase.java | 155 ++++-------
.../apache/olingo/fit/v3/AsyncTestITCase.java | 8 +-
.../apache/olingo/fit/v3/BatchTestITCase.java | 26 +-
.../apache/olingo/fit/v3/CountTestITCase.java | 4 +-
.../olingo/fit/v3/EntityCreateTestITCase.java | 16 +-
.../olingo/fit/v3/EntityRetrieveTestITCase.java | 14 +-
.../olingo/fit/v3/EntitySetTestITCase.java | 8 +-
.../olingo/fit/v3/EntityUpdateTestITCase.java | 26 +-
.../apache/olingo/fit/v3/ErrorTestITCase.java | 20 +-
.../olingo/fit/v3/FilterFactoryTestITCase.java | 2 +-
.../apache/olingo/fit/v3/FilterTestITCase.java | 2 +-
.../apache/olingo/fit/v3/InvokeTestITCase.java | 120 ++-------
.../olingo/fit/v3/KeyAsSegmentTestITCase.java | 6 +-
.../apache/olingo/fit/v3/LinkTestITCase.java | 8 +-
.../olingo/fit/v3/MediaEntityTestITCase.java | 12 +-
.../olingo/fit/v3/OpenTypeTestITCase.java | 6 +-
.../olingo/fit/v3/PrimitiveKeysTestITCase.java | 2 +-
.../fit/v3/PropertyRetrieveTestITCase.java | 8 +-
.../olingo/fit/v3/PropertyTestITCase.java | 16 +-
.../olingo/fit/v3/PropertyValueTestITCase.java | 20 +-
.../olingo/fit/v3/QueryOptionsTestITCase.java | 12 +-
.../olingo/fit/v4/AbstractTestITCase.java | 4 +-
.../apache/olingo/fit/v4/AsyncTestITCase.java | 6 +-
.../apache/olingo/fit/v4/BatchTestITCase.java | 30 +--
.../fit/v4/BoundOperationInvokeTestITCase.java | 258 +++++++++++++------
.../apache/olingo/fit/v4/DeltaTestITCase.java | 2 +-
.../olingo/fit/v4/DerivedTypeTestITCase.java | 8 +-
.../olingo/fit/v4/EntityCreateTestITCase.java | 6 +-
.../olingo/fit/v4/EntityRetrieveTestITCase.java | 20 +-
.../olingo/fit/v4/EntitySetTestITCase.java | 8 +-
.../olingo/fit/v4/EntityUpdateTestITCase.java | 8 +-
.../olingo/fit/v4/ErrorResponseTestITCase.java | 2 +-
.../olingo/fit/v4/FilterFactoryTestITCase.java | 2 +-
.../olingo/fit/v4/KeyAsSegmentTestITCase.java | 4 +-
.../olingo/fit/v4/MediaEntityTestITCase.java | 8 +-
.../olingo/fit/v4/OpenTypeTestITCase.java | 6 +-
.../fit/v4/OperationImportInvokeTestITCase.java | 96 ++-----
.../olingo/fit/v4/PropertyTestITCase.java | 14 +-
.../olingo/fit/v4/PropertyValueTestITCase.java | 20 +-
.../olingo/fit/v4/QueryOptionsTestITCase.java | 22 +-
.../olingo/fit/v4/SingletonTestITCase.java | 6 +-
.../client/api/CommonEdmEnabledODataClient.java | 2 +-
.../olingo/client/api/CommonODataClient.java | 4 +-
.../api/communication/header/ODataHeaders.java | 31 +++
.../invoke/EdmEnabledInvokeRequestFactory.java | 65 ++++-
.../request/invoke/InvokeRequestFactory.java | 64 ++++-
.../client/api/v3/EdmEnabledODataClient.java | 2 +-
.../olingo/client/api/v3/ODataClient.java | 2 +-
.../client/api/v4/EdmEnabledODataClient.java | 2 +-
.../olingo/client/api/v4/ODataClient.java | 2 +-
.../olingo/client/core/AbstractODataClient.java | 3 +-
.../communication/header/ODataHeadersImpl.java | 49 +---
.../request/AbstractODataRequest.java | 5 +-
.../batch/v3/BatchRequestFactoryImpl.java | 2 +-
.../batch/v4/BatchRequestFactoryImpl.java | 2 +-
.../AbstractEdmEnabledInvokeRequestFactory.java | 172 +++++++++++++
.../invoke/AbstractInvokeRequestFactory.java | 55 +++-
.../v3/EdmEnabledInvokeRequestFactoryImpl.java | 78 +-----
.../invoke/v3/InvokeRequestFactoryImpl.java | 36 +--
.../v4/EdmEnabledInvokeRequestFactoryImpl.java | 78 +-----
.../invoke/v4/InvokeRequestFactoryImpl.java | 36 +--
.../AbstractRetrieveRequestFactory.java | 6 +-
.../v3/ODataLinkCollectionRequestImpl.java | 2 +-
.../retrieve/v3/RetrieveRequestFactoryImpl.java | 2 +-
.../retrieve/v4/RetrieveRequestFactoryImpl.java | 2 +-
.../retrieve/v4/XMLMetadataRequestImpl.java | 2 +-
.../apache/olingo/client/core/uri/URIUtils.java | 20 --
.../core/v3/EdmEnabledODataClientImpl.java | 2 +-
.../olingo/client/core/v3/ODataClientImpl.java | 4 +-
.../core/v4/EdmEnabledODataClientImpl.java | 2 +-
.../olingo/client/core/v4/ODataClientImpl.java | 4 +-
.../client/core/uri/v3/URIBuilderTest.java | 26 +-
.../client/core/uri/v4/URIBuilderTest.java | 26 +-
91 files changed, 1399 insertions(+), 913 deletions(-)
----------------------------------------------------------------------