Skip to content

Commit 4b95ba3

Browse files
committed
refactor
1 parent 0bee9a1 commit 4b95ba3

File tree

3 files changed

+5
-17
lines changed

3 files changed

+5
-17
lines changed

src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,9 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
7676
// all access, there is a global default behaviour from spring security: enable CSRF for all POSTs.
7777
// we need to disable CSRF for SOAP paths explicitly.
7878
.csrf(c -> c.ignoringRequestMatchers(CONFIG.getCxfMapping() + "/**"))
79-
.sessionManagement(
80-
req -> req.invalidSessionUrl(prefix + "/signin")
81-
)
82-
.formLogin(
83-
req -> req.loginPage(prefix + "/signin").permitAll()
84-
)
85-
.logout(
86-
req -> req.logoutUrl(prefix + "/signout")
87-
)
79+
.sessionManagement(req -> req.invalidSessionUrl(prefix + "/signin"))
80+
.formLogin(req -> req.loginPage(prefix + "/signin").permitAll())
81+
.logout(req -> req.logoutUrl(prefix + "/signout"))
8882
.build();
8983
}
9084

src/main/java/de/rwth/idsg/steve/web/api/OcppTagsRestController.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
import org.springframework.web.bind.annotation.PutMapping;
4343
import org.springframework.web.bind.annotation.RequestBody;
4444
import org.springframework.web.bind.annotation.RequestMapping;
45-
import org.springframework.web.bind.annotation.ResponseBody;
4645
import org.springframework.web.bind.annotation.ResponseStatus;
4746
import org.springframework.web.bind.annotation.RestController;
4847

4948
import jakarta.validation.Valid;
49+
5050
import java.util.List;
5151

5252
/**
@@ -80,7 +80,6 @@ public class OcppTagsRestController {
8080
@ApiResponse(responseCode = "500", description = "Internal Server Error", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ApiErrorResponse.class))})}
8181
)
8282
@GetMapping(value = "")
83-
@ResponseBody
8483
public List<OcppTagOverview> get(@ParameterObject OcppTagQueryFormForApi params) {
8584
log.debug("Read request for query: {}", params);
8685

@@ -100,7 +99,6 @@ public List<OcppTagOverview> get(@ParameterObject OcppTagQueryFormForApi params)
10099
@ApiResponse(responseCode = "500", description = "Internal Server Error", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ApiErrorResponse.class))})}
101100
)
102101
@GetMapping("/{ocppTagPk}")
103-
@ResponseBody
104102
public OcppTagOverview getOne(@PathVariable("ocppTagPk") Integer ocppTagPk) {
105103
log.debug("Read request for ocppTagPk: {}", ocppTagPk);
106104

@@ -122,7 +120,6 @@ public OcppTagOverview getOne(@PathVariable("ocppTagPk") Integer ocppTagPk) {
122120
@ApiResponse(responseCode = "500", description = "Internal Server Error", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ApiErrorResponse.class))})}
123121
)
124122
@PostMapping
125-
@ResponseBody
126123
@ResponseStatus(HttpStatus.CREATED)
127124
public OcppTagOverview create(@RequestBody @Valid OcppTagForm params) {
128125
log.debug("Create request: {}", params);
@@ -145,7 +142,6 @@ public OcppTagOverview create(@RequestBody @Valid OcppTagForm params) {
145142
@ApiResponse(responseCode = "500", description = "Internal Server Error", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ApiErrorResponse.class))})}
146143
)
147144
@PutMapping("/{ocppTagPk}")
148-
@ResponseBody
149145
public OcppTagOverview update(@PathVariable("ocppTagPk") Integer ocppTagPk, @RequestBody @Valid OcppTagForm params) {
150146
params.setOcppTagPk(ocppTagPk); // the one from incoming params does not matter
151147
log.debug("Update request: {}", params);
@@ -169,7 +165,6 @@ public OcppTagOverview update(@PathVariable("ocppTagPk") Integer ocppTagPk, @Req
169165
@ApiResponse(responseCode = "500", description = "Internal Server Error", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ApiErrorResponse.class))})}
170166
)
171167
@DeleteMapping("/{ocppTagPk}")
172-
@ResponseBody
173168
public OcppTagOverview delete(@PathVariable("ocppTagPk") Integer ocppTagPk) {
174169
log.debug("Delete request for ocppTagPk: {}", ocppTagPk);
175170

src/main/java/de/rwth/idsg/steve/web/api/TransactionsRestController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import org.springframework.http.MediaType;
3636
import org.springframework.web.bind.annotation.GetMapping;
3737
import org.springframework.web.bind.annotation.RequestMapping;
38-
import org.springframework.web.bind.annotation.ResponseBody;
3938
import org.springframework.web.bind.annotation.RestController;
4039

4140
import jakarta.validation.Valid;
41+
4242
import java.util.List;
4343

4444
/**
@@ -70,7 +70,6 @@ public class TransactionsRestController {
7070
@ApiResponse(responseCode = "500", description = "Internal Server Error", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ApiErrorResponse.class))})}
7171
)
7272
@GetMapping(value = "")
73-
@ResponseBody
7473
public List<Transaction> get(@Valid @ParameterObject TransactionQueryForm.TransactionQueryFormForApi params) {
7574
log.debug("Read request for query: {}", params);
7675

0 commit comments

Comments
 (0)