Adapt tests that expected a DuplicateKeyException

Closes spring-projectsgh-2108

Author: marcusdacoregio

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcIndexedSessionRepositoryITests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.session.jdbc;
 
+import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -31,7 +32,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
-import org.springframework.dao.DuplicateKeyException;
+import org.springframework.core.serializer.DefaultSerializer;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@@ -54,7 +55,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * Base class for {@link JdbcIndexedSessionRepository} integration tests.
@@ -803,13 +803,17 @@ void saveNewSessionAttributeConcurrently() {
 			this.jdbcOperations.update("INSERT INTO SPRING_SESSION_ATTRIBUTES VALUES (?, ?, ?)", (ps) -> {
 				ps.setString(1, (String) ReflectionTestUtils.getField(session, "primaryKey"));
 				ps.setString(2, attributeName);
-				lobCreator.setBlobAsBytes(ps, 3, "value2".getBytes());
+				lobCreator.setBlobAsBytes(ps, 3, serialize("value2"));
 			});
 		}
 		session.setAttribute(attributeName, attributeValue);
 		if (this.applicationContext.getBeansOfType(SessionRepositoryCustomizer.class).isEmpty()) {
 			// without DB specific upsert configured we're seeing duplicate key error
-			assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(() -> this.repository.save(session));
+			// which is suppressed.
+			// The attribute value won't be updated
+			this.repository.save(session);
+			assertThat((String) this.repository.findById(session.getId()).getAttribute(attributeName))
+					.isEqualTo("value2");
 		}
 		else {
 			// with DB specific upsert configured we're fine
@@ -819,6 +823,15 @@ void saveNewSessionAttributeConcurrently() {
 		}
 	}
 
+	private static byte[] serialize(String value) {
+		try {
+			return new DefaultSerializer().serializeToByteArray(value);
+		}
+		catch (IOException ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+
 	private String getSecurityName() {
 		return this.context.getAuthentication().getName();
 	}

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcIndexedSessionRepository.java

@@ -498,6 +498,9 @@ public int getBatchSize() {
 					throw ex;
 				}
 				catch (DataIntegrityViolationException ex) {
+					if (logger.isTraceEnabled()) {
+						logger.trace("Not able to create session attributes", ex);
+					}
 					// parent record not found - we are ignoring this error because we
 					// assume that a concurrent request has removed the session
 				}
@@ -515,6 +518,9 @@ public int getBatchSize() {
 					throw ex;
 				}
 				catch (DataIntegrityViolationException ex) {
+					if (logger.isTraceEnabled()) {
+						logger.trace("Not able to create session attributes", ex);
+					}
 					// parent record not found - we are ignoring this error because we
 					// assume that a concurrent request has removed the session
 				}