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/08/18 14:52:22 UTC
[1/2] olingo-odata4 git commit: [OLINGO-659] Small dependency
enhancement
Repository: olingo-odata4
Updated Branches:
refs/heads/master 7ec7168b1 -> e79f62838
[OLINGO-659] Small dependency enhancement
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7df31c58
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7df31c58
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7df31c58
Branch: refs/heads/master
Commit: 7df31c58c399af633d7ca42e3b9fa65c8646ffdd
Parents: 7ec7168
Author: Christian Amend <ch...@sap.com>
Authored: Tue Aug 18 10:26:01 2015 +0200
Committer: Christian Amend <ch...@sap.com>
Committed: Tue Aug 18 14:19:25 2015 +0200
----------------------------------------------------------------------
lib/client-api/pom.xml | 4 +++
lib/commons-api/pom.xml | 11 +------
.../olingo/commons/core/edm/EdmTermImpl.java | 5 +---
.../server/api/ODataLibraryException.java | 4 ---
.../olingo/server/api/debug/DebugSupport.java | 12 ++++++--
.../server/api/processor/DefaultProcessor.java | 1 -
lib/server-tecsvc/pom.xml | 4 +++
.../xml/ODataXmlDeserializerTest.java | 31 ++++++++++----------
samples/server/pom.xml | 16 ++++++----
9 files changed, 46 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/lib/client-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml
index abd5415..74f2f06 100644
--- a/lib/client-api/pom.xml
+++ b/lib/client-api/pom.xml
@@ -41,6 +41,10 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/lib/commons-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml
index dc71493..47a411a 100644
--- a/lib/commons-api/pom.xml
+++ b/lib/commons-api/pom.xml
@@ -38,22 +38,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java
index 0f60716..ec6223a 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java
@@ -30,12 +30,9 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.edm.geo.SRID;
import org.apache.olingo.commons.api.edm.provider.CsdlTerm;
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class EdmTermImpl extends AbstractEdmNamed implements EdmTerm {
- private static final Logger LOG = LoggerFactory.getLogger(EdmTermImpl.class);
private final CsdlTerm term;
private final FullQualifiedName fqn;
private final EdmTypeInfo typeInfo;
@@ -92,7 +89,7 @@ public class EdmTermImpl extends AbstractEdmNamed implements EdmTerm {
try {
appliesToLocal.add(ClassUtils.getClass(EdmTerm.class.getPackage().getName() + ".Edm" + element));
} catch (ClassNotFoundException e) {
- LOG.error("Could not load Edm class for {}", element, e);
+ throw new EdmException("Could not load Edm class for {} " + element, e);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java
index 86125cd..013280a 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java
@@ -26,8 +26,6 @@ import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.apache.olingo.commons.api.ODataException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Abstract superclass of all translatable server exceptions.
@@ -35,7 +33,6 @@ import org.slf4j.LoggerFactory;
public abstract class ODataLibraryException extends ODataException {
private static final long serialVersionUID = -1210541002198287561L;
- private static final Logger LOG = LoggerFactory.getLogger(ODataLibraryException.class);
private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
protected static final String DEFAULT_SERVER_BUNDLE_NAME = "server-core-exceptions-i18n";
@@ -109,7 +106,6 @@ public abstract class ODataLibraryException extends ODataException {
try {
return ResourceBundle.getBundle(getBundleName(), locale == null ? DEFAULT_LOCALE : locale);
} catch (final MissingResourceException e) {
- LOG.error(e.getMessage(), e);
return null;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java
index 7a94c44..b3721e6 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java
@@ -31,11 +31,19 @@ public interface DebugSupport {
public static final String ODATA_DEBUG_HTML = "html";
public static final String ODATA_DEBUG_DOWNLOAD = "download";
- //TODO:JavaDoc
+ /**
+ * Initializes the debug support implementation. Is called before {@link #isUserAuthorized()} and
+ * {@link #createDebugResponse(String, DebugInformation)}
+ * @param odata
+ */
void init(OData odata);
+ /**
+ * This method is called to make sure that the user that requested the debug output is authorized to see this output.
+ * @return true if the current user is authorized
+ */
boolean isUserAuthorized();
-
+
/**
* This method should create a debug response and deliver it back to the Olingo library. This method MUST NEVER throw
* an exception.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java
index 376315a..46c7d88 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java
@@ -20,7 +20,6 @@ package org.apache.olingo.server.api.processor;
import java.io.ByteArrayInputStream;
import java.nio.charset.Charset;
-import java.util.Locale;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/lib/server-tecsvc/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml
index 5bb18ce..655e756 100644
--- a/lib/server-tecsvc/pom.xml
+++ b/lib/server-tecsvc/pom.xml
@@ -143,6 +143,10 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlDeserializerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlDeserializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlDeserializerTest.java
index fb7e7ff..ac24bad 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlDeserializerTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlDeserializerTest.java
@@ -29,7 +29,6 @@ import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.edm.EdmComplexType;
import org.apache.olingo.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.commons.api.edm.EdmEntitySet;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
@@ -83,59 +82,59 @@ public class ODataXmlDeserializerTest {
XMLUnit.setCompareUnmatched(false);
}
- private Object edmInt16(String value) throws EdmPrimitiveTypeException {
+ protected Object edmInt16(String value) throws EdmPrimitiveTypeException {
return EdmInt16.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmInt16.getInstance().getDefaultType());
}
- private Object edmInt32(String value) throws EdmPrimitiveTypeException {
+ protected Object edmInt32(String value) throws EdmPrimitiveTypeException {
return EdmInt32.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmInt32.getInstance().getDefaultType());
}
- private Object edmInt64(String value) throws EdmPrimitiveTypeException {
+ protected Object edmInt64(String value) throws EdmPrimitiveTypeException {
return EdmInt64.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmInt64.getInstance().getDefaultType());
}
- private Object edmSingle(String value) throws EdmPrimitiveTypeException {
+ protected Object edmSingle(String value) throws EdmPrimitiveTypeException {
return EdmSingle.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmSingle.getInstance().getDefaultType());
}
- private Object edmDouble(String value) throws EdmPrimitiveTypeException {
+ protected Object edmDouble(String value) throws EdmPrimitiveTypeException {
return EdmDouble.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmDouble.getInstance().getDefaultType());
}
- private Object edmSByte(String value) throws EdmPrimitiveTypeException {
+ protected Object edmSByte(String value) throws EdmPrimitiveTypeException {
return EdmSByte.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmSByte.getInstance().getDefaultType());
}
- private Object edmByte(String value) throws EdmPrimitiveTypeException {
+ protected Object edmByte(String value) throws EdmPrimitiveTypeException {
return EdmByte.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmByte.getInstance().getDefaultType());
}
- private Object edmDecimal(String value) throws EdmPrimitiveTypeException {
+ protected Object edmDecimal(String value) throws EdmPrimitiveTypeException {
return EdmDecimal.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmDecimal.getInstance().getDefaultType());
}
- private Object edmBinary(String value) throws EdmPrimitiveTypeException {
+ protected Object edmBinary(String value) throws EdmPrimitiveTypeException {
return EdmBinary.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmBinary.getInstance().getDefaultType());
}
- private Object edmDate(String value) throws EdmPrimitiveTypeException {
+ protected Object edmDate(String value) throws EdmPrimitiveTypeException {
return EdmDate.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmDate.getInstance().getDefaultType());
}
- private Object edmDateTimeOffset(String value) throws EdmPrimitiveTypeException {
+ protected Object edmDateTimeOffset(String value) throws EdmPrimitiveTypeException {
return EdmDateTimeOffset.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmDateTimeOffset.getInstance().getDefaultType());
}
- private Object edmDuration(String value) throws EdmPrimitiveTypeException {
+ protected Object edmDuration(String value) throws EdmPrimitiveTypeException {
return EdmDuration.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmDuration.getInstance().getDefaultType());
}
- private Object edmGUID(String value) throws EdmPrimitiveTypeException {
+ protected Object edmGUID(String value) throws EdmPrimitiveTypeException {
return EdmGuid.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmGuid.getInstance().getDefaultType());
}
- private Object edmTimeOfDay(String value) throws EdmPrimitiveTypeException {
+ protected Object edmTimeOfDay(String value) throws EdmPrimitiveTypeException {
return EdmTimeOfDay.getInstance().valueOfString(value, true, 10, 10, 10, true,
EdmTimeOfDay.getInstance().getDefaultType());
}
@@ -344,6 +343,7 @@ public class ODataXmlDeserializerTest {
return null;
}
+ @SuppressWarnings("unchecked")
@Test
public void entityMixPrimCollComp() throws Exception {
final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESMixPrimCollComp");
@@ -567,6 +567,7 @@ public class ODataXmlDeserializerTest {
Assert.assertEquals("Obere Str. 57", getCVProperty(cv, "Street").asPrimitive());
}
+ @SuppressWarnings("unchecked")
@Test
public void complexCollectionProperty() throws Exception {
final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESMixPrimCollComp");
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7df31c58/samples/server/pom.xml
----------------------------------------------------------------------
diff --git a/samples/server/pom.xml b/samples/server/pom.xml
index 03c5f25..e4ae3b3 100644
--- a/samples/server/pom.xml
+++ b/samples/server/pom.xml
@@ -27,12 +27,12 @@
<packaging>war</packaging>
<name>${project.artifactId}</name>
- <parent>
- <groupId>org.apache.olingo</groupId>
- <artifactId>odata-samples</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>odata-samples</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<build>
<plugins>
@@ -79,6 +79,10 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.7</version>
<scope>runtime</scope>
[2/2] olingo-odata4 git commit: [OLINGO-487] Make property name known
for proxy error case
Posted by ch...@apache.org.
[OLINGO-487] Make property name known for proxy error case
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/e79f6283
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e79f6283
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e79f6283
Branch: refs/heads/master
Commit: e79f628386c300ae014d1ad4aefcaca76ad425de
Parents: 7df31c5
Author: Christian Amend <ch...@sap.com>
Authored: Tue Aug 18 14:51:21 2015 +0200
Committer: Christian Amend <ch...@sap.com>
Committed: Tue Aug 18 14:51:21 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/olingo/ext/pojogen/AbstractUtility.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e79f6283/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
index 7e0dbdd..c94129b 100644
--- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
+++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
@@ -140,19 +140,19 @@ public abstract class AbstractUtility {
return getNavigationBindings(sourceEntityType, property);
} catch (Exception e) {
// maybe source entity type without entity set ...
- return getNavigationBindings(property.getType());
+ return getNavigationBindings(property.getType(), property.getName());
}
}
- private NavPropertyBindingDetails getNavigationBindings(final EdmStructuredType type) {
+ private NavPropertyBindingDetails getNavigationBindings(final EdmStructuredType type, String propertyName) {
if (type == null) {
- throw new IllegalStateException("Invalid navigation property");
+ throw new IllegalStateException("No EntitySet defined. Invalid navigation property: " + propertyName);
}
try {
return new NavPropertyBindingDetails(edm, type);
} catch (IllegalStateException ignore) {
- return getNavigationBindings(type.getBaseType());
+ return getNavigationBindings(type.getBaseType(), propertyName);
}
}