From 442f89bfbd8abb5a53bb8a0ff165eb952fb5ce85 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 26 Jul 2016 01:29:51 +0200 Subject: [PATCH] Deprecate JpaSystemException(PersistenceException) constructor to prepare for removal in Spring 5 Issue: SPR-13827 (cherry picked from commit 9ee1dc7) --- .../springframework/orm/jpa/EntityManagerFactoryUtils.java | 4 ++-- .../java/org/springframework/orm/jpa/JpaSystemException.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java index c2f3a5884a9..219beb3cc95 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -415,7 +415,7 @@ public abstract class EntityManagerFactoryUtils { // If we have another kind of PersistenceException, throw it. if (ex instanceof PersistenceException) { - return new JpaSystemException((PersistenceException) ex); + return new JpaSystemException(ex); } // If we get here, we have an exception that resulted from user code, diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java index 0b879063cf4..9b16af72b71 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 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. @@ -32,6 +32,7 @@ import org.springframework.dao.UncategorizedDataAccessException; @SuppressWarnings("serial") public class JpaSystemException extends UncategorizedDataAccessException { + @Deprecated public JpaSystemException(PersistenceException ex) { super(ex.getMessage(), ex); }