Skip to content

Commit 4d03e6e

Browse files
gazbertgazbert
authored
4th delivery of static analysis improvements to master (#110)
* #106 : Switched Travis badge to monitor new branch * #102 : Removed class, got merged back in from master - doh! * #102 : Fixed another sonar security issue * #102 : Increase test coverage as per Sonar report * #102 : Increase test coverage as per Sonar report * #102 : Increase test coverage as per Sonar report * #102 : Increase test coverage as per Sonar report * #106 : Use awaitility in engine tests * #106 : Sonar code coverage work * #106 : Sonar code coverage work * #106 : Sonar code coverage work * #106 : Sonar code coverage work * #106 : Sonar code coverage work * #106 : Sonar code coverage work * #106 : Sonar code coverage work * #106 : Sonar code coverage work * #106 : Sonar code cleanup * #106 : Sonar code cleanup * #106 : Sonar code cleanup * #106 : Sonar code cleanup * #106 : Sonar code cleanup * #106 : Updated code coverage thresholds
1 parent ae1b76b commit 4d03e6e

File tree

48 files changed

+1980
-1334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1980
-1334
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BX-bot
22

3-
[![Build Status](https://travis-ci.org/gazbert/bxbot.svg?branch=master)](https://travis-ci.org/gazbert/bxbot)
3+
[![Build Status](https://travis-ci.org/gazbert/bxbot.svg?branch=bxbot-sonar-cleanup)](https://travis-ci.org/gazbert/bxbot)
44
[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=gazbert_bxbot&metric=alert_status)](https://sonarcloud.io/dashboard?id=gazbert_bxbot)
55
[![Join the chat at https://gitter.im/BX-bot/Lobby](https://badges.gitter.im/BX-bot/Lobby.svg)](https://gitter.im/BX-bot/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
66

‎build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ ext.libraries = [
6464
spring_boot_starter_test : dependencies.create("org.springframework.boot:spring-boot-starter-test:" + ext.versions.springBootVersion) {
6565
exclude module: "spring-boot-starter-logging"
6666
force = true
67-
}
67+
},
68+
awaitility : dependencies.create("org.awaitility:awaitility:3.1.6"),
6869
]
6970

7071
allprojects {

‎bxbot-app/pom.xml

Lines changed: 99 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,105 @@
11
<?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/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
45

5-
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>bxbot-app</artifactId>
7-
<packaging>jar</packaging>
8-
<name>BX-bot App</name>
9-
<description>Builds the distributable BX-bot app</description>
10-
<url>http://github.com/gazbert/bxbot</url>
11-
<parent>
12-
<groupId>com.gazbert.bxbot</groupId>
13-
<artifactId>bxbot-parent</artifactId>
14-
<version>${revision}</version>
15-
</parent>
16-
<properties>
17-
<start-class>com.gazbert.bxbot.BxBot</start-class>
18-
</properties>
19-
<dependencies>
20-
<dependency>
21-
<groupId>${project.groupId}</groupId>
22-
<artifactId>bxbot-trading-api</artifactId>
23-
<version>${project.version}</version>
24-
</dependency>
25-
<dependency>
26-
<groupId>${project.groupId}</groupId>
27-
<artifactId>bxbot-strategy-api</artifactId>
28-
<version>${project.version}</version>
29-
</dependency>
30-
<dependency>
31-
<groupId>${project.groupId}</groupId>
32-
<artifactId>bxbot-exchange-api</artifactId>
33-
<version>${project.version}</version>
34-
</dependency>
35-
<dependency>
36-
<groupId>${project.groupId}</groupId>
37-
<artifactId>bxbot-strategies</artifactId>
38-
<version>${project.version}</version>
39-
</dependency>
40-
<dependency>
41-
<groupId>${project.groupId}</groupId>
42-
<artifactId>bxbot-exchanges</artifactId>
43-
<version>${project.version}</version>
44-
</dependency>
45-
<dependency>
46-
<groupId>${project.groupId}</groupId>
47-
<artifactId>bxbot-domain-objects</artifactId>
48-
<version>${project.version}</version>
49-
</dependency>
50-
<dependency>
51-
<groupId>${project.groupId}</groupId>
52-
<artifactId>bxbot-yaml-datastore</artifactId>
53-
<version>${project.version}</version>
54-
</dependency>
55-
<dependency>
56-
<groupId>${project.groupId}</groupId>
57-
<artifactId>bxbot-repository</artifactId>
58-
<version>${project.version}</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>${project.groupId}</groupId>
62-
<artifactId>bxbot-core</artifactId>
63-
<version>${project.version}</version>
64-
</dependency>
65-
<dependency>
66-
<groupId>${project.groupId}</groupId>
67-
<artifactId>bxbot-rest-api</artifactId>
68-
<version>${project.version}</version>
69-
</dependency>
6+
<modelVersion>4.0.0</modelVersion>
7+
<artifactId>bxbot-app</artifactId>
8+
<packaging>jar</packaging>
9+
<name>BX-bot App</name>
10+
<description>Builds the distributable BX-bot app</description>
11+
<url>http://github.com/gazbert/bxbot</url>
12+
<parent>
13+
<groupId>com.gazbert.bxbot</groupId>
14+
<artifactId>bxbot-parent</artifactId>
15+
<version>${revision}</version>
16+
</parent>
17+
<properties>
18+
<start-class>com.gazbert.bxbot.BxBot</start-class>
19+
</properties>
20+
<dependencies>
21+
<dependency>
22+
<groupId>${project.groupId}</groupId>
23+
<artifactId>bxbot-trading-api</artifactId>
24+
<version>${project.version}</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>${project.groupId}</groupId>
28+
<artifactId>bxbot-strategy-api</artifactId>
29+
<version>${project.version}</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>${project.groupId}</groupId>
33+
<artifactId>bxbot-exchange-api</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>${project.groupId}</groupId>
38+
<artifactId>bxbot-strategies</artifactId>
39+
<version>${project.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>${project.groupId}</groupId>
43+
<artifactId>bxbot-exchanges</artifactId>
44+
<version>${project.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>${project.groupId}</groupId>
48+
<artifactId>bxbot-domain-objects</artifactId>
49+
<version>${project.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>${project.groupId}</groupId>
53+
<artifactId>bxbot-yaml-datastore</artifactId>
54+
<version>${project.version}</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>${project.groupId}</groupId>
58+
<artifactId>bxbot-repository</artifactId>
59+
<version>${project.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>${project.groupId}</groupId>
63+
<artifactId>bxbot-core</artifactId>
64+
<version>${project.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>${project.groupId}</groupId>
68+
<artifactId>bxbot-rest-api</artifactId>
69+
<version>${project.version}</version>
70+
</dependency>
7071

71-
<!-- Add your (optional) Trading Strategies here -->
72-
<!--<dependency>-->
73-
<!--<groupId>com.gazbert.bxbot</groupId>-->
74-
<!--<artifactId>bxbot-strategies</artifactId>-->
75-
<!--<version>7.0.1-SNAPSHOT</version>-->
76-
<!--<scope>runtime</scope>-->
77-
<!--</dependency>-->
72+
<!-- Add your (optional) Trading Strategies here -->
73+
<!--<dependency>-->
74+
<!--<groupId>com.gazbert.bxbot</groupId>-->
75+
<!--<artifactId>bxbot-strategies</artifactId>-->
76+
<!--<version>7.0.1-SNAPSHOT</version>-->
77+
<!--<scope>runtime</scope>-->
78+
<!--</dependency>-->
7879

79-
<!-- Add your (optional) Exchange Adapters here -->
80-
<!--<dependency>-->
81-
<!--<groupId>com.your.stuff</groupId>-->
82-
<!--<artifactId>your-custom-exchanges</artifactId>-->
83-
<!--<version>1.0-SNAPSHOT</version>-->
84-
<!--<scope>runtime</scope>-->
85-
<!--</dependency>-->
80+
<!-- Add your (optional) Exchange Adapters here -->
81+
<!--<dependency>-->
82+
<!--<groupId>com.your.stuff</groupId>-->
83+
<!--<artifactId>your-custom-exchanges</artifactId>-->
84+
<!--<version>1.0-SNAPSHOT</version>-->
85+
<!--<scope>runtime</scope>-->
86+
<!--</dependency>-->
8687

87-
</dependencies>
88-
<build>
89-
<defaultGoal>clean install</defaultGoal>
90-
<plugins>
91-
<plugin>
92-
<groupId>org.springframework.boot</groupId>
93-
<artifactId>spring-boot-maven-plugin</artifactId>
94-
<executions>
95-
<execution>
96-
<goals>
97-
<goal>repackage</goal>
98-
</goals>
99-
</execution>
100-
</executions>
101-
</plugin>
102-
</plugins>
103-
</build>
88+
</dependencies>
89+
<build>
90+
<defaultGoal>clean install</defaultGoal>
91+
<plugins>
92+
<plugin>
93+
<groupId>org.springframework.boot</groupId>
94+
<artifactId>spring-boot-maven-plugin</artifactId>
95+
<executions>
96+
<execution>
97+
<goals>
98+
<goal>repackage</goal>
99+
</goals>
100+
</execution>
101+
</executions>
102+
</plugin>
103+
</plugins>
104+
</build>
104105
</project>

‎bxbot-core/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@ dependencies {
2020
testCompile libraries.powermock_api_easymock
2121
testCompile libraries.easymock
2222
testCompile libraries.spring_boot_starter_test
23+
testCompile libraries.awaitility
2324
}
2425

2526
jacocoTestCoverageVerification {
2627
violationRules {
2728
rule {
28-
element = 'CLASS'
29+
element = 'BUNDLE'
2930
excludes = [
3031
]
3132
limit {
3233
counter = 'LINE'
3334
value = 'COVEREDRATIO'
34-
minimum = 0
35+
minimum = 0.8
3536
}
3637
}
3738
}

0 commit comments

Comments
 (0)