Skip to content

Release 2.0 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Nov 22, 2017
Merged

Release 2.0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bc13e84
Added base configuration artificate to be used in other project
pokki-deploy Nov 10, 2017
d945acc
Merge pull request #3 from vinscom/add-base-configuration-artifact
vinscom Nov 10, 2017
7efe76d
Refactored SockJS Code
pokki-deploy Nov 10, 2017
84ab708
Merge pull request #4 from vinscom/update-sockjs
vinscom Nov 10, 2017
efd2b1e
Minor fix
pokki-deploy Nov 11, 2017
5c07267
Refactored BridgeEventHandler
pokki-deploy Nov 11, 2017
73a8ec9
Merge pull request #5 from vinscom/Refactored-Bridge-Event-Handler
vinscom Nov 11, 2017
25437e2
Glue Code Refactoring
pokki-deploy Nov 12, 2017
c060602
Merge pull request #6 from vinscom/change-glue-api
vinscom Nov 12, 2017
edd8544
Minor refactoring
pokki-deploy Nov 12, 2017
0fb3953
Added Mongo and Scheduler
pokki-deploy Nov 12, 2017
c6da848
Merge pull request #7 from vinscom/add-mongo-scheduler
vinscom Nov 12, 2017
0ae4fc1
Added dataloader component
pokki-deploy Nov 13, 2017
c8eaf25
Merge pull request #8 from vinscom/add-data-loader
vinscom Nov 13, 2017
b8dc3fb
Minor Refactoring
pokki-deploy Nov 22, 2017
1bf1eed
Merge pull request #9 from vinscom/minor-refactoring
vinscom Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/target/
/target/
.classpath
.project
nbactions.xml
.settings
1 change: 1 addition & 0 deletions config-layers/common/Initial.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#/Initial
$class=in.erail.glue.component.Initial

initial=\
Expand Down
27 changes: 27 additions & 0 deletions config-layers/common/io/vertx/ext/mongo/LoadMongoDataService.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#/io/vertx/ext/mongo/LoadMongoDataService
$class=io.vertx.reactivex.ext.mongo.LoadMongoDataService

#Example Data JSON
#{
# "test": [
# {
# "name": "data1"
# },
# {
# "name": "data2"
# }
# ],
# "test2": [
# {
# "name": "data1"
# },
# {
# "name": "data2"
# }
# ]
#}

enable=false
mongoClient^=/io/vertx/ext/mongo/MongoClientInstance.mongoClient
data=data.json

6 changes: 6 additions & 0 deletions config-layers/common/io/vertx/ext/mongo/MongoClientInstance.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#/io/vertx/ext/mongo/MongoClientInstance
$class=io.vertx.reactivex.ext.mongo.MongoClientInstance

vertx^=/io/vertx/core/VertxInstance.vertx
config=mongoConfig.json
enable=false
1 change: 1 addition & 0 deletions config-layers/common/io/vertx/ext/mongo/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
4 changes: 4 additions & 0 deletions config-layers/common/io/vertx/ext/mongo/mongoConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"db_name" : "",
"connection_string" : "mongodb://localhost:27017"
}
5 changes: 4 additions & 1 deletion config-layers/common/io/vertx/ext/web/handler/sockjs/BridgeEventHandler.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
#/io/vertx/ext/web/handler/sockjs/BridgeEventHandler
$class=io.vertx.reactivex.ext.web.handler.sockjs.DefaultBridgeEventHandler
$class=io.vertx.reactivex.ext.web.handler.sockjs.BridgeEventHandler

addressAllowedToRegister=
addressAllowedToRegisterRegex=
1 change: 1 addition & 0 deletions config-layers/common/io/vertx/ext/web/handler/sockjs/BridgeOptions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ inboundAddressRegex=
outboundAddressRegex=
inboundRequiredAuthority=
outboundRequiredAuthority=
log=true
261 changes: 141 additions & 120 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,124 +1,145 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>in.erail</groupId>
<artifactId>api-framwork</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>in.erail</groupId>
<artifactId>glue</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-rx-java2</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-unit</artifactId>
<version>3.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-api-contract</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-hazelcast</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-auth-jwt</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-auth-oauth2</artifactId>
<version>3.5.0</version>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<argLine>-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -Dglue.layers=${project.basedir}/config-layers/common,${project.basedir}/config-layers/test</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
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>
<groupId>in.erail</groupId>
<artifactId>api-framwork</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>in.erail</groupId>
<artifactId>glue</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-rx-java2</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-api-contract</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-unit</artifactId>
<version>3.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-hazelcast</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-auth-jwt</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-auth-oauth2</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-mongo-client</artifactId>
<version>3.5.0</version>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<argLine>-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -Dglue.layers=${project.basedir}/config-layers/common,${project.basedir}/config-layers/test</argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<descriptor>src/assembly/dep.xml</descriptor>
</configuration>
<executions>
<execution>
<id>create-archive</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->

<dataFile>target/jacoco.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<outputDirectory>target/jacoco-ut</outputDirectory>
</configuration>
</execution>
</executions>
<configuration>
<systemPropertyVariables>
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
<name>api-framwork</name>
<dataFile>target/jacoco.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<outputDirectory>target/jacoco-ut</outputDirectory>
</configuration>
</execution>
</executions>
<configuration>
<systemPropertyVariables>
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
<name>api-framwork</name>
</project>
15 changes: 15 additions & 0 deletions src/assembly/dep.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>config</id>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>${project.basedir}/config-layers/common</directory>
<outputDirectory>/config</outputDirectory>
</fileSet>
</fileSets>
</assembly>
5 changes: 5 additions & 0 deletions src/main/java/in/erail/common/FramworkConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,9 @@ public static class Json {
}

}

public static class SockJS {
public static final String BRIDGE_EVENT_RAW_MESSAGE_ADDRESS = "address";
}

}
4 changes: 2 additions & 2 deletions src/main/java/in/erail/route/OpenAPI3RouteBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ public void process(RoutingContext pRequestContext, String pServiceUniqueId) {
.setStatusCode(200)
.end(reply.result().body().toString());
} else {
getLog().debug(() -> "Error in reply:" + reply.cause().toString());
getLog().error(() -> "Error in reply:" + reply.cause().toString());
pRequestContext
.response()
.setStatusCode(400)
.end();
.end(reply.cause().toString());
}
});

Expand Down
Loading