Skip to content

Commit 51ae02f

Browse files
dependabot[bot]bpkroth
dependabot[bot]
and
bpkroth
authored
Bump com.spotify.fmt:fmt-maven-plugin from 2.23 to 2.25 (#571)
Bumps [com.spotify.fmt:fmt-maven-plugin](https://github.com/spotify/fmt-maven-plugin) from 2.23 to 2.25. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/spotify/fmt-maven-plugin/releases">com.spotify.fmt:fmt-maven-plugin's releases</a>.</em></p> <blockquote> <h2>2.25</h2> <h2>What's Changed</h2> <ul> <li>Upgrade Google Java Format 1.23.0 -&gt; 1.24.0 by <a href="https://github.com/Stephan202"><code>@​Stephan202</code></a> in <a href="https://redirect.github.com/spotify/fmt-maven-plugin/pull/194">spotify/fmt-maven-plugin#194</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/spotify/fmt-maven-plugin/compare/2.24...2.25">https://github.com/spotify/fmt-maven-plugin/compare/2.24...2.25</a></p> <h2>2.24</h2> <h2>What's Changed</h2> <ul> <li>Upgrade Google Java Format 1.21.0 -&gt; 1.22.0 by <a href="https://github.com/Stephan202"><code>@​Stephan202</code></a> in <a href="https://redirect.github.com/spotify/fmt-maven-plugin/pull/190">spotify/fmt-maven-plugin#190</a></li> <li>Upgrade Google Java Format 1.22.0 -&gt; 1.23.0 by <a href="https://github.com/Stephan202"><code>@​Stephan202</code></a> in <a href="https://redirect.github.com/spotify/fmt-maven-plugin/pull/192">spotify/fmt-maven-plugin#192</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/spotify/fmt-maven-plugin/compare/2.23...2.24">https://github.com/spotify/fmt-maven-plugin/compare/2.23...2.24</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/9e0190fc20f6c147b247c9a065cf6d260f186363"><code>9e0190f</code></a> [maven-release-plugin] prepare release 2.25</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/a3aff4ac1d0f5bdab37d24efb13d3fb15260e0c1"><code>a3aff4a</code></a> Upgrade Google Java Format 1.23.0 -&gt; 1.24.0 (<a href="https://redirect.github.com/spotify/fmt-maven-plugin/issues/194">#194</a>)</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/7fa55be1587ce1285f09ad640292cd80050a2df4"><code>7fa55be</code></a> [maven-release-plugin] prepare for next development iteration</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/f5a267537e0c6bb65454ca0f3c1ae6409e58530a"><code>f5a2675</code></a> [maven-release-plugin] prepare release 2.24</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/775d418757082bcd5e333223a1b39f52ae85f882"><code>775d418</code></a> Upgrade Google Java Format 1.22.0 -&gt; 1.23.0 (<a href="https://redirect.github.com/spotify/fmt-maven-plugin/issues/192">#192</a>)</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/76aa75f3d92097684745c101579dcce594e51a28"><code>76aa75f</code></a> Upgrade Google Java Format 1.21.0 -&gt; 1.22.0 (<a href="https://redirect.github.com/spotify/fmt-maven-plugin/issues/190">#190</a>)</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/ced5b96052e739ab43e99532f1405dfed4cdf0f5"><code>ced5b96</code></a> [maven-release-plugin] prepare for next development iteration</li> <li>See full diff in <a href="https://github.com/spotify/fmt-maven-plugin/compare/2.23...2.25">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.spotify.fmt:fmt-maven-plugin&package-manager=maven&previous-version=2.23&new-version=2.25)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brian Kroth <bpkroth@microsoft.com>
1 parent 2671ccd commit 51ae02f

File tree

8 files changed

+64
-64
lines changed

8 files changed

+64
-64
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@
365365
<!-- format/check code via google style format -->
366366
<groupId>com.spotify.fmt</groupId>
367367
<artifactId>fmt-maven-plugin</artifactId>
368-
<version>2.23</version>
368+
<version>2.25</version>
369369
<executions>
370370
<execution>
371371
<goals>

‎src/main/java/com/oltpbenchmark/benchmarks/seats/SEATSLoader.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ public CustomerIterable(Table catalog_tbl, long total) {
923923
protected Object specialValue(long id, int columnIdx) {
924924
Object value = null;
925925
switch (columnIdx) {
926-
// CUSTOMER ID
926+
// CUSTOMER ID
927927
case (0):
928928
{
929929
// HACK: The flights_per_airport histogram may not match up
@@ -950,26 +950,26 @@ protected Object specialValue(long id, int columnIdx) {
950950
}
951951
break;
952952
}
953-
// CUSTOMER ID STR
953+
// CUSTOMER ID STR
954954
case (1):
955955
{
956956
value = this.last_id.encode();
957957
this.last_id = null;
958958
break;
959959
}
960-
// LOCAL AIRPORT
960+
// LOCAL AIRPORT
961961
case (2):
962962
{
963963
value = this.airport_code;
964964
break;
965965
}
966-
// BALANCE
966+
// BALANCE
967967
case (3):
968968
{
969969
value = (double) this.randBalance.nextInt();
970970
break;
971971
}
972-
// BAD MOJO!
972+
// BAD MOJO!
973973
default:
974974
}
975975
return (value);
@@ -1060,7 +1060,7 @@ public FrequentFlyerIterable(Table catalog_tbl, long num_customers) {
10601060
protected Object specialValue(long id, int columnIdx) {
10611061
String value = null;
10621062
switch (columnIdx) {
1063-
// CUSTOMER ID
1063+
// CUSTOMER ID
10641064
case (0):
10651065
{
10661066
while (this.customer_idx < this.ff_per_customer.length
@@ -1080,7 +1080,7 @@ protected Object specialValue(long id, int columnIdx) {
10801080
value = this.last_customer_id.encode();
10811081
break;
10821082
}
1083-
// AIRLINE ID
1083+
// AIRLINE ID
10841084
case (1):
10851085
{
10861086
do {
@@ -1092,13 +1092,13 @@ protected Object specialValue(long id, int columnIdx) {
10921092
}
10931093
break;
10941094
}
1095-
// CUSTOMER_ID_STR
1095+
// CUSTOMER_ID_STR
10961096
case (2):
10971097
{
10981098
value = this.last_customer_id.encode();
10991099
break;
11001100
}
1101-
// BAD MOJO!
1101+
// BAD MOJO!
11021102
default:
11031103
}
11041104
return (value);
@@ -1195,19 +1195,19 @@ protected boolean hasNext() {
11951195
protected Object specialValue(long id, int columnIdx) {
11961196
Object value = null;
11971197
switch (columnIdx) {
1198-
// OUTER AIRPORT
1198+
// OUTER AIRPORT
11991199
case (0):
12001200
value = this.outer_airport;
12011201
break;
1202-
// INNER AIRPORT
1202+
// INNER AIRPORT
12031203
case (1):
12041204
value = this.inner_airport;
12051205
break;
1206-
// DISTANCE
1206+
// DISTANCE
12071207
case (2):
12081208
value = this.distance;
12091209
break;
1210-
// BAD MOJO!
1210+
// BAD MOJO!
12111211
default:
12121212
}
12131213
return (value);
@@ -1389,7 +1389,7 @@ boolean seatIsOccupied() {
13891389
protected Object specialValue(long id, int columnIdx) {
13901390
Object value = null;
13911391
switch (columnIdx) {
1392-
// FLIGHT ID
1392+
// FLIGHT ID
13931393
case (0):
13941394
{
13951395
// Figure out what date we are currently on
@@ -1435,56 +1435,56 @@ protected Object specialValue(long id, int columnIdx) {
14351435
value = this.flight_id.encode();
14361436
break;
14371437
}
1438-
// AIRLINE ID
1438+
// AIRLINE ID
14391439
case (1):
14401440
{
14411441
value = this.airline_code;
14421442
SEATSLoader.this.flights_per_airline.put(this.airline_code);
14431443
break;
14441444
}
1445-
// DEPART AIRPORT
1445+
// DEPART AIRPORT
14461446
case (2):
14471447
{
14481448
value = this.depart_airport;
14491449
break;
14501450
}
1451-
// DEPART TIME
1451+
// DEPART TIME
14521452
case (3):
14531453
{
14541454
value = this.depart_time;
14551455
break;
14561456
}
1457-
// ARRIVE AIRPORT
1457+
// ARRIVE AIRPORT
14581458
case (4):
14591459
{
14601460
value = this.arrive_airport;
14611461
break;
14621462
}
1463-
// ARRIVE TIME
1463+
// ARRIVE TIME
14641464
case (5):
14651465
{
14661466
value = this.arrive_time;
14671467
break;
14681468
}
1469-
// FLIGHT STATUS
1469+
// FLIGHT STATUS
14701470
case (6):
14711471
{
14721472
value = this.status;
14731473
break;
14741474
}
1475-
// BASE PRICE
1475+
// BASE PRICE
14761476
case (7):
14771477
{
14781478
value = (double) this.prices.nextInt();
14791479
break;
14801480
}
1481-
// SEATS TOTAL
1481+
// SEATS TOTAL
14821482
case (8):
14831483
{
14841484
value = SEATSConstants.FLIGHTS_NUM_SEATS;
14851485
break;
14861486
}
1487-
// SEATS REMAINING
1487+
// SEATS REMAINING
14881488
case (9):
14891489
{
14901490
// We have to figure this out ahead of time since we need to
@@ -1501,7 +1501,7 @@ protected Object specialValue(long id, int columnIdx) {
15011501
}
15021502
break;
15031503
}
1504-
// BAD MOJO!
1504+
// BAD MOJO!
15051505
default:
15061506
}
15071507
return (value);
@@ -1763,13 +1763,13 @@ protected Object specialValue(long id, int columnIdx) {
17631763

17641764
Object value = null;
17651765
switch (columnIdx) {
1766-
// CUSTOMER ID
1766+
// CUSTOMER ID
17671767
case (1):
17681768
{
17691769
value = ((CustomerId) this.current[0]).encode();
17701770
break;
17711771
}
1772-
// FLIGHT ID
1772+
// FLIGHT ID
17731773
case (2):
17741774
{
17751775
FlightId flight_id = (FlightId) this.current[1];
@@ -1782,19 +1782,19 @@ protected Object specialValue(long id, int columnIdx) {
17821782
}
17831783
break;
17841784
}
1785-
// SEAT
1785+
// SEAT
17861786
case (3):
17871787
{
17881788
value = this.current[2];
17891789
break;
17901790
}
1791-
// PRICE
1791+
// PRICE
17921792
case (4):
17931793
{
17941794
value = (double) this.prices.nextInt();
17951795
break;
17961796
}
1797-
// BAD MOJO!
1797+
// BAD MOJO!
17981798
default:
17991799
}
18001800
return (value);

‎src/main/java/com/oltpbenchmark/benchmarks/templated/TemplatedBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ private CustomClassLoader loadQueryTemplates(String file) {
214214
ParsedQueryTemplate qt = b.build();
215215
// Create and compile class.
216216
final String s =
217-
"""
217+
"""
218218
package %s ;
219219
import %s ;
220220
public final class %s extends %s {

‎src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Delivery.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class Delivery extends TPCCProcedure {
3434

3535
public SQLStmt delivGetOrderIdSQL =
3636
new SQLStmt(
37-
"""
37+
"""
3838
SELECT NO_O_ID FROM %s
3939
WHERE NO_D_ID = ?
4040
AND NO_W_ID = ?
@@ -45,7 +45,7 @@ public class Delivery extends TPCCProcedure {
4545

4646
public SQLStmt delivDeleteNewOrderSQL =
4747
new SQLStmt(
48-
"""
48+
"""
4949
DELETE FROM %s
5050
WHERE NO_O_ID = ?
5151
AND NO_D_ID = ?
@@ -55,7 +55,7 @@ public class Delivery extends TPCCProcedure {
5555

5656
public SQLStmt delivGetCustIdSQL =
5757
new SQLStmt(
58-
"""
58+
"""
5959
SELECT O_C_ID FROM %s
6060
WHERE O_ID = ?
6161
AND O_D_ID = ?
@@ -65,7 +65,7 @@ public class Delivery extends TPCCProcedure {
6565

6666
public SQLStmt delivUpdateCarrierIdSQL =
6767
new SQLStmt(
68-
"""
68+
"""
6969
UPDATE %s
7070
SET O_CARRIER_ID = ?
7171
WHERE O_ID = ?
@@ -76,7 +76,7 @@ public class Delivery extends TPCCProcedure {
7676

7777
public SQLStmt delivUpdateDeliveryDateSQL =
7878
new SQLStmt(
79-
"""
79+
"""
8080
UPDATE %s
8181
SET OL_DELIVERY_D = ?
8282
WHERE OL_O_ID = ?
@@ -87,7 +87,7 @@ public class Delivery extends TPCCProcedure {
8787

8888
public SQLStmt delivSumOrderAmountSQL =
8989
new SQLStmt(
90-
"""
90+
"""
9191
SELECT SUM(OL_AMOUNT) AS OL_TOTAL
9292
FROM %s
9393
WHERE OL_O_ID = ?
@@ -98,7 +98,7 @@ SELECT SUM(OL_AMOUNT) AS OL_TOTAL
9898

9999
public SQLStmt delivUpdateCustBalDelivCntSQL =
100100
new SQLStmt(
101-
"""
101+
"""
102102
UPDATE %s
103103
SET C_BALANCE = C_BALANCE + ?,
104104
C_DELIVERY_CNT = C_DELIVERY_CNT + 1

‎src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/NewOrder.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class NewOrder extends TPCCProcedure {
3434

3535
public final SQLStmt stmtGetCustSQL =
3636
new SQLStmt(
37-
"""
37+
"""
3838
SELECT C_DISCOUNT, C_LAST, C_CREDIT
3939
FROM %s
4040
WHERE C_W_ID = ?
@@ -45,7 +45,7 @@ public class NewOrder extends TPCCProcedure {
4545

4646
public final SQLStmt stmtGetWhseSQL =
4747
new SQLStmt(
48-
"""
48+
"""
4949
SELECT W_TAX
5050
FROM %s
5151
WHERE W_ID = ?
@@ -54,7 +54,7 @@ public class NewOrder extends TPCCProcedure {
5454

5555
public final SQLStmt stmtGetDistSQL =
5656
new SQLStmt(
57-
"""
57+
"""
5858
SELECT D_NEXT_O_ID, D_TAX
5959
FROM %s
6060
WHERE D_W_ID = ? AND D_ID = ? FOR UPDATE
@@ -63,7 +63,7 @@ public class NewOrder extends TPCCProcedure {
6363

6464
public final SQLStmt stmtInsertNewOrderSQL =
6565
new SQLStmt(
66-
"""
66+
"""
6767
INSERT INTO %s
6868
(NO_O_ID, NO_D_ID, NO_W_ID)
6969
VALUES ( ?, ?, ?)
@@ -72,7 +72,7 @@ public class NewOrder extends TPCCProcedure {
7272

7373
public final SQLStmt stmtUpdateDistSQL =
7474
new SQLStmt(
75-
"""
75+
"""
7676
UPDATE %s
7777
SET D_NEXT_O_ID = D_NEXT_O_ID + 1
7878
WHERE D_W_ID = ?
@@ -82,7 +82,7 @@ public class NewOrder extends TPCCProcedure {
8282

8383
public final SQLStmt stmtInsertOOrderSQL =
8484
new SQLStmt(
85-
"""
85+
"""
8686
INSERT INTO %s
8787
(O_ID, O_D_ID, O_W_ID, O_C_ID, O_ENTRY_D, O_OL_CNT, O_ALL_LOCAL)
8888
VALUES (?, ?, ?, ?, ?, ?, ?)
@@ -91,7 +91,7 @@ public class NewOrder extends TPCCProcedure {
9191

9292
public final SQLStmt stmtGetItemSQL =
9393
new SQLStmt(
94-
"""
94+
"""
9595
SELECT I_PRICE, I_NAME , I_DATA
9696
FROM %s
9797
WHERE I_ID = ?
@@ -100,7 +100,7 @@ public class NewOrder extends TPCCProcedure {
100100

101101
public final SQLStmt stmtGetStockSQL =
102102
new SQLStmt(
103-
"""
103+
"""
104104
SELECT S_QUANTITY, S_DATA, S_DIST_01, S_DIST_02, S_DIST_03, S_DIST_04, S_DIST_05,
105105
S_DIST_06, S_DIST_07, S_DIST_08, S_DIST_09, S_DIST_10
106106
FROM %s
@@ -111,7 +111,7 @@ public class NewOrder extends TPCCProcedure {
111111

112112
public final SQLStmt stmtUpdateStockSQL =
113113
new SQLStmt(
114-
"""
114+
"""
115115
UPDATE %s
116116
SET S_QUANTITY = ? ,
117117
S_YTD = S_YTD + ?,
@@ -124,7 +124,7 @@ public class NewOrder extends TPCCProcedure {
124124

125125
public final SQLStmt stmtInsertOrderLineSQL =
126126
new SQLStmt(
127-
"""
127+
"""
128128
INSERT INTO %s
129129
(OL_O_ID, OL_D_ID, OL_W_ID, OL_NUMBER, OL_I_ID, OL_SUPPLY_W_ID, OL_QUANTITY, OL_AMOUNT, OL_DIST_INFO)
130130
VALUES (?,?,?,?,?,?,?,?,?)

0 commit comments

Comments
 (0)