Release 0.0.27

Bugfix for StaleObjectStateException

Author: oharsta

client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>access</artifactId>
-        <version>0.0.27-SNAPSHOT</version>
+        <version>0.0.27</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>access-client</artifactId>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openconext</groupId>
     <artifactId>access</artifactId>
-    <version>0.0.27-SNAPSHOT</version>
+    <version>0.0.27</version>
     <packaging>pom</packaging>
     <name>access</name>
     <description>SURFconext Invite</description>

provisioning-mock/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>access</artifactId>
-        <version>0.0.27-SNAPSHOT</version>
+        <version>0.0.27</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>provisioning-mock</artifactId>

server/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>access</artifactId>
-        <version>0.0.27-SNAPSHOT</version>
+        <version>0.0.27</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>access-server</artifactId>
@@ -23,10 +23,11 @@
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-jdbc</artifactId>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/io.hypersistence/hypersistence-utils-hibernate-63 -->
         <dependency>
             <groupId>io.hypersistence</groupId>
-            <artifactId>hypersistence-utils-hibernate-60</artifactId>
-            <version>3.8.2</version>
+            <artifactId>hypersistence-utils-hibernate-63</artifactId>
+            <version>3.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

server/src/main/java/access/teams/TeamsController.java

@@ -94,9 +94,14 @@ public ResponseEntity<Map<String, Integer>> migrateTeam(@RequestBody Team team)
         //This is the disadvantage of having to save references from Manage
         Set<ApplicationUsage> applicationUsages = team.getApplications().stream()
                 .map(applicationFromTeams -> {
-                    Application applicationFromDB = applicationRepository
-                            .findByManageIdAndManageType(applicationFromTeams.getManageId(), applicationFromTeams.getManageType())
-                            .orElseGet(() -> applicationRepository.save(applicationFromTeams));
+                    Optional<Application> optionalApplication = applicationRepository
+                            .findByManageIdAndManageType(applicationFromTeams.getManageId(), applicationFromTeams.getManageType());
+                    Application applicationFromDB = optionalApplication
+                            .orElseGet(() -> {
+                                // ID is also serialized from database teams object, need to prevent StaleObjectStateException
+                                applicationFromTeams.setId(null);
+                                return applicationRepository.save(applicationFromTeams);
+                            });
                     return new ApplicationUsage(applicationFromDB, applicationFromTeams.getLandingPage());
                 })
                 .collect(Collectors.toSet());

server/src/main/resources/manage/oidc10_rp.json

@@ -29,5 +29,21 @@
         "coin:application_url": "https://default-url-cloud.org"
       }
     }
+  },
+  {
+    "_id": "7",
+    "version": 1,
+    "type": "oidc10_rp",
+    "data": {
+      "entityid": "https://unused",
+      "metaDataFields": {
+        "name:en": "Unused EN",
+        "name:nl": "Unused NL",
+        "OrganizationName:en": "SURF bv",
+        "logo:0:url": "https://static.surfconext.nl/media/idp/surfconext.png",
+        "coin:application_url": "https://default-url-unused.org"
+      }
+    }
   }
+
 ]

server/src/test/java/access/api/ManageControllerTest.java

@@ -78,7 +78,7 @@ void providers() throws Exception {
                 .get("/api/v1/manage/providers")
                 .as(new TypeRef<>() {
                 });
-        assertEquals(6, result.size());
+        assertEquals(7, result.size());
     }
 
     @Test

server/src/test/java/access/teams/TeamsControllerTest.java

@@ -16,9 +16,12 @@
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static access.teams.TeamsController.mapAuthority;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static io.restassured.RestAssured.given;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -102,6 +105,42 @@ void migrateTeam() throws JsonProcessingException {
         assertEquals(team.getName(), group.get("name"));
     }
 
+    @Test
+    void migrateTeamObjectOptimisticLockingFailureException() throws JsonProcessingException {
+        List<Membership> memberships = getMemberships();
+        String manageId = UUID.randomUUID().toString();
+        Application application = new Application(manageId, EntityType.OIDC10_RP);
+        application.setId(Long.MAX_VALUE - 1);
+
+        List<Application> applications = List.of(application);
+        Team team = new Team(
+                "nl:surfnet:diensten:test",
+                "test migration",
+                "test migration",
+                memberships,
+                applications
+        );
+        String path = String.format("/manage/api/internal/metadata/%s/%s",
+                application.getManageType().name().toLowerCase(), manageId);
+        String body = objectMapper.writeValueAsString(localManage.providerById(application.getManageType(), "7"));
+        stubFor(get(urlPathMatching(path)).willReturn(aResponse()
+                .withHeader("Content-Type", "application/json")
+                .withBody(body)));
+
+        super.stubForManageProvisioning(List.of());
+
+        given()
+                .when()
+                .auth().preemptive().basic("teams", "secret")
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .body(team)
+                .put("/api/external/v1/teams")
+                .then()
+                .statusCode(201);
+
+    }
+
     private List<Membership> getMemberships() {
         return userRoles.entrySet().stream()
                 .map(entry -> new Membership(

welcome/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>access</artifactId>
-        <version>0.0.27-SNAPSHOT</version>
+        <version>0.0.27</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>access-welcome</artifactId>