Extract transaction attributes definition in separate classes

fmbenhassine · fmbenhassine · commit 86ddfb97cb5a · 2025-09-09T07:14:10.000+02:00
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBean.java
@@ -102,17 +102,7 @@ public void afterPropertiesSet() throws Exception {
 			this.taskExecutor = new SyncTaskExecutor();
 		}
 		if (this.transactionAttributeSource == null) {
-			this.transactionAttributeSource = new MethodMapTransactionAttributeSource();
-			DefaultTransactionAttribute transactionAttribute = new DefaultTransactionAttribute();
-			Method stopMethod = TaskExecutorJobOperator.class.getMethod("stop", JobExecution.class);
-			Method abandonMethod = TaskExecutorJobOperator.class.getMethod("abandon", JobExecution.class);
-			Method recoverMethod = TaskExecutorJobOperator.class.getMethod("recover", JobExecution.class);
-			((MethodMapTransactionAttributeSource) this.transactionAttributeSource).addTransactionalMethod(stopMethod,
-					transactionAttribute);
-			((MethodMapTransactionAttributeSource) this.transactionAttributeSource)
-				.addTransactionalMethod(abandonMethod, transactionAttribute);
-			((MethodMapTransactionAttributeSource) this.transactionAttributeSource)
-				.addTransactionalMethod(recoverMethod, transactionAttribute);
+			this.transactionAttributeSource = new DefaultJobOperatorTransactionAttributeSource();
 		}
 	}
 
@@ -223,4 +213,24 @@ private TaskExecutorJobOperator getTarget() throws Exception {
 		return taskExecutorJobOperator;
 	}
 
+	private static class DefaultJobOperatorTransactionAttributeSource extends MethodMapTransactionAttributeSource {
+
+		public DefaultJobOperatorTransactionAttributeSource() {
+			DefaultTransactionAttribute transactionAttribute = new DefaultTransactionAttribute();
+			try {
+				Method stopMethod = TaskExecutorJobOperator.class.getMethod("stop", JobExecution.class);
+				Method abandonMethod = TaskExecutorJobOperator.class.getMethod("abandon", JobExecution.class);
+				Method recoverMethod = TaskExecutorJobOperator.class.getMethod("recover", JobExecution.class);
+				addTransactionalMethod(stopMethod, transactionAttribute);
+				addTransactionalMethod(abandonMethod, transactionAttribute);
+				addTransactionalMethod(recoverMethod, transactionAttribute);
+			}
+			catch (NoSuchMethodException e) {
+				throw new IllegalStateException("Failed to initialize default transaction attributes for JobOperator",
+						e);
+			}
+		}
+
+	}
+
 }
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java
@@ -196,15 +196,8 @@ public void afterPropertiesSet() throws Exception {
 			jobKeyGenerator = new DefaultJobKeyGenerator();
 		}
 		if (this.transactionAttributeSource == null) {
-			Properties transactionAttributes = new Properties();
-			transactionAttributes.setProperty("create*",
-					TRANSACTION_PROPAGATION_PREFIX + Propagation.REQUIRES_NEW + "," + this.isolationLevelForCreate);
-			transactionAttributes.setProperty("getLastJobExecution*",
-					TRANSACTION_PROPAGATION_PREFIX + Propagation.REQUIRES_NEW + "," + this.isolationLevelForCreate);
-			transactionAttributes.setProperty("*", "PROPAGATION_REQUIRED");
-			this.transactionAttributeSource = new NameMatchTransactionAttributeSource();
-			((NameMatchTransactionAttributeSource) this.transactionAttributeSource)
-				.setProperties(transactionAttributes);
+			this.transactionAttributeSource = new DefaultJobRepositoryTransactionAttributeSource(
+					this.isolationLevelForCreate);
 		}
 	}
 
@@ -237,4 +230,18 @@ private Object getTarget() throws Exception {
 				createExecutionContextDao());
 	}
 
+	private static class DefaultJobRepositoryTransactionAttributeSource extends NameMatchTransactionAttributeSource {
+
+		public DefaultJobRepositoryTransactionAttributeSource(String isolationLevelForCreate) {
+			Properties transactionAttributes = new Properties();
+			transactionAttributes.setProperty("create*",
+					TRANSACTION_PROPAGATION_PREFIX + Propagation.REQUIRES_NEW + "," + isolationLevelForCreate);
+			transactionAttributes.setProperty("getLastJobExecution*",
+					TRANSACTION_PROPAGATION_PREFIX + Propagation.REQUIRES_NEW + "," + isolationLevelForCreate);
+			transactionAttributes.setProperty("*", "PROPAGATION_REQUIRED");
+			this.setProperties(transactionAttributes);
+		}
+
+	}
+
 }
