jamesfredley commented on code in PR #15654: URL: https://github.com/apache/grails-core/pull/15654#discussion_r3314870952
########## grails-data-hibernate7/spring-orm/src/main/java/org/grails/orm/hibernate/support/hibernate7/HibernateTemplate.java: ########## @@ -0,0 +1,1159 @@ +/* + * Copyright 2002-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.grails.orm.hibernate.support.hibernate7; + +import java.io.Serializable; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import jakarta.persistence.PersistenceException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Criteria; +import org.hibernate.Filter; +import org.hibernate.FlushMode; +import org.hibernate.Hibernate; +import org.hibernate.HibernateException; +import org.hibernate.LockMode; +import org.hibernate.LockOptions; +import org.hibernate.ReplicationMode; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.DetachedCriteria; +import org.hibernate.criterion.Example; +import org.hibernate.query.Query; + +import org.springframework.beans.factory.InitializingBean; +import org.springframework.dao.DataAccessException; +import org.springframework.dao.InvalidDataAccessApiUsageException; +import org.springframework.lang.Nullable; +import org.springframework.transaction.support.ResourceHolderSupport; +import org.springframework.transaction.support.TransactionSynchronizationManager; +import org.springframework.util.Assert; + +import org.grails.orm.hibernate.support.hibernate7.support.OpenSessionInViewInterceptor; Review Comment: Already fixed - the IDE auto-import was reverted by @jdaugherty in a follow-up commit on this branch; the diff no longer includes the unused javadoc import. Marking resolved. ########## grails-data-hibernate7/spring-orm/src/main/java/org/grails/orm/hibernate/support/hibernate7/support/OpenSessionInViewInterceptor.java: ########## @@ -0,0 +1,211 @@ +/* + * Copyright 2002-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.grails.orm.hibernate.support.hibernate7.support; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.FlushMode; +import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.hibernate.SessionFactory; + +import org.springframework.dao.DataAccessException; +import org.springframework.dao.DataAccessResourceFailureException; +import org.springframework.lang.Nullable; +import org.springframework.transaction.support.TransactionSynchronizationManager; +import org.springframework.ui.ModelMap; +import org.springframework.util.Assert; +import org.springframework.web.context.request.AsyncWebRequestInterceptor; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.context.request.async.CallableProcessingInterceptor; +import org.springframework.web.context.request.async.WebAsyncManager; +import org.springframework.web.context.request.async.WebAsyncUtils; + +import org.grails.orm.hibernate.support.hibernate7.HibernateTransactionManager; Review Comment: Already fixed - same situation as the HibernateTemplate one, the IDE auto-imported `HibernateTransactionManager` was reverted; the import is no longer in the diff. Marking resolved. ########## grails-data-docs/guide-developer/src/main/docs/stepByStep.adoc: ########## @@ -151,7 +151,7 @@ package org.grails.datastore.gorm import org.junit.runners.Suite.SuiteClasses import org.junit.runners.Suite import org.junit.runner.RunWith -import grails.gorm.tests.* +import grails.gorm.specs.* Review Comment: Reverted in 6fdd688ec3 - line 154 is back to `import grails.gorm.tests.*` matching the original on 8.0.x. Marking resolved. ########## grails-data-docs/guide-developer/src/main/docs/stepByStep.adoc: ########## @@ -151,7 +151,7 @@ package org.grails.datastore.gorm import org.junit.runners.Suite.SuiteClasses import org.junit.runners.Suite import org.junit.runner.RunWith -import grails.gorm.tests.* +import grails.gorm.specs.* Review Comment: Reverted in 6fdd688ec3 - the unrelated package-rename change at line 154 is back to `grails.gorm.tests.*`. Marking resolved. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
