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/04/21 10:51:18 UTC
[11/11] olingo-odata4 git commit: [OLINGO-573] Minor code clean up
[OLINGO-573] Minor code clean up
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d2cc50fb
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d2cc50fb
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d2cc50fb
Branch: refs/heads/master
Commit: d2cc50fb3dcf54c4d45ab715ef193ddbd1fd755f
Parents: f262563
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Apr 21 09:47:51 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Apr 21 10:38:36 2015 +0200
----------------------------------------------------------------------
lib/server-core-ext/pom.xml | 34 ++------------------
.../server/core/requests/ActionRequest.java | 1 -
.../server/core/requests/FunctionRequest.java | 1 -
.../server/core/ServiceDispatcherTest.java | 6 ++--
.../olingo/server/example/TripPinHandler.java | 1 -
.../server/example/TripPinServiceTest.java | 13 ++++----
6 files changed, 13 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d2cc50fb/lib/server-core-ext/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/pom.xml b/lib/server-core-ext/pom.xml
index 2c411fb..1befeb0 100644
--- a/lib/server-core-ext/pom.xml
+++ b/lib/server-core-ext/pom.xml
@@ -33,9 +33,6 @@
<version>4.0.0-beta-03-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <properties>
- <jetty-version>9.2.7.v20150116</jetty-version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
@@ -69,10 +66,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -83,27 +82,6 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<scope>test</scope>
@@ -129,11 +107,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
-
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d2cc50fb/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java
index d4502cc..42ff6ba 100644
--- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java
+++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java
@@ -36,7 +36,6 @@ import org.apache.olingo.server.core.ServiceHandler;
import org.apache.olingo.server.core.responses.EntityResponse;
import org.apache.olingo.server.core.responses.EntitySetResponse;
import org.apache.olingo.server.core.responses.NoContentResponse;
-import org.apache.olingo.server.core.responses.PrimitiveValueResponse;
import org.apache.olingo.server.core.responses.PropertyResponse;
public class ActionRequest extends OperationRequest {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d2cc50fb/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java
index b77fb2b..6072495 100644
--- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java
+++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java
@@ -36,7 +36,6 @@ import org.apache.olingo.server.core.ContentNegotiatorException;
import org.apache.olingo.server.core.ServiceHandler;
import org.apache.olingo.server.core.responses.EntityResponse;
import org.apache.olingo.server.core.responses.EntitySetResponse;
-import org.apache.olingo.server.core.responses.PrimitiveValueResponse;
import org.apache.olingo.server.core.responses.PropertyResponse;
public class FunctionRequest extends OperationRequest {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d2cc50fb/lib/server-core-ext/src/test/java/org/apache/olingo/server/core/ServiceDispatcherTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/test/java/org/apache/olingo/server/core/ServiceDispatcherTest.java b/lib/server-core-ext/src/test/java/org/apache/olingo/server/core/ServiceDispatcherTest.java
index d646757..17e0c61 100644
--- a/lib/server-core-ext/src/test/java/org/apache/olingo/server/core/ServiceDispatcherTest.java
+++ b/lib/server-core-ext/src/test/java/org/apache/olingo/server/core/ServiceDispatcherTest.java
@@ -68,8 +68,7 @@ import org.mockito.Mockito;
public class ServiceDispatcherTest {
private static final int TOMCAT_PORT = 9900;
private Tomcat tomcat = new Tomcat();
- private String baseURL;
-
+
public class SampleODataServlet extends HttpServlet {
private final ServiceHandler handler; // must be stateless
private final EdmProvider provider; // must be stateless
@@ -98,10 +97,11 @@ public class ServiceDispatcherTest {
"src/test/resources/trippin.xml"));
File baseDir = new File(System.getProperty("java.io.tmpdir"));
+ tomcat.setBaseDir(baseDir.getAbsolutePath());
+ tomcat.getHost().setAppBase(baseDir.getAbsolutePath());
Context cxt = tomcat.addContext("/trippin", baseDir.getAbsolutePath());
Tomcat.addServlet(cxt, "trippin", new SampleODataServlet(serviceHandler, edmProvider));
cxt.addServletMapping("/*", "trippin");
- baseURL = "http://" + tomcat.getHost().getName() + ":"+ TOMCAT_PORT;
tomcat.setPort(TOMCAT_PORT);
tomcat.start();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d2cc50fb/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java
index 7172818..d8cafc1 100644
--- a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java
+++ b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java
@@ -36,7 +36,6 @@ import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.EdmFunction;
import org.apache.olingo.commons.api.edm.EdmProperty;
import org.apache.olingo.commons.api.edm.EdmSingleton;
-import org.apache.olingo.commons.api.edm.provider.EntitySet;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.server.api.OData;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d2cc50fb/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
index 7eb73ef..dac728b 100644
--- a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
+++ b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
@@ -67,6 +67,8 @@ public class TripPinServiceTest {
public static void beforeTest() throws Exception {
tomcat.setPort(TOMCAT_PORT);
File baseDir = new File(System.getProperty("java.io.tmpdir"));
+ tomcat.setBaseDir(baseDir.getAbsolutePath());
+ tomcat.getHost().setAppBase(baseDir.getAbsolutePath());
Context cxt = tomcat.addContext("/trippin", baseDir.getAbsolutePath());
Tomcat.addServlet(cxt, "trippin", new TripPinServlet());
cxt.addServletMapping("/*", "trippin");
@@ -80,7 +82,7 @@ public class TripPinServiceTest {
}
private HttpHost getLocalhost() {
- return new HttpHost(tomcat.getHost().getName(), 9900);
+ return new HttpHost(tomcat.getHost().getName(), TOMCAT_PORT);
}
private HttpResponse httpGET(String url, int expectedStatus) throws Exception{
@@ -94,8 +96,7 @@ public class TripPinServiceTest {
return response;
}
- private JsonNode getJSONNode(HttpResponse response) throws IOException,
- JsonProcessingException {
+ private JsonNode getJSONNode(HttpResponse response) throws IOException {
ObjectMapper objectMapper = new ObjectMapper();
JsonNode node = objectMapper.readTree(response.getEntity().getContent());
return node;
@@ -103,9 +104,9 @@ public class TripPinServiceTest {
private String getHeader(HttpResponse response, String header) {
Header[] headers = response.getAllHeaders();
- for (int i = 0; i < headers.length; i++) {
- if (headers[i].getName().equalsIgnoreCase(header)) {
- return headers[i].getValue();
+ for (Header h : headers) {
+ if (h.getName().equalsIgnoreCase(header)) {
+ return h.getValue();
}
}
return null;