Skip to content

Commit 2e0d451

Browse files
mamiksikmamiksik
committed
wip - I need to test the dockerfile on another machine
1 parent b6d1081 commit 2e0d451

File tree

14 files changed

+1490
-1
lines changed

14 files changed

+1490
-1
lines changed

‎Makefile

+22-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PYTHON_MODULE_FILES=$(shell find $(PYTHON_MODULE) -type f -name '*.py')
55
TESTS_DIR=tests
66
TESTS_UNIT_DIR=$(TESTS_DIR)
77
TESTS_UNIT_FILES=$(shell find $(TESTS_UNIT_DIR) -type f -name '*.py')
8+
TESTS_OLINGO_SERVER=$(TESTS_DIR)/olingo_server
89

910
PYTHON_BIN=python3
1011

@@ -26,6 +27,9 @@ COVERAGE_HTML_DIR=.htmlcov
2627
COVERAGE_HTML_ARGS=$(COVERAGE_REPORT_ARGS) -d $(COVERAGE_HTML_DIR)
2728
COVERAGE_REPORT_FILES=$(PYTHON_BINARIES) $(PYTHON_MODULE_FILES)
2829

30+
DOCKER_BIN=docker
31+
DOCKER_NAME=pyodata_olingo
32+
2933
all: check
3034

3135
.PHONY=check
@@ -56,4 +60,21 @@ doc:
5660

5761
.PHONY=clean
5862
clean:
59-
rm --preserve-root -rf $(COVERAGE_HTML_DIR) .coverage
63+
rm --preserve-root -rf $(COVERAGE_HTML_DIR) .coverage; true
64+
$(DOCKER_BIN) rmi pyodata_olingo; true
65+
$(DOCKER_BIN) rm --force pyodata_olingo; true
66+
67+
.PHONY=olingo
68+
build_olingo:
69+
$(DOCKER_BIN) rmi $(DOCKER_NAME); true
70+
$(DOCKER_BIN) build -t $(DOCKER_NAME) $(TESTS_OLINGO_SERVER)
71+
72+
run_olingo:
73+
$(DOCKER_BIN) run -it -p 8888:8080 --name $(DOCKER_NAME) $(DOCKER_NAME):latest
74+
75+
stop_olingo:
76+
$(DOCKER_BIN) stop $(DOCKER_NAME)
77+
$(DOCKER_BIN) rm --force $(DOCKER_NAME)
78+
79+
attach_olingo:
80+
$(DOCKER_BIN) attach $(DOCKER_NAME)

‎tests/olingo_server/Dockerfile

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM maven:3.6.0-jdk-8-alpine AS MAVEN_TOOL_CHAIN
2+
COPY pom.xml /tmp/
3+
COPY src /tmp/src/
4+
WORKDIR /tmp/
5+
RUN mvn clean install
6+
7+
FROM tomcat:9.0-jre8-alpine
8+
COPY --from=MAVEN_TOOL_CHAIN /tmp/target/odata-server*.war $CATALINA_HOME/webapps/odata-server.war
9+
10+
EXPOSE 8080
11+
12+
CMD ["catalina.sh", "run"]

‎tests/olingo_server/pom.xml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<groupId>org.apache.olingo</groupId>
7+
<artifactId>odata-server</artifactId>
8+
<packaging>war</packaging>
9+
<version>1.0</version>
10+
<name>${project.artifactId}</name>
11+
12+
<properties>
13+
<odata.version>4.2.0</odata.version>
14+
</properties>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>javax.servlet</groupId>
19+
<artifactId>servlet-api</artifactId>
20+
<version>2.5</version>
21+
<scope>provided</scope>
22+
</dependency>
23+
24+
<dependency>
25+
<groupId>org.apache.olingo</groupId>
26+
<artifactId>odata-server-api</artifactId>
27+
<version>${odata.version}</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.apache.olingo</groupId>
31+
<artifactId>odata-server-core</artifactId>
32+
<version>${odata.version}</version>
33+
<scope>runtime</scope>
34+
</dependency>
35+
36+
<dependency>
37+
<groupId>org.apache.olingo</groupId>
38+
<artifactId>odata-commons-api</artifactId>
39+
<version>${odata.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.olingo</groupId>
43+
<artifactId>odata-commons-core</artifactId>
44+
<version>${odata.version}</version>
45+
</dependency>
46+
47+
<dependency>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-api</artifactId>
50+
<version>1.7.7</version>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>org.slf4j</groupId>
55+
<artifactId>slf4j-simple</artifactId>
56+
<version>1.7.7</version>
57+
<scope>runtime</scope>
58+
</dependency>
59+
</dependencies>
60+
</project>

‎tests/olingo_server/src/main/java/org/apache/olingo/server/sample/CarsServlet.java

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.olingo.server.sample;
20+
21+
import java.io.IOException;
22+
import java.util.ArrayList;
23+
24+
import javax.servlet.ServletException;
25+
import javax.servlet.http.HttpServlet;
26+
import javax.servlet.http.HttpServletRequest;
27+
import javax.servlet.http.HttpServletResponse;
28+
import javax.servlet.http.HttpSession;
29+
30+
import org.apache.olingo.commons.api.edmx.EdmxReference;
31+
import org.apache.olingo.server.api.OData;
32+
import org.apache.olingo.server.api.ODataHttpHandler;
33+
import org.apache.olingo.server.api.ServiceMetadata;
34+
import org.apache.olingo.server.sample.data.DataProvider;
35+
import org.apache.olingo.server.sample.edmprovider.CarsEdmProvider;
36+
import org.apache.olingo.server.sample.processor.CarsProcessor;
37+
import org.slf4j.Logger;
38+
import org.slf4j.LoggerFactory;
39+
40+
public class CarsServlet extends HttpServlet {
41+
42+
private static final long serialVersionUID = 1L;
43+
private static final Logger LOG = LoggerFactory.getLogger(CarsServlet.class);
44+
45+
@Override
46+
protected void service(final HttpServletRequest req, final HttpServletResponse resp)
47+
throws ServletException, IOException {
48+
try {
49+
HttpSession session = req.getSession(true);
50+
DataProvider dataProvider = (DataProvider) session.getAttribute(DataProvider.class.getName());
51+
if (dataProvider == null) {
52+
dataProvider = new DataProvider();
53+
session.setAttribute(DataProvider.class.getName(), dataProvider);
54+
LOG.info("Created new data provider.");
55+
}
56+
57+
OData odata = OData.newInstance();
58+
ServiceMetadata edm = odata.createServiceMetadata(new CarsEdmProvider(), new ArrayList<EdmxReference>());
59+
ODataHttpHandler handler = odata.createHandler(edm);
60+
handler.register(new CarsProcessor(dataProvider));
61+
handler.process(req, resp);
62+
} catch (RuntimeException e) {
63+
LOG.error("Server Error", e);
64+
throw new ServletException(e);
65+
}
66+
}
67+
}

‎tests/olingo_server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java

+195
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.olingo.server.sample.data;
20+
21+
import java.net.URI;
22+
import java.net.URISyntaxException;
23+
import java.util.HashMap;
24+
import java.util.List;
25+
import java.util.Map;
26+
import org.apache.olingo.commons.api.ex.ODataException;
27+
import org.apache.olingo.commons.api.ex.ODataRuntimeException;
28+
import org.apache.olingo.commons.api.data.Entity;
29+
import org.apache.olingo.commons.api.data.EntityCollection;
30+
import org.apache.olingo.commons.api.data.Property;
31+
import org.apache.olingo.commons.api.data.ValueType;
32+
import org.apache.olingo.commons.api.data.ComplexValue;
33+
import org.apache.olingo.commons.api.edm.EdmEntitySet;
34+
import org.apache.olingo.commons.api.edm.EdmEntityType;
35+
import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
36+
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
37+
import org.apache.olingo.commons.api.edm.EdmProperty;
38+
import org.apache.olingo.server.api.uri.UriParameter;
39+
import org.apache.olingo.server.sample.edmprovider.CarsEdmProvider;
40+
41+
public class DataProvider {
42+
43+
private final Map<String, EntityCollection> data;
44+
45+
public DataProvider() {
46+
data = new HashMap<String, EntityCollection>();
47+
data.put("Cars", createCars());
48+
data.put("Manufacturers", createManufacturers());
49+
}
50+
51+
public EntityCollection readAll(EdmEntitySet edmEntitySet) {
52+
return data.get(edmEntitySet.getName());
53+
}
54+
55+
public Entity read(final EdmEntitySet edmEntitySet, final List<UriParameter> keys) throws DataProviderException {
56+
final EdmEntityType entityType = edmEntitySet.getEntityType();
57+
final EntityCollection entitySet = data.get(edmEntitySet.getName());
58+
if (entitySet == null) {
59+
return null;
60+
} else {
61+
try {
62+
for (final Entity entity : entitySet.getEntities()) {
63+
boolean found = true;
64+
for (final UriParameter key : keys) {
65+
final EdmProperty property = (EdmProperty) entityType.getProperty(key.getName());
66+
final EdmPrimitiveType type = (EdmPrimitiveType) property.getType();
67+
if (!type.valueToString(entity.getProperty(key.getName()).getValue(),
68+
property.isNullable(), property.getMaxLength(), property.getPrecision(), property.getScale(),
69+
property.isUnicode())
70+
.equals(key.getText())) {
71+
found = false;
72+
break;
73+
}
74+
}
75+
if (found) {
76+
return entity;
77+
}
78+
}
79+
return null;
80+
} catch (final EdmPrimitiveTypeException e) {
81+
throw new DataProviderException("Wrong key!", e);
82+
}
83+
}
84+
}
85+
86+
public static class DataProviderException extends ODataException {
87+
private static final long serialVersionUID = 5098059649321796156L;
88+
89+
public DataProviderException(String message, Throwable throwable) {
90+
super(message, throwable);
91+
}
92+
93+
public DataProviderException(String message) {
94+
super(message);
95+
}
96+
}
97+
98+
private EntityCollection createCars() {
99+
EntityCollection entitySet = new EntityCollection();
100+
Entity el = new Entity()
101+
.addProperty(createPrimitive("Id", 1))
102+
.addProperty(createPrimitive("Model", "F1 W03"))
103+
.addProperty(createPrimitive("ModelYear", "2012"))
104+
.addProperty(createPrimitive("Price", 189189.43))
105+
.addProperty(createPrimitive("Currency", "EUR"));
106+
el.setId(createId(CarsEdmProvider.ES_CARS_NAME, 1));
107+
entitySet.getEntities().add(el);
108+
109+
el = new Entity()
110+
.addProperty(createPrimitive("Id", 2))
111+
.addProperty(createPrimitive("Model", "F1 W04"))
112+
.addProperty(createPrimitive("ModelYear", "2013"))
113+
.addProperty(createPrimitive("Price", 199999.99))
114+
.addProperty(createPrimitive("Currency", "EUR"));
115+
el.setId(createId(CarsEdmProvider.ES_CARS_NAME, 2));
116+
entitySet.getEntities().add(el);
117+
118+
el = new Entity()
119+
.addProperty(createPrimitive("Id", 3))
120+
.addProperty(createPrimitive("Model", "F2012"))
121+
.addProperty(createPrimitive("ModelYear", "2012"))
122+
.addProperty(createPrimitive("Price", 137285.33))
123+
.addProperty(createPrimitive("Currency", "EUR"));
124+
el.setId(createId(CarsEdmProvider.ES_CARS_NAME, 3));
125+
entitySet.getEntities().add(el);
126+
127+
el = new Entity()
128+
.addProperty(createPrimitive("Id", 4))
129+
.addProperty(createPrimitive("Model", "F2013"))
130+
.addProperty(createPrimitive("ModelYear", "2013"))
131+
.addProperty(createPrimitive("Price", 145285.00))
132+
.addProperty(createPrimitive("Currency", "EUR"));
133+
el.setId(createId(CarsEdmProvider.ES_CARS_NAME, 4));
134+
entitySet.getEntities().add(el);
135+
136+
el = new Entity()
137+
.addProperty(createPrimitive("Id", 5))
138+
.addProperty(createPrimitive("Model", "F1 W02"))
139+
.addProperty(createPrimitive("ModelYear", "2011"))
140+
.addProperty(createPrimitive("Price", 167189.00))
141+
.addProperty(createPrimitive("Currency", "EUR"));
142+
el.setId(createId(CarsEdmProvider.ES_CARS_NAME, 5));
143+
entitySet.getEntities().add(el);
144+
145+
for (Entity entity:entitySet.getEntities()) {
146+
entity.setType(CarsEdmProvider.ET_CAR.getFullQualifiedNameAsString());
147+
}
148+
return entitySet;
149+
}
150+
151+
private EntityCollection createManufacturers() {
152+
EntityCollection entitySet = new EntityCollection();
153+
154+
Entity el = new Entity()
155+
.addProperty(createPrimitive("Id", 1))
156+
.addProperty(createPrimitive("Name", "Star Powered Racing"))
157+
.addProperty(createAddress("Star Street 137", "Stuttgart", "70173", "Germany"));
158+
el.setId(createId(CarsEdmProvider.ES_MANUFACTURER_NAME, 1));
159+
entitySet.getEntities().add(el);
160+
161+
el = new Entity()
162+
.addProperty(createPrimitive("Id", 2))
163+
.addProperty(createPrimitive("Name", "Horse Powered Racing"))
164+
.addProperty(createAddress("Horse Street 1", "Maranello", "41053", "Italy"));
165+
el.setId(createId(CarsEdmProvider.ES_MANUFACTURER_NAME, 2));
166+
entitySet.getEntities().add(el);
167+
168+
for (Entity entity:entitySet.getEntities()) {
169+
entity.setType(CarsEdmProvider.ET_MANUFACTURER.getFullQualifiedNameAsString());
170+
}
171+
return entitySet;
172+
}
173+
174+
private Property createAddress(final String street, final String city, final String zipCode, final String country) {
175+
ComplexValue complexValue=new ComplexValue();
176+
List<Property> addressProperties = complexValue.getValue();
177+
addressProperties.add(createPrimitive("Street", street));
178+
addressProperties.add(createPrimitive("City", city));
179+
addressProperties.add(createPrimitive("ZipCode", zipCode));
180+
addressProperties.add(createPrimitive("Country", country));
181+
return new Property(null, "Address", ValueType.COMPLEX, complexValue);
182+
}
183+
184+
private Property createPrimitive(final String name, final Object value) {
185+
return new Property(null, name, ValueType.PRIMITIVE, value);
186+
}
187+
188+
private URI createId(String entitySetName, Object id) {
189+
try {
190+
return new URI(entitySetName + "(" + String.valueOf(id) + ")");
191+
} catch (URISyntaxException e) {
192+
throw new ODataRuntimeException("Unable to create id for entity: " + entitySetName, e);
193+
}
194+
}
195+
}

0 commit comments

Comments
 (0)