diff options
| author |   Sunder Tattavarada <statta@att.com> | 2020-09-29 14:37:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-29 14:37:33 +0000 |
| commit | 622186289b45d3408c4308de8beb49fefac523bf (patch) | |
| tree | 883c0fb3b6a006ff124df39aea1b96178dec875e /ecomp-sdk/epsdk-core/src | |
| parent | 9cfd36b143be8a71d947981a6b4ad9ab2ef892c3 (diff) | |
| parent | c34637e2cbcdc1a69c35a42063e5f51f99fbc793 (diff) | |
Merge "spring-framework jar version upgrade"
Diffstat (limited to 'ecomp-sdk/epsdk-core/src')
2 files changed, 7 insertions, 7 deletions
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java index da3dc60a..fe4bcae7 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java @@ -52,8 +52,8 @@ import org.onap.portalsdk.core.util.SystemProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.orm.hibernate4.HibernateTransactionManager; -import org.springframework.orm.hibernate4.LocalSessionFactoryBean; +import org.springframework.orm.hibernate5.HibernateTransactionManager; +import org.springframework.orm.hibernate5.LocalSessionFactoryBean; import org.springframework.transaction.annotation.EnableTransactionManagement; import com.mchange.v2.c3p0.ComboPooledDataSource; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java index 9a0003d4..36f766c8 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java @@ -43,8 +43,8 @@ import java.util.List; import java.util.Map; import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SQLQuery; +import org.hibernate.query.Query; +import org.hibernate.query.NativeQuery; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.criterion.Criterion; @@ -218,7 +218,7 @@ public class DataAccessServiceImplTest { @Test public void getLookupListTest() { Session mockedSession = Mockito.mock(Session.class); - SQLQuery mockSQLQuery = Mockito.mock(SQLQuery.class); + NativeQuery mockSQLQuery = Mockito.mock(NativeQuery.class); Mockito.when(sessionFactory.getCurrentSession()).thenReturn(mockedSession); Mockito.when(mockedSession.createSQLQuery(Mockito.anyString())).thenReturn(mockSQLQuery); Mockito.when(mockSQLQuery.list()).thenReturn(new ArrayList()); @@ -229,7 +229,7 @@ public class DataAccessServiceImplTest { @Test public void executeSQLQueryWithoutRangeTest() { Session mockedSession = Mockito.mock(Session.class); - SQLQuery mockSQLQuery = Mockito.mock(SQLQuery.class); + NativeQuery mockSQLQuery = Mockito.mock(NativeQuery.class); Mockito.when(sessionFactory.getCurrentSession()).thenReturn(mockedSession); Mockito.when(mockedSession.createSQLQuery(Mockito.anyString())).thenReturn(mockSQLQuery); Mockito.when(mockSQLQuery.addEntity("org.onap.portalsdk.core.domain.support.domainvo", DomainVo.class)) @@ -241,7 +241,7 @@ public class DataAccessServiceImplTest { @Test public void executeSQLQueryTest() { Session mockedSession = Mockito.mock(Session.class); - SQLQuery mockSQLQuery = Mockito.mock(SQLQuery.class); + NativeQuery mockSQLQuery = Mockito.mock(NativeQuery.class); Mockito.when(sessionFactory.getCurrentSession()).thenReturn(mockedSession); Mockito.when(mockedSession.createSQLQuery(Mockito.anyString())).thenReturn(mockSQLQuery); Mockito.when(mockSQLQuery.addEntity("org.onap.portalsdk.core.domain.support.domainvo", DomainVo.class)) |