Skip to content

Commit

Permalink
objectmapper cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmyjames committed Oct 8, 2023
1 parent e20bacb commit aafd6a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
11 changes: 2 additions & 9 deletions mvc-login/src/main/java/com/auth0/example/ProfileController.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.oauth2.core.oidc.user.OidcUser;
import org.springframework.stereotype.Controller;
Expand All @@ -22,6 +21,7 @@
public class ProfileController {

private final Logger log = LoggerFactory.getLogger(this.getClass());
private final static ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule());

@GetMapping("/profile")
public String profile(Model model, @AuthenticationPrincipal OidcUser oidcUser) {
Expand All @@ -32,17 +32,10 @@ public String profile(Model model, @AuthenticationPrincipal OidcUser oidcUser) {

private String claimsToJson(Map<String, Object> claims) {
try {
return objectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(claims);
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(claims);
} catch (JsonProcessingException jpe) {
log.error("Error parsing claims to JSON", jpe);
}
return "Error parsing claims to JSON.";
}

@Bean
public ObjectMapper objectMapper() {
JavaTimeModule module = new JavaTimeModule();
return new ObjectMapper()
.registerModule(module);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.oauth2.core.oidc.user.OidcUser;
import org.springframework.stereotype.Controller;
Expand All @@ -22,6 +21,7 @@
public class ProfileController {

private final Logger log = LoggerFactory.getLogger(this.getClass());
private final static ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule());

@GetMapping("/profile")
public String profile(Model model, @AuthenticationPrincipal OidcUser oidcUser) {
Expand All @@ -32,17 +32,10 @@ public String profile(Model model, @AuthenticationPrincipal OidcUser oidcUser) {

private String claimsToJson(Map<String, Object> claims) {
try {
return objectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(claims);
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(claims);
} catch (JsonProcessingException jpe) {
log.error("Error parsing claims to JSON", jpe);
}
return "Error parsing claims to JSON.";
}

@Bean
public ObjectMapper objectMapper() {
JavaTimeModule module = new JavaTimeModule();
return new ObjectMapper()
.registerModule(module);
}
}

0 comments on commit aafd6a4

Please sign in to comment.