Skip to content

Commit f3d5820

Browse files
fmbenhassinefmbenhassine
committed
Update samples to the latest Spring Shell and Boot versions
1 parent 45350cb commit f3d5820

File tree

20 files changed

+124
-143
lines changed

20 files changed

+124
-143
lines changed

‎gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#Mon Jun 19 10:33:34 UTC 2023
21
version=4.0.1-SNAPSHOT
3-
springBootVersion=3.4.2
2+
springBootVersion=3.5.0-SNAPSHOT
3+
springShellVersion=3.4.1-SNAPSHOT
4+
45
jakartaPersistenceVersion=3.1.0
56
kryoVersion=4.0.3
6-
springShellVersion=3.4.0
77
eclipseEmfXmiVersion=2.11.1
88
eclipseUml2CommonVersion=2.0.0-v20140602-0749
99
eclipseEmfCommonVersion=2.11.0

‎spring-statemachine-samples/cdplayer/src/main/java/demo/cdplayer/Application.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2019 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
2121
import java.lang.annotation.Target;
2222
import java.util.Map;
2323

24+
import org.springframework.boot.SpringApplication;
2425
import org.springframework.context.annotation.Bean;
2526
import org.springframework.context.annotation.Configuration;
2627
import org.springframework.messaging.support.MessageBuilder;
27-
import org.springframework.shell.Bootstrap;
2828
import org.springframework.statemachine.ExtendedState;
2929
import org.springframework.statemachine.StateContext;
3030
import org.springframework.statemachine.action.Action;
@@ -308,8 +308,8 @@ public void execute(StateContext<States, Events> context) {
308308
}
309309
//end::snippetL[]
310310

311-
public static void main(String[] args) throws Exception {
312-
Bootstrap.main(args);
311+
public static void main(String[] args) {
312+
SpringApplication.run(Application.class, args);
313313
}
314314

315315
}

‎spring-statemachine-samples/cdplayer/src/main/java/demo/cdplayer/CdPlayerCommands.java

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,26 +19,24 @@
1919
import java.util.Date;
2020

2121
import org.springframework.beans.factory.annotation.Autowired;
22-
import org.springframework.shell.core.CommandMarker;
23-
import org.springframework.shell.core.annotation.CliCommand;
24-
import org.springframework.shell.core.annotation.CliOption;
25-
import org.springframework.stereotype.Component;
22+
import org.springframework.shell.command.annotation.Command;
23+
import org.springframework.shell.command.annotation.Option;
2624

27-
@Component
28-
public class CdPlayerCommands implements CommandMarker {
25+
@Command
26+
public class CdPlayerCommands {
2927

3028
@Autowired
3129
private CdPlayer cdPlayer;
3230

3331
@Autowired
3432
private Library library;
3533

36-
@CliCommand(value = "cd lcd", help = "Prints CD player lcd info")
34+
@Command(command = "cd lcd", description = "Prints CD player lcd info")
3735
public String lcd() {
3836
return cdPlayer.getLdcStatus();
3937
}
4038

41-
@CliCommand(value = "cd library", help = "List user CD library")
39+
@Command(command = "cd library", description = "List user CD library")
4240
public String library() {
4341
SimpleDateFormat format = new SimpleDateFormat("mm:ss");
4442
StringBuilder buf = new StringBuilder();
@@ -53,8 +51,8 @@ public String library() {
5351
return buf.toString();
5452
}
5553

56-
@CliCommand(value = "cd load", help = "Load CD into player")
57-
public String load(@CliOption(key = {"", "index"}) int index) {
54+
@Command(command = "cd load", description = "Load CD into player")
55+
public String load(@Option(longNames = {"", "index"}) int index) {
5856
StringBuilder buf = new StringBuilder();
5957
try {
6058
Cd cd = library.getCollection().get(index);
@@ -66,32 +64,32 @@ public String load(@CliOption(key = {"", "index"}) int index) {
6664
return buf.toString();
6765
}
6866

69-
@CliCommand(value = "cd play", help = "Press player play button")
67+
@Command(command = "cd play", description = "Press player play button")
7068
public void play() {
7169
cdPlayer.play();
7270
}
7371

74-
@CliCommand(value = "cd stop", help = "Press player stop button")
72+
@Command(command = "cd stop", description = "Press player stop button")
7573
public void stop() {
7674
cdPlayer.stop();
7775
}
7876

79-
@CliCommand(value = "cd pause", help = "Press player pause button")
77+
@Command(command = "cd pause", description = "Press player pause button")
8078
public void pause() {
8179
cdPlayer.pause();
8280
}
8381

84-
@CliCommand(value = "cd eject", help = "Press player eject button")
82+
@Command(command = "cd eject", description = "Press player eject button")
8583
public void eject() {
8684
cdPlayer.eject();
8785
}
8886

89-
@CliCommand(value = "cd forward", help = "Press player forward button")
87+
@Command(command = "cd forward", description = "Press player forward button")
9088
public void forward() {
9189
cdPlayer.forward();
9290
}
9391

94-
@CliCommand(value = "cd back", help = "Press player back button")
92+
@Command(command = "cd back", description = "Press player back button")
9593
public void back() {
9694
cdPlayer.back();
9795
}

‎spring-statemachine-samples/cdplayer/src/main/java/demo/cdplayer/StateMachineCommands.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2019 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,20 +16,19 @@
1616
package demo.cdplayer;
1717

1818
import org.springframework.messaging.support.MessageBuilder;
19-
import org.springframework.shell.core.annotation.CliCommand;
20-
import org.springframework.shell.core.annotation.CliOption;
21-
import org.springframework.stereotype.Component;
19+
import org.springframework.shell.command.annotation.Command;
20+
import org.springframework.shell.command.annotation.Option;
2221

2322
import demo.AbstractStateMachineCommands;
2423
import demo.cdplayer.Application.Events;
2524
import demo.cdplayer.Application.States;
2625
import reactor.core.publisher.Mono;
2726

28-
@Component
27+
@Command
2928
public class StateMachineCommands extends AbstractStateMachineCommands<States, Events> {
3029

31-
@CliCommand(value = "sm event", help = "Sends an event to a state machine")
32-
public String event(@CliOption(key = { "", "event" }, mandatory = true, help = "The event") final Events event) {
30+
@Command(command = "sm event", description = "Sends an event to a state machine")
31+
public String event(@Option(longNames = { "", "event" }, required = true, description = "The event") final Events event) {
3332
getStateMachine()
3433
.sendEvent(Mono.just(MessageBuilder
3534
.withPayload(event).build()))

‎spring-statemachine-samples/persist/src/main/java/demo/persist/Application.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
1616
package demo.persist;
1717

1818
import org.springframework.beans.factory.annotation.Autowired;
19+
import org.springframework.boot.SpringApplication;
1920
import org.springframework.boot.autoconfigure.SpringBootApplication;
2021
import org.springframework.context.annotation.Bean;
2122
import org.springframework.context.annotation.Configuration;
22-
import org.springframework.shell.Bootstrap;
2323
import org.springframework.statemachine.StateMachine;
2424
import org.springframework.statemachine.config.EnableStateMachine;
2525
import org.springframework.statemachine.config.StateMachineConfigurerAdapter;
@@ -105,8 +105,8 @@ public String toString() {
105105
}
106106
//end::snippetC[]
107107

108-
public static void main(String[] args) throws Exception {
109-
Bootstrap.main(args);
108+
public static void main(String[] args) {
109+
SpringApplication.run(Application.class, args);
110110
}
111111

112112
}

‎spring-statemachine-samples/persist/src/main/java/demo/persist/PersistCommands.java

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,34 +16,32 @@
1616
package demo.persist;
1717

1818
import org.springframework.beans.factory.annotation.Autowired;
19-
import org.springframework.shell.core.CommandMarker;
20-
import org.springframework.shell.core.annotation.CliCommand;
21-
import org.springframework.shell.core.annotation.CliOption;
22-
import org.springframework.stereotype.Component;
19+
import org.springframework.shell.command.annotation.Command;
20+
import org.springframework.shell.command.annotation.Option;
2321

24-
@Component
25-
public class PersistCommands implements CommandMarker {
22+
@Command
23+
public class PersistCommands {
2624

2725
@Autowired
2826
private Persist persist;
2927

30-
@CliCommand(value = "persist db", help = "List entries from db")
28+
@Command(command = "persist db", description = "List entries from db")
3129
public String listDbEntries() {
3230
return persist.listDbEntries();
3331
}
3432

35-
@CliCommand(value = "persist process", help = "Process order")
36-
public void process(@CliOption(key = {"", "id"}, help = "Order id") int order) {
33+
@Command(command = "persist process", description = "Process order")
34+
public void process(@Option(longNames = {"", "id"}, description = "Order id") int order) {
3735
persist.change(order, "PROCESS");
3836
}
3937

40-
@CliCommand(value = "persist send", help = "Send order")
41-
public void send(@CliOption(key = {"", "id"}, help = "Order id") int order) {
38+
@Command(command = "persist send", description = "Send order")
39+
public void send(@Option(longNames = {"", "id"}, description = "Order id") int order) {
4240
persist.change(order, "SEND");
4341
}
4442

45-
@CliCommand(value = "persist deliver", help = "Deliver order")
46-
public void deliver(@CliOption(key = {"", "id"}, help = "Order id") int order) {
43+
@Command(command = "persist deliver", description = "Deliver order")
44+
public void deliver(@Option(longNames = {"", "id"}, description = "Order id") int order) {
4745
persist.change(order, "DELIVER");
4846
}
4947

‎spring-statemachine-samples/persist/src/main/java/demo/persist/StateMachineCommands.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2019 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,18 +16,17 @@
1616
package demo.persist;
1717

1818
import org.springframework.messaging.support.MessageBuilder;
19-
import org.springframework.shell.core.annotation.CliCommand;
20-
import org.springframework.shell.core.annotation.CliOption;
21-
import org.springframework.stereotype.Component;
19+
import org.springframework.shell.command.annotation.Command;
20+
import org.springframework.shell.command.annotation.Option;
2221

2322
import demo.AbstractStateMachineCommands;
2423
import reactor.core.publisher.Mono;
2524

26-
@Component
25+
@Command
2726
public class StateMachineCommands extends AbstractStateMachineCommands<String, String> {
2827

29-
@CliCommand(value = "sm event", help = "Sends an event to a state machine")
30-
public String event(@CliOption(key = { "", "event" }, mandatory = true, help = "The event") final String event) {
28+
@Command(command = "sm event", description = "Sends an event to a state machine")
29+
public String event(@Option(longNames = { "", "event" }, required = true, description = "The event") final String event) {
3130
getStateMachine()
3231
.sendEvent(Mono.just(MessageBuilder
3332
.withPayload(event).build()))

‎spring-statemachine-samples/showcase/src/main/java/demo/showcase/Application.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
1919

2020
import org.apache.commons.logging.Log;
2121
import org.apache.commons.logging.LogFactory;
22+
import org.springframework.boot.SpringApplication;
2223
import org.springframework.context.annotation.Bean;
2324
import org.springframework.context.annotation.Configuration;
24-
import org.springframework.shell.Bootstrap;
2525
import org.springframework.statemachine.StateContext;
2626
import org.springframework.statemachine.action.Action;
2727
import org.springframework.statemachine.config.EnableStateMachine;
@@ -214,8 +214,8 @@ public boolean evaluate(StateContext<States, Events> context) {
214214
}
215215
// end::snippetE[]
216216

217-
public static void main(String[] args) throws Exception {
218-
Bootstrap.main(args);
217+
public static void main(String[] args) {
218+
SpringApplication.run(Application.class, args);
219219
}
220220

221221
}

‎spring-statemachine-samples/showcase/src/main/java/demo/showcase/StateMachineCommands.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2019 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
1616
package demo.showcase;
1717

1818
import org.springframework.messaging.support.MessageBuilder;
19-
import org.springframework.shell.core.annotation.CliCommand;
20-
import org.springframework.shell.core.annotation.CliOption;
19+
import org.springframework.shell.command.annotation.Command;
20+
import org.springframework.shell.command.annotation.Option;
2121
import org.springframework.stereotype.Component;
2222

2323
import demo.AbstractStateMachineCommands;
@@ -28,8 +28,8 @@
2828
@Component
2929
public class StateMachineCommands extends AbstractStateMachineCommands<States, Events> {
3030

31-
@CliCommand(value = "sm event", help = "Sends an event to a state machine")
32-
public String event(@CliOption(key = { "", "event" }, mandatory = true, help = "The event") final Events event) {
31+
@Command(command = "sm event", description = "Sends an event to a state machine")
32+
public String event(@Option(longNames = { "", "event" }, required = true, description = "The event") final Events event) {
3333
getStateMachine()
3434
.sendEvent(Mono.just(MessageBuilder
3535
.withPayload(event).build()))

0 commit comments

Comments
 (0)