Skip to content

Commit 3f102e7

Browse files
oharstaoharsta
committed
Formatter
1 parent d996224 commit 3f102e7

51 files changed

Lines changed: 70 additions & 85 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎myconext-server/src/main/java/myconext/api/DefaultErrorController.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import io.swagger.v3.oas.annotations.Hidden;
55
import jakarta.servlet.http.HttpServletRequest;
66
import myconext.exceptions.RemoteException;
7-
import myconext.exceptions.UserNotFoundException;
87
import org.apache.commons.logging.Log;
98
import org.apache.commons.logging.LogFactory;
109
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +65,7 @@ public ResponseEntity error(HttpServletRequest request) throws URISyntaxExceptio
6665
// if (error instanceof UserNotFoundException) {
6766
// LOG.warn(String.format("%s: %s", error.getClass(), error.getMessage()));
6867
// } else {
69-
LOG.error(String.format("Error occurred; %s %s", error.getClass(), error), error);
68+
LOG.error(String.format("Error occurred; %s %s", error.getClass(), error), error);
7069
// }
7170
//https://github.com/spring-projects/spring-boot/issues/3057
7271
ResponseStatus annotation = AnnotationUtils.getAnnotation(error.getClass(), ResponseStatus.class);
@@ -78,7 +77,7 @@ public ResponseEntity error(HttpServletRequest request) throws URISyntaxExceptio
7877
statusCode = BAD_REQUEST;
7978
}
8079
if (error instanceof RemoteException) {
81-
result.put("reference", ((RemoteException)error).getReference());
80+
result.put("reference", ((RemoteException) error).getReference());
8281
}
8382
}
8483
result.put("status", statusCode.value());

‎myconext-server/src/main/java/myconext/api/EnvironmentController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package myconext.api;
22

33

4+
import jakarta.servlet.http.HttpServletResponse;
45
import org.springframework.beans.factory.annotation.Value;
56
import org.springframework.web.bind.annotation.GetMapping;
67
import org.springframework.web.bind.annotation.RestController;
78

8-
import jakarta.servlet.http.HttpServletResponse;
99
import java.io.IOException;
1010

1111
@RestController

‎myconext-server/src/main/java/myconext/api/MetricsController.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,25 @@ public class MetricsController {
1717
public MetricsController(UserRepository userRepository,
1818
MetricsRepository metricsRepository,
1919
MeterRegistry meterRegistry) {
20-
Gauge.builder("user_count", () -> userRepository.count())
20+
Gauge.builder("user_count", () ->
21+
userRepository.count())
2122
.description("User count")
2223
.register(meterRegistry);
2324

24-
Gauge.builder("linked_account_count", () -> metricsRepository.countTotalLinkedAccounts())
25+
Gauge.builder("linked_account_count",
26+
() -> metricsRepository.countTotalLinkedAccounts())
2527
.description("Internal linked account count")
2628
.register(meterRegistry);
2729

28-
Gauge.builder("registered_apps_count", () -> metricsRepository.countTotalRegisteredApps())
30+
Gauge.builder("registered_apps_count",
31+
() -> metricsRepository.countTotalRegisteredApps())
2932
.description("Registered apps count")
3033
.register(meterRegistry);
3134

3235
Stream.of(IdpScoping.values())
3336
.forEach(idpScoping -> Gauge
34-
.builder("external_linked_account_" + idpScoping.name(), () -> metricsRepository.countTotalExternalLinkedAccountsByType(idpScoping))
37+
.builder("external_linked_account_" + idpScoping.name(),
38+
() -> metricsRepository.countTotalExternalLinkedAccountsByType(idpScoping))
3539
.description("External account " + idpScoping.name() + " count ")
3640
.register(meterRegistry));
3741
}

‎myconext-server/src/main/java/myconext/api/ServiceDeskController.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import myconext.model.*;
1111
import myconext.repository.ExternalUserRepository;
1212
import myconext.repository.UserRepository;
13-
import myconext.security.UserAuthentication;
1413
import myconext.verify.AttributeMapper;
1514
import org.apache.commons.logging.Log;
1615
import org.apache.commons.logging.LogFactory;
@@ -23,8 +22,6 @@
2322

2423
import java.util.Date;
2524

26-
import static myconext.log.MDCContext.logWithContext;
27-
2825

2926
@RestController
3027
@RequestMapping(value = {"/myconext/api/servicedesk"})
@@ -86,7 +83,7 @@ public ResponseEntity<Boolean> validateDate(@RequestParam("dayOfBirth") String d
8683

8784
@PutMapping("/approve")
8885
public ResponseEntity<ExternalLinkedAccount> convertUserControlCode(Authentication authentication,
89-
@RequestBody ControlCode controlCode) {
86+
@RequestBody ControlCode controlCode) {
9087
try {
9188
return doConvertUserControlCode(authentication, controlCode);
9289
} catch (RuntimeException e) {
@@ -97,7 +94,7 @@ public ResponseEntity<ExternalLinkedAccount> convertUserControlCode(Authenticati
9794
}
9895
}
9996

100-
private ResponseEntity<ExternalLinkedAccount> doConvertUserControlCode(Authentication authentication, ControlCode controlCode) throws RuntimeException{
97+
private ResponseEntity<ExternalLinkedAccount> doConvertUserControlCode(Authentication authentication, ControlCode controlCode) throws RuntimeException {
10198
String code = controlCode.getCode();
10299
User user = userRepository.findByControlCode_Code(code)
103100
.orElseThrow(() -> new UserNotFoundException(String.format("No user found with controlCode %s", code)));

‎myconext-server/src/main/java/myconext/geo/MaxMindGeoLocation.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.apache.commons.logging.LogFactory;
1515
import org.springframework.beans.factory.annotation.Value;
1616
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
17-
import org.springframework.context.annotation.Bean;
1817
import org.springframework.scheduling.annotation.Scheduled;
1918
import org.springframework.stereotype.Component;
2019

‎myconext-server/src/main/java/myconext/geo/MockGeoLocation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@ConditionalOnProperty(prefix = "geo_location", name = "service", havingValue = "mock")
99
@Component
10-
public class MockGeoLocation implements GeoLocation{
10+
public class MockGeoLocation implements GeoLocation {
1111

1212
@Override
1313
public Optional<String> findLocation(String ipAddress) {

‎myconext-server/src/main/java/myconext/invite/EduIDProvision.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package myconext.invite;
22

3+
import jakarta.validation.constraints.NotNull;
34
import lombok.AllArgsConstructor;
45
import lombok.Getter;
56
import lombok.NoArgsConstructor;
67
import lombok.Setter;
78

8-
import jakarta.validation.constraints.NotNull;
9-
109
@Getter
1110
@AllArgsConstructor
1211
@NoArgsConstructor

‎myconext-server/src/main/java/myconext/log/MDCContext.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.util.List;
1010
import java.util.Map;
1111
import java.util.Objects;
12-
import java.util.stream.Collectors;
1312
import java.util.stream.Stream;
1413

1514
public class MDCContext {
@@ -57,7 +56,7 @@ public static void logLoginWithContext(User user, String loginMethod, boolean su
5756
CollectionUtils.isEmpty(authenticationContextClassReferences) ? "[]" :
5857
String.join(", ", authenticationContextClassReferences),
5958
authnContextClassRefValue
60-
));
59+
));
6160
}
6261

6362
/*

‎myconext-server/src/main/java/myconext/log/MDCFilter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package myconext.log;
22

3+
import jakarta.servlet.*;
34
import org.slf4j.MDC;
45
import org.springframework.stereotype.Component;
56

6-
import jakarta.servlet.*;
77
import java.io.IOException;
88

99
@Component

‎myconext-server/src/main/java/myconext/mail/MailBox.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ public MailBox(JavaMailSender mailSender,
6666
LOG.info("Initializing mail templates from JAR resource: " + mailTemplatesDirectory.getFilename());
6767
mustacheFactory = new DefaultMustacheFactory(mailTemplatesDirectory.getFilename());
6868
}
69-
this.subjects = objectMapper.readValue(inputStream(mailTemplatesDirectory), new TypeReference<>() {});
69+
this.subjects = objectMapper.readValue(inputStream(mailTemplatesDirectory), new TypeReference<>() {
70+
});
7071
this.objectMapper = objectMapper;
7172
}
7273

@@ -243,7 +244,7 @@ private void sendMail(String templateName, String subject, Map<String, Object> v
243244
helper.setFrom(emailFrom);
244245
doSendMail(mimeMessage);
245246
} catch (Exception e) {
246-
LOG.error("Error sending mail to "+to, e);
247+
LOG.error("Error sending mail to " + to, e);
247248
//We don't want to stop batch mailings
248249
}
249250
}

0 commit comments

Comments
 (0)