Skip to content

Commit

Permalink
spring v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@heinpa
heinpa committed Jun 2, 2020
1 parent ae73e86 commit 36948c7
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 82 deletions.
7 changes: 7 additions & 0 deletions qanary_component-NER-EntityClassifier2/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM openjdk:11

# Add the service itself
ARG JAR_FILE
ADD target/${JAR_FILE} /qanary-service.jar

ENTRYPOINT ["java", "-jar", "/qanary-service.jar"]
67 changes: 36 additions & 31 deletions qanary_component-NER-EntityClassifier2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<groupId>eu.wdaqua.qanary.component</groupId>
<artifactId>qanary_component-NER-EntityClassifier2</artifactId>
<version>1.0.0</version>
<version>2.0.0</version>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.3.RELEASE</version>
<version>2.1.6.RELEASE</version>
</parent>
<properties>
<java.version>1.8</java.version>
<qanary.version>[1.,2.)</qanary.version>
<java.version>11</java.version>
<qanary.version>[2.0.0,3.0.0)</qanary.version>
<docker.image.prefix>qanary</docker.image.prefix>
<!-- Replace the name of the docker image to be generated -->
<docker.image.name>my-qanary-component</docker.image.name>
<docker.image.name>ner-entity-classifier2</docker.image.name>
<dockerfile-maven-version>1.4.13</dockerfile-maven-version>
</properties>

<dependencies>
Expand All @@ -30,9 +30,9 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>1.3.0</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand All @@ -43,7 +43,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -55,55 +54,61 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>3.2.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>0.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path-assert</artifactId>
<version>0.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>eu.wdaqua.qanary.EntityClassifier2.Application</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<!-- https://github.com/spotify/dockerfile-maven -->
<!-- build Docker image: mvn dockerfile:build -->
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.10</version>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile-maven-version}</version>
<executions>
<execution>
<id>build-image</id>
<phase>package</phase>
<id>default</id>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
<configuration>
<imageName>${docker.image.prefix}/${docker.image.name}</imageName>
<dockerDirectory>${basedir}/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.artifactId}-${project.version}.jar</include>
</resource>
</resources>
<imageTags>
<imageTag>${project.version}</imageTag>
</imageTags>
</configuration>
</execution>
</executions>
<configuration>
<repository>${docker.image.name}</repository>
<tag>${project.version}</tag>
<buildArgs>
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
7 changes: 6 additions & 1 deletion qanary_component-NER-EntityClassifier2/src/main/resources/config/application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
# Update the port number
server.port=8085
spring.application.name=EntityClassifier2
spring.application.description=${app.name} is a Qanary component
spring.application.description=${spring.application.name} is a Qanary component

# Update the URL of the qanary pipeline
spring.boot.admin.url=http://localhost:8080
spring.boot.admin.client.url=${spring.boot.admin.url}
# the service url
#spring.boot.admin.client.service-base-url=http://0.0.0.0:${server.port}/
spring.boot.admin.client.instance.service-base-url=http://0.0.0.0:${server.port}/

# log level definitions
# change logging level in production
Expand Down
76 changes: 26 additions & 50 deletions ...sifier2/src/test/java/eu/wdaqua/qanary/EntityClassifier2/TestQanaryServiceController.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package eu.wdaqua.qanary.EntityClassifier2;


import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
Expand All @@ -15,11 +14,12 @@
import javax.inject.Inject;

import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.test.SpringApplicationContextLoader;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
Expand All @@ -30,14 +30,18 @@
import org.springframework.util.Assert;
import org.springframework.web.servlet.view.InternalResourceViewResolver;

import static eu.wdaqua.qanary.commons.config.QanaryConfiguration.endpointKey;
import static eu.wdaqua.qanary.commons.config.QanaryConfiguration.inGraphKey;
import static eu.wdaqua.qanary.commons.config.QanaryConfiguration.outGraphKey;

import eu.wdaqua.qanary.commons.QanaryMessage;
import eu.wdaqua.qanary.commons.config.QanaryConfiguration;
import eu.wdaqua.qanary.component.QanaryService;
import eu.wdaqua.qanary.component.QanaryServiceController;
import net.minidev.json.JSONObject;

@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = { QanaryService.class }, loader = SpringApplicationContextLoader.class)
@SpringBootTest(classes = Application.class)
@WebAppConfiguration
public class TestQanaryServiceController {

Expand All @@ -50,7 +54,7 @@ public class TestQanaryServiceController {

/**
* initialize local controller enabled for tests
*
*
* @throws Exception
*/
@Before
Expand All @@ -64,43 +68,28 @@ public void setUp() throws Exception {

/**
* test description interface
*
* @throws Exception
*/
@Test
public void testDescriptionAvailable() {

MvcResult result;
try {
result = mockMvc.perform(get(QanaryConfiguration.description)) // fetch
.andExpect(status().isOk()) // HTTP 200
.andExpect(content().contentType(MediaType.TEXT_HTML)) //
.andReturn(); // HTML
assert (result.getRequest().getContentLength() > 0);
} catch (Exception e) {
fail(e.getMessage());
}
public void testDescriptionAvailable() throws Exception {
mockMvc.perform(get(QanaryConfiguration.description)) // fetch
.andExpect(status().isOk()) // HTTP 200
.andReturn(); //
}

/**
* send and receive message a JSON message to
* QanaryConfiguration.annotatequestion, check if the values are the same
*/
@Test
@Ignore // this test cannot be executed as the triplestore needs to be mocked first
public void testMessageReceiveAndSend() {
String testEndPoint = "http://qanary.test/endpoint";
String testInGraph = "http://qanary.test/graph/in";
String testOutGraph = "http://qanary.test/graph/out";

// create a JSON object with required properties
JSONObject jsonObject = new JSONObject();
// TODO: replace key by URLs of the qa commons
jsonObject.put(QanaryConfiguration.endpointKey, testEndPoint);
jsonObject.put("ingraph", testInGraph);
jsonObject.put("outgraph", testOutGraph);

// create message from json string
QanaryMessage requestMessage;
try {
requestMessage = new QanaryMessage(jsonObject.toJSONString());
requestMessage = new QanaryMessage(new URI(endpointKey), new URI(inGraphKey), new URI(outGraphKey));
logger.info("Message {}" + requestMessage);
} catch (URISyntaxException e) {
fail(e.getMessage());
return;
Expand All @@ -109,12 +98,11 @@ public void testMessageReceiveAndSend() {
// check the response
MvcResult res;
try {
res = mockMvc
.perform( //
post(QanaryConfiguration.annotatequestion) //
.content(requestMessage.asJsonString()) //
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk()) // ok
res = mockMvc.perform( //
post(QanaryConfiguration.annotatequestion) //
.content(requestMessage.asJsonString()) //
.contentType(MediaType.APPLICATION_JSON))
// .andExpect(status().is2xxSuccessful()) //
.andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON)) //
.andReturn();
} catch (Exception e) {
Expand Down Expand Up @@ -145,27 +133,15 @@ public void testMessageReceiveAndSend() {
*/
@Test
public void testMessageFromJson() {

String testEndPoint = "http://qanary.test/endpoint";
String testInGraph = "http://qanary.test/graph/in";
String testOutGraph = "http://qanary.test/graph/out";

// create a JSON object with required properties
JSONObject jsonObject = new JSONObject();
// TODO: replace key by URLs of the qa commons
jsonObject.put(QanaryConfiguration.endpointKey, testEndPoint);
jsonObject.put("ingraph", testInGraph);
jsonObject.put("outgraph", testOutGraph);

// create message from json string
QanaryMessage message;
try {
message = new QanaryMessage(jsonObject.toJSONString());
message = new QanaryMessage(new URI(endpointKey), new URI(inGraphKey), new URI(outGraphKey));

URI endpointKeyUrlFromMessage = message.getEndpoint();
Assert.notNull(endpointKeyUrlFromMessage);
assertNotNull(endpointKeyUrlFromMessage);

URI endpointKeyUrlFromHere = new URI(testEndPoint);
URI endpointKeyUrlFromHere = new URI(endpointKey);

// TODO: more tests to ensure mechanism
assertTrue(endpointKeyUrlFromHere.toString().compareTo(endpointKeyUrlFromMessage.toString()) == 0);
Expand Down

0 comments on commit 36948c7

Please sign in to comment.