summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-core
diff options
context:
space:
mode:
authorSri Balaji Marripud <sri.balaji.marripud@att.com>2020-09-23 23:55:44 -0400
committerSri Balaji Marripud <sri.balaji.marripud@att.com>2020-09-29 10:03:42 -0400
commitc34637e2cbcdc1a69c35a42063e5f51f99fbc793 (patch)
tree470f573a32a4f81de58b4a6d0ff6e62b68bdd82f /ecomp-sdk/epsdk-core
parent7dda2debf352c4d89c468963c971dc0fd257eec8 (diff)
spring-framework jar version upgrade
Issue-ID: PORTAL-945 Change-Id: I5d805b77096fe0f79d4dd30e1ad080da8fe4bb7f Signed-off-by: Sri Balaji Marripud <sri.balaji.marripud@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-core')
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java4
-rw-r--r--ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java10
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))