You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/01/07 15:02:09 UTC
[2/2] olingo-odata2 git commit: [OLINGO-193] Renamed artifact and
minor code clean up
[OLINGO-193] Renamed artifact and minor code clean up
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/92531140
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/92531140
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/92531140
Branch: refs/heads/OLINGO-193_SpringSupport
Commit: 92531140bb369a98a12c6a85f3f8aac08fb803bc
Parents: 5b63277
Author: Michael Bolz <mi...@sap.com>
Authored: Wed Jan 7 14:54:42 2015 +0100
Committer: Michael Bolz <mi...@sap.com>
Committed: Wed Jan 7 14:54:42 2015 +0100
----------------------------------------------------------------------
.../olingo/odata2/core/rest/ODataRootLocator.java | 3 +--
odata2-spring/pom.xml | 2 +-
.../olingo/odata2/spring/OlingoRootLocator.java | 16 ----------------
3 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/92531140/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
index e75ef5d..57a8bc8 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
@@ -151,8 +151,7 @@ public class ODataRootLocator {
factoryClass = Class.forName(factoryClassName, true, cl);
}
}
- ODataServiceFactory serviceFactory = (ODataServiceFactory) factoryClass.newInstance();
- return serviceFactory;
+ return (ODataServiceFactory) factoryClass.newInstance();
} catch (Exception e) {
throw new ODataRuntimeException("Exception during ODataServiceFactory creation occured.", e);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/92531140/odata2-spring/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml
index ed1c7b3..1a10bb9 100755
--- a/odata2-spring/pom.xml
+++ b/odata2-spring/pom.xml
@@ -12,7 +12,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>odata2-spring</artifactId>
+ <artifactId>olingo-odata2-spring</artifactId>
<name>${project.artifactId}</name>
<parent>
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/92531140/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java
----------------------------------------------------------------------
diff --git a/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java b/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java
index 4cfceea..82442d6 100644
--- a/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java
+++ b/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java
@@ -19,25 +19,9 @@
package org.apache.olingo.odata2.spring;
import org.apache.olingo.odata2.api.ODataServiceFactory;
-import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.core.rest.ODataRedirectLocator;
-import org.apache.olingo.odata2.core.rest.ODataSubLocator;
-import org.apache.olingo.odata2.core.rest.SubLocatorParameter;
import org.apache.olingo.odata2.core.rest.ODataRootLocator;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Encoded;
-import javax.ws.rs.HeaderParam;
import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.UriInfo;
-import java.util.List;
/**
* Default OData root locator responsible to handle the whole path and delegate all calls to a sub locator:<p>