Skip to content

Commit

Permalink
FOLIOINT-370 apply google code formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
scott-yeadon committed Aug 13, 2024
1 parent b10af0e commit 7578415
Show file tree
Hide file tree
Showing 5 changed files with 182 additions and 90 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
public class KeycloakLogoutHandler implements LogoutHandler {

private final RestClient restClient = RestClient.create();

@Override
public void logout(
HttpServletRequest request, HttpServletResponse response, Authentication auth) {
Expand All @@ -26,16 +27,19 @@ private void logoutFromKeycloak(OidcUser user) {
String endSessionEndpoint = user.getIssuer() + "/protocol/openid-connect/logout";
UriComponentsBuilder builder =
UriComponentsBuilder.fromUriString(endSessionEndpoint)
.queryParam("id_token_hint", user.getIdToken().getTokenValue());
.queryParam("id_token_hint", user.getIdToken()
.getTokenValue());

ResponseEntity<String> result = restClient.get()
.uri(builder.toUriString())
.retrieve()
.toEntity(String.class);

if (result.getStatusCode().is2xxSuccessful()) {
if (result.getStatusCode()
.is2xxSuccessful()) {
log.info("Keycloak logout successful: {}", user.getPreferredUsername());
} else {
}
else {
log.warn("Keycloak logout unsuccessful: {}", result.getBody());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
@Slf4j
@RequiredArgsConstructor
public class SecurityConfiguration {
static String[] ANONYMOUS_PATHS = {"/export/**", "/bulkprint/**", "/location/**", "/", "/home", "/user/**", "/webjars/**","/css/**"};
static String[] ANONYMOUS_PATHS = {"/export/**", "/bulkprint/**", "/location/**", "/", "/home",
"/user/**", "/webjars/**", "/css/**"};

private final KeycloakLogoutHandler keycloakLogoutHandler;

Expand All @@ -34,9 +35,12 @@ public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception
.requestMatchers(Arrays.stream(ANONYMOUS_PATHS)
.map(AntPathRequestMatcher::antMatcher)
.toArray(AntPathRequestMatcher[]::new))
.permitAll().anyRequest().authenticated())
.permitAll()
.anyRequest()
.authenticated())
.oauth2Login(Customizer.withDefaults())
.logout(logout -> logout.addLogoutHandler(keycloakLogoutHandler).logoutSuccessUrl("/"));
.logout(logout -> logout.addLogoutHandler(keycloakLogoutHandler)
.logoutSuccessUrl("/"));
return http.build();
}
}
64 changes: 45 additions & 19 deletions src/main/java/au/gov/nla/pickslip/controller/HomeController.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import au.gov.nla.pickslip.service.ScheduledRequestRetrieverService;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse;

import java.io.IOException;
import java.security.Principal;
import java.util.ArrayList;
Expand All @@ -32,15 +33,20 @@
@Slf4j
public class HomeController {

@Autowired PickslipQueues pickslipQueues;
@Autowired
PickslipQueues pickslipQueues;

@Autowired FolioService folioService;
@Autowired
FolioService folioService;

@Autowired PdfResponderService pdfResponderService;
@Autowired
PdfResponderService pdfResponderService;

@Autowired ScheduledRequestRetrieverService scheduledRequestRetrieverService;
@Autowired
ScheduledRequestRetrieverService scheduledRequestRetrieverService;

@Autowired StackLocations stackLocations;
@Autowired
StackLocations stackLocations;

@Autowired
RequestEditService requestEditService;
Expand Down Expand Up @@ -117,19 +123,28 @@ public void bulkExport(
stackPickslips.stream()
.filter(
p ->
(p.request().requestDate().isAfter(uptoPickslip.request().requestDate()))
|| p.request().requestDate().isEqual(uptoPickslip.request().requestDate()))
(p.request()
.requestDate()
.isAfter(uptoPickslip.request()
.requestDate()))
|| p.request()
.requestDate()
.isEqual(uptoPickslip.request()
.requestDate()))
.filter(
p ->
p.visiting() == visitors
&& !p.parked()
&& PickslipQueues.Pickslip.Request.Status.OPEN_NOT_YET_FILLED
.getCode()
.equalsIgnoreCase(p.request().status()))
.getCode()
.equalsIgnoreCase(p.request()
.status()))
.sorted(
(Comparator.comparingDouble(
(PickslipQueues.Pickslip p) -> getDeweyish(p.item().callNumber()))
.thenComparing(p -> p.item().callNumber())))
(PickslipQueues.Pickslip p) -> getDeweyish(p.item()
.callNumber()))
.thenComparing(p -> p.item()
.callNumber())))
.toList();

pdfResponderService.generate(sos, sorted);
Expand All @@ -151,22 +166,25 @@ public String stack(
model.addAttribute("visitors", pickslipQueues.getVisitorsForStack(stackCode));

if (principal != null) {
model.addAttribute("loggedInUser", ((OAuth2AuthenticationToken)principal).getPrincipal().getAttribute("preferred_username"));
model.addAttribute("loggedInUser", ((OAuth2AuthenticationToken) principal).getPrincipal()
.getAttribute("preferred_username"));
}

return "stack";
}

@GetMapping({"", "/", "/home"})
public String index(@RequestParam(required = false) String[] showOnly, Model model, final Principal principal) {
public String index(@RequestParam(required = false) String[] showOnly, Model model,
final Principal principal) {

model.addAttribute("lastSuccess", scheduledRequestRetrieverService.getLastCompleted());
model.addAttribute("showOnly", showOnly);
model.addAttribute("stacks", filterStackLocations(showOnly));
model.addAttribute("queues", pickslipQueues);

if (principal != null) {
model.addAttribute("loggedInUser", ((OAuth2AuthenticationToken)principal).getPrincipal().getAttribute("preferred_username"));
model.addAttribute("loggedInUser", ((OAuth2AuthenticationToken) principal).getPrincipal()
.getAttribute("preferred_username"));
}

return "index";
Expand All @@ -190,7 +208,8 @@ private List<StackLocations.Location> filterStackLocations(String[] stackCodes)
}

@GetMapping("/request/{requestId}/edit")
public String editRequest(@PathVariable final String requestId, final Model model, final Principal principal) {
public String editRequest(@PathVariable final String requestId, final Model model,
final Principal principal) {
if (folioEditNotAllowed(principal)) {
return "redirect:/";
}
Expand Down Expand Up @@ -221,19 +240,26 @@ public String editRequest(@PathVariable final String requestId, final Model mode
}

@PostMapping("/request/{requestId}/edit")
public String editRequest(@PathVariable final String requestId, @ModelAttribute final RequestNoteDto requestNoteDto, Principal principal) throws IOException {
public String editRequest(@PathVariable final String requestId,
@ModelAttribute final RequestNoteDto requestNoteDto,
Principal principal) throws IOException {

if (folioEditNotAllowed(principal)) {
return "redirect:/";
}

log.debug("id: {}, note: {}", requestNoteDto.getRequestId(), requestNoteDto.getCancellationAdditionalInformation());
log.debug("id: {}, note: {}", requestNoteDto.getRequestId(),
requestNoteDto.getCancellationAdditionalInformation());

if (requestNoteDto.getRequestId() != null && !requestNoteDto.getRequestId().trim().isEmpty() && requestNoteDto.getCancellationAdditionalInformation() != null && !requestNoteDto.getCancellationAdditionalInformation().trim().isEmpty()) {
if (requestNoteDto.getRequestId() != null && !requestNoteDto.getRequestId()
.trim()
.isEmpty() && requestNoteDto.getCancellationAdditionalInformation() != null && !requestNoteDto.getCancellationAdditionalInformation()
.trim()
.isEmpty()) {
folioService.updateRequest(requestNoteDto);
}

return "redirect:/request/" + requestId + "/edit" ;
return "redirect:/request/" + requestId + "/edit";
}

private boolean folioEditNotAllowed(final Principal principal) {
Expand Down
14 changes: 6 additions & 8 deletions src/main/java/au/gov/nla/pickslip/domain/FolioRequest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.time.ZonedDateTime;
import java.util.List;
Expand Down Expand Up @@ -34,21 +33,20 @@ public Instance getInstance() {

@JsonInclude(value = JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public record Requester(String barcode, String patronGroupGroup) {}
;
public record Requester(String barcode, String patronGroupGroup) {
}

@JsonInclude(value = JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public record Item(String barcode, String callNumber, Location location) {
@JsonInclude(value = JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public record Location(String name, String code) {}
;
public record Location(String name, String code) {
}
}


@JsonInclude(value = JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public record Instance(String title) {}
;
public record Instance(String title) {
}
}
Loading

0 comments on commit 7578415

Please sign in to comment.