OK-611 laskennan rinnakkaistaminen

pom.xml

@@ -227,6 +227,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-jdbc</artifactId>
+        </dependency>
 
         <!-- Sade -->
         <dependency>
@@ -445,9 +449,9 @@
             <version>1.16</version>
         </dependency>
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-slf4j_2.11</artifactId>
-            <version>2.5.31</version>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>2.11.12</version>
         </dependency>
 
         <!-- REST, Json -->
@@ -516,6 +520,12 @@
             <version>9.22.3</version>
         </dependency>
 
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>cloudwatch</artifactId>
+            <version>2.20.162</version>
+        </dependency>
+
         <!-- Tests -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -609,16 +619,15 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-testkit_2.11</artifactId>
-            <version>2.5.31</version>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>1.20.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>1.19.0</version>
-            <scope>test</scope>
+            <artifactId>localstack</artifactId>
+            <version>1.20.3</version>
         </dependency>
     </dependencies>
 

src/main/java/fi/vm/sade/valinta/kooste/App.java

@@ -1,12 +1,13 @@
 package fi.vm.sade.valinta.kooste;
 
-import java.io.*;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, MongoAutoConfiguration.class})
+@EnableScheduling
 public class App {
 
   public static final String CONTEXT_PATH = "/valintalaskentakoostepalvelu";

src/main/java/fi/vm/sade/valinta/kooste/configuration/AwsConfiguration.java

@@ -0,0 +1,38 @@
+package fi.vm.sade.valinta.kooste.configuration;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClientBuilder;
+
+@Configuration
+public class AwsConfiguration {
+
+  @Bean
+  public CloudWatchClient cloudWatchClient(Environment environment) throws URISyntaxException {
+    boolean isLocal =
+        Arrays.stream(environment.getActiveProfiles())
+            .anyMatch(
+                env ->
+                    (env.equalsIgnoreCase("test")
+                        || env.equalsIgnoreCase("mockservices")
+                        || env.equalsIgnoreCase("dev")));
+
+    CloudWatchClientBuilder builder =
+        CloudWatchClient.builder().credentialsProvider(DefaultCredentialsProvider.create());
+
+    if (isLocal) {
+      builder
+          .region(Region.US_EAST_1)
+          .endpointOverride(new URI("http://localhost:" + System.getProperty("localstackPort")));
+    }
+
+    return builder.build();
+  }
+}

src/main/java/fi/vm/sade/valinta/kooste/configuration/SecurityConfiguration.java

@@ -21,12 +21,16 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
+import org.springframework.session.web.http.CookieSerializer;
+import org.springframework.session.web.http.DefaultCookieSerializer;
 
 @Profile({"default", "dev"})
 @Configuration
 @Order(2)
 @EnableMethodSecurity(securedEnabled = true)
 @EnableWebSecurity
+@EnableJdbcHttpSession
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
   private Environment environment;
 
@@ -152,4 +156,14 @@ protected void configure(HttpSecurity http) throws Exception {
   protected void configure(AuthenticationManagerBuilder auth) {
     auth.authenticationProvider(casAuthenticationProvider());
   }
+
+  @Bean
+  public CookieSerializer cookieSerializer() {
+    DefaultCookieSerializer serializer = new DefaultCookieSerializer();
+    serializer.setUseSecureCookie(true);
+    serializer.setCookieName("JSESSIONID");
+    serializer.setCookiePath("/valintalaskentakoostepalvelu");
+    serializer.setUseBase64Encoding(false);
+    return serializer;
+  }
 }

src/main/java/fi/vm/sade/valinta/kooste/external/resource/HttpClients.java

@@ -274,6 +274,7 @@ public RestCasClient getSuoritusrekisteriCasClient(
     return new RestCasClient(
         new CasConfig.CasConfigBuilder(
                 username, password, ticketsUrl, service, CSRF_VALUE, CALLER_ID, "")
+            .setNumberOfRetries(0)
             .setJsessionName("JSESSIONID")
             .build());
   }