Skip to content

Commit d5141e1

Browse files
author
Dave Maughan
authored
Reformat code (#324)
Fixes #313 ## Motivation Apply consistent format to source code and enable checks in the build. ## Changes * Run mvn spotless:apply * Manually fixed or suppressed checkstyle warnings * reinstate 4 spaces indent
1 parent 929c4c3 commit d5141e1

127 files changed

Lines changed: 3279 additions & 2660 deletions

File tree

Some content is hidden

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

‎.github/workflows/pr-build-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version: 17
2929

3030
- name: Build and Verify
31-
run: mvn --no-transfer-progress --batch-mode verify -Dcheckstyle.skip -Dspotless.check.skip
31+
run: mvn --no-transfer-progress --batch-mode verify
3232

3333
- name: package surefire test results
3434
if: failure()

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# OpenMessaging Benchmark Framework
2+
23
[![Build](https://github.com/openmessaging/benchmark/actions/workflows/pr-build-and-test.yml/badge.svg)](https://github.com/openmessaging/benchmark/actions/workflows/pr-build-and-test.yml)
34
[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
45

5-
**Notice：** We do not consider or plan to release any unilateral test results based on this standard. For reference, you can purchase server tests on the cloud by yourself.
6+
**Notice：** We do not consider or plan to release any unilateral test results based on this standard. For reference, you can purchase server tests on the cloud by yourself.
67

78
This repository houses user-friendly, cloud-ready benchmarking suites for the following messaging platforms:
89

@@ -14,7 +15,7 @@ This repository houses user-friendly, cloud-ready benchmarking suites for the fo
1415
* Generic [JMS](https://javaee.github.io/jms-spec/)
1516
* [KoP (Kafka-on-Pulsar)](https://github.com/streamnative/kop)
1617
* [NATS Streaming](https://nats.io/)
17-
* [NSQ](https://nsq.io)
18+
* [NSQ](https://nsq.io)
1819
* [Pravega](https://pravega.io/)
1920
* [RabbitMQ](https://www.rabbitmq.com/)
2021
* [Redis](https://redis.com/)

‎benchmark-framework/pom.xml‎

Lines changed: 160 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,163 +15,171 @@
1415
1516
-->
1617
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18-
<modelVersion>4.0.0</modelVersion>
19-
<parent>
20-
<groupId>io.openmessaging.benchmark</groupId>
21-
<artifactId>messaging-benchmark</artifactId>
22-
<version>0.0.1-SNAPSHOT</version>
23-
</parent>
18+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
<modelVersion>4.0.0</modelVersion>
20+
<parent>
21+
<groupId>io.openmessaging.benchmark</groupId>
22+
<artifactId>messaging-benchmark</artifactId>
23+
<version>0.0.1-SNAPSHOT</version>
24+
</parent>
2425

25-
<artifactId>benchmark-framework</artifactId>
26+
<artifactId>benchmark-framework</artifactId>
2627

27-
<properties>
28-
<jetty.version>9.4.42.v20210604</jetty.version>
29-
</properties>
28+
<properties>
29+
<jetty.version>9.4.42.v20210604</jetty.version>
30+
</properties>
3031

31-
<dependencies>
32-
<dependency>
33-
<groupId>${project.groupId}</groupId>
34-
<artifactId>driver-api</artifactId>
35-
<version>${project.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.hdrhistogram</groupId>
39-
<artifactId>HdrHistogram</artifactId>
40-
<version>2.1.10</version>
41-
</dependency>
42-
<dependency>
43-
<groupId>com.beust</groupId>
44-
<artifactId>jcommander</artifactId>
45-
</dependency>
46-
<dependency>
47-
<groupId>${project.groupId}</groupId>
48-
<artifactId>driver-pulsar</artifactId>
49-
<version>${project.version}</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>${project.groupId}</groupId>
53-
<artifactId>driver-jms</artifactId>
54-
<version>${project.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>${project.groupId}</groupId>
58-
<artifactId>driver-kafka</artifactId>
59-
<version>${project.version}</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>${project.groupId}</groupId>
63-
<artifactId>driver-kop</artifactId>
64-
<version>${project.version}</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>${project.groupId}</groupId>
68-
<artifactId>driver-pravega</artifactId>
69-
<version>${project.version}</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>${project.groupId}</groupId>
73-
<artifactId>driver-rocketmq</artifactId>
74-
<version>${project.version}</version>
75-
</dependency>
76-
<dependency>
77-
<groupId>${project.groupId}</groupId>
78-
<artifactId>driver-rabbitmq</artifactId>
79-
<version>${project.version}</version>
80-
</dependency>
81-
<dependency>
82-
<groupId>${project.groupId}</groupId>
83-
<artifactId>driver-artemis</artifactId>
84-
<version>${project.version}</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>${project.groupId}</groupId>
88-
<artifactId>driver-bookkeeper</artifactId>
89-
<version>${project.version}</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>${project.groupId}</groupId>
93-
<artifactId>driver-nats</artifactId>
94-
<version>${project.version}</version>
95-
</dependency>
96-
<dependency>
97-
<groupId>${project.groupId}</groupId>
98-
<artifactId>driver-nats-streaming</artifactId>
99-
<version>${project.version}</version>
100-
</dependency>
101-
<dependency>
102-
<groupId>${project.groupId}</groupId>
103-
<artifactId>driver-nsq</artifactId>
104-
<version>${project.version}</version>
105-
</dependency>
106-
<dependency>
107-
<groupId>${project.groupId}</groupId>
108-
<artifactId>driver-redis</artifactId>
109-
<version>${project.version}</version>
110-
</dependency>
111-
<dependency>
112-
<groupId>org.apache.bookkeeper.stats</groupId>
113-
<artifactId>prometheus-metrics-provider</artifactId>
114-
<version>${bookkeeper.version}</version>
115-
</dependency>
116-
<dependency>
117-
<groupId>org.apache.logging.log4j</groupId>
118-
<artifactId>log4j-slf4j-impl</artifactId>
119-
</dependency>
120-
<dependency>
32+
<dependencies>
33+
<dependency>
34+
<groupId>${project.groupId}</groupId>
35+
<artifactId>driver-api</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>${project.groupId}</groupId>
40+
<artifactId>driver-artemis</artifactId>
41+
<version>${project.version}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>${project.groupId}</groupId>
45+
<artifactId>driver-bookkeeper</artifactId>
46+
<version>${project.version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>${project.groupId}</groupId>
50+
<artifactId>driver-jms</artifactId>
51+
<version>${project.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>${project.groupId}</groupId>
55+
<artifactId>driver-kafka</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>${project.groupId}</groupId>
60+
<artifactId>driver-kop</artifactId>
61+
<version>${project.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>${project.groupId}</groupId>
65+
<artifactId>driver-nats</artifactId>
66+
<version>${project.version}</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>${project.groupId}</groupId>
70+
<artifactId>driver-nats-streaming</artifactId>
71+
<version>${project.version}</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>${project.groupId}</groupId>
75+
<artifactId>driver-nsq</artifactId>
76+
<version>${project.version}</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>${project.groupId}</groupId>
80+
<artifactId>driver-pravega</artifactId>
81+
<version>${project.version}</version>
82+
</dependency>
83+
<dependency>
84+
<groupId>${project.groupId}</groupId>
85+
<artifactId>driver-pulsar</artifactId>
86+
<version>${project.version}</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>${project.groupId}</groupId>
90+
<artifactId>driver-rabbitmq</artifactId>
91+
<version>${project.version}</version>
92+
</dependency>
93+
<dependency>
94+
<groupId>${project.groupId}</groupId>
95+
<artifactId>driver-redis</artifactId>
96+
<version>${project.version}</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>${project.groupId}</groupId>
100+
<artifactId>driver-rocketmq</artifactId>
101+
<version>${project.version}</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>com.beust</groupId>
105+
<artifactId>jcommander</artifactId>
106+
</dependency>
107+
<dependency>
121108
<groupId>io.javalin</groupId>
122109
<artifactId>javalin</artifactId>
123110
<version>1.3.0</version>
124111
</dependency>
125-
<dependency>
126-
<groupId>org.asynchttpclient</groupId>
127-
<artifactId>async-http-client</artifactId>
128-
<version>2.12.3</version>
129-
</dependency>
130-
<!-- set jetty version to be consistent across all transitive dependencies -->
131-
<dependency>
132-
<groupId>org.eclipse.jetty</groupId>
133-
<artifactId>jetty-server</artifactId>
134-
<version>${jetty.version}</version>
135-
</dependency>
136-
<dependency>
137-
<groupId>org.eclipse.jetty</groupId>
138-
<artifactId>jetty-util</artifactId>
139-
<version>${jetty.version}</version>
140-
</dependency>
141-
<dependency>
142-
<groupId>org.assertj</groupId>
143-
<artifactId>assertj-core</artifactId>
144-
</dependency>
145-
<dependency>
146-
<groupId>org.junit.jupiter</groupId>
147-
<artifactId>junit-jupiter</artifactId>
148-
</dependency>
149-
<dependency>
150-
<groupId>org.mockito</groupId>
151-
<artifactId>mockito-junit-jupiter</artifactId>
152-
</dependency>
153-
</dependencies>
112+
<dependency>
113+
<groupId>org.apache.bookkeeper.stats</groupId>
114+
<artifactId>prometheus-metrics-provider</artifactId>
115+
<version>${bookkeeper.version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.apache.logging.log4j</groupId>
119+
<artifactId>log4j-slf4j-impl</artifactId>
120+
</dependency>
121+
<dependency>
122+
<groupId>org.asynchttpclient</groupId>
123+
<artifactId>async-http-client</artifactId>
124+
<version>2.12.3</version>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.asynchttpclient</groupId>
128+
<artifactId>async-http-client</artifactId>
129+
<version>2.12.3</version>
130+
</dependency>
131+
<!-- set jetty version to be consistent across all transitive dependencies -->
132+
<dependency>
133+
<groupId>org.eclipse.jetty</groupId>
134+
<artifactId>jetty-server</artifactId>
135+
<version>${jetty.version}</version>
136+
</dependency>
137+
<dependency>
138+
<groupId>org.eclipse.jetty</groupId>
139+
<artifactId>jetty-util</artifactId>
140+
<version>${jetty.version}</version>
141+
</dependency>
142+
<dependency>
143+
<groupId>org.hdrhistogram</groupId>
144+
<artifactId>HdrHistogram</artifactId>
145+
<version>2.1.10</version>
146+
</dependency>
147+
<dependency>
148+
<groupId>org.assertj</groupId>
149+
<artifactId>assertj-core</artifactId>
150+
<scope>test</scope>
151+
</dependency>
152+
<dependency>
153+
<groupId>org.junit.jupiter</groupId>
154+
<artifactId>junit-jupiter</artifactId>
155+
<scope>test</scope>
156+
</dependency>
157+
<dependency>
158+
<groupId>org.mockito</groupId>
159+
<artifactId>mockito-junit-jupiter</artifactId>
160+
<scope>test</scope>
161+
</dependency>
162+
</dependencies>
154163

155-
<build>
156-
<plugins>
157-
<plugin>
158-
<groupId>org.apache.maven.plugins</groupId>
159-
<artifactId>maven-dependency-plugin</artifactId>
160-
<version>2.10</version>
161-
<executions>
162-
<execution>
163-
<id>build-classpath</id>
164-
<phase>generate-sources</phase>
165-
<goals>
166-
<goal>build-classpath</goal>
167-
</goals>
168-
<configuration>
169-
<outputFile>target/classpath.txt</outputFile>
170-
</configuration>
171-
</execution>
172-
</executions>
173-
</plugin>
174-
</plugins>
175-
</build>
164+
<build>
165+
<plugins>
166+
<plugin>
167+
<groupId>org.apache.maven.plugins</groupId>
168+
<artifactId>maven-dependency-plugin</artifactId>
169+
<version>2.10</version>
170+
<executions>
171+
<execution>
172+
<id>build-classpath</id>
173+
<goals>
174+
<goal>build-classpath</goal>
175+
</goals>
176+
<phase>generate-sources</phase>
177+
<configuration>
178+
<outputFile>target/classpath.txt</outputFile>
179+
</configuration>
180+
</execution>
181+
</executions>
182+
</plugin>
183+
</plugins>
184+
</build>
176185
</project>

0 commit comments

Comments
 (0)