#146 - Hibernate 4.3.5, project buildable, not deployable (missing sp…

…ring dependencies)
INCF · Feb 8, 2016 · 0c36113 · 0c36113
1 parent 340e847
commit 0c36113
Show file tree

Hide file tree

Showing 20 changed files with 75 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -443,7 +443,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.3.5.Final</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>xml-apis</artifactId>
@@ -455,7 +455,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-tools</artifactId>
-			<version>3.2.4.GA</version>
+			<version>4.3.2.Final</version>
 		</dependency>
 
 		<dependency>

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/ScenarioSchemasDao.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/ScenarioSchemasDao.java
@@ -28,6 +28,8 @@
 package cz.zcu.kiv.eegdatabase.data.dao;
 
 import cz.zcu.kiv.eegdatabase.data.pojo.ScenarioSchemas;
+
+import java.sql.Clob;
 import java.util.List;
 
 /**
@@ -41,4 +43,6 @@ public interface ScenarioSchemasDao extends GenericDao<ScenarioSchemas, Integer>
   public int getNextSchemaId();
 
   List<ScenarioSchemas> getListOfScenarioSchemas();
+
+    Clob createClob(String content);
 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/ServiceResultDao.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/ServiceResultDao.java
@@ -24,6 +24,7 @@
 
 import cz.zcu.kiv.eegdatabase.data.pojo.ServiceResult;
 
+import java.sql.Blob;
 import java.util.List;
 
 /**
@@ -36,4 +37,6 @@
 public interface ServiceResultDao extends GenericDao<ServiceResult, Integer> {
 
     public List<ServiceResult> getResultByPerson(int personId);
+
+    Blob createBlob(byte[] content);
 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/SimpleScenarioSchemasDao.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/SimpleScenarioSchemasDao.java
@@ -28,7 +28,9 @@
 package cz.zcu.kiv.eegdatabase.data.dao;
 
 import cz.zcu.kiv.eegdatabase.data.pojo.ScenarioSchemas;
+import org.hibernate.Hibernate;
 
+import java.sql.Clob;
 import java.util.List;
 
 /**
@@ -76,4 +78,9 @@ public List<ScenarioSchemas> getListOfScenarioSchemas() {
         return list;
     }
 
+    @Override
+    public Clob createClob(String content) {
+        return Hibernate.getLobCreator(this.getSessionFactory().getCurrentSession()).createClob(content);
+    }
+
 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/SimpleServiceResultDao.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/SimpleServiceResultDao.java
@@ -23,7 +23,9 @@
 package cz.zcu.kiv.eegdatabase.data.dao;
 
 import cz.zcu.kiv.eegdatabase.data.pojo.ServiceResult;
+import org.hibernate.Hibernate;
 
+import java.sql.Blob;
 import java.util.List;
 import java.util.Map;
 
@@ -44,4 +46,9 @@ public List<ServiceResult> getResultByPerson(int personId) {
         String hqlQuery = "from ServiceResult s where s.owner.personId = :personId";
         return getHibernateTemplate().findByNamedParam(hqlQuery, "personId", personId);
     }
+
+    @Override
+    public Blob createBlob(byte[] content) {
+        return Hibernate.getLobCreator(this.getSessionFactory().getCurrentSession()).createBlob(content);
+    }
 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/persistent/PostLoadListener.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/persistent/PostLoadListener.java
@@ -6,8 +6,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.hibernate.LazyInitializationException;
-import org.hibernate.event.PostLoadEvent;
-import org.hibernate.event.PostLoadEventListener;
+import org.hibernate.event.spi.PostLoadEvent;
+import org.hibernate.event.spi.PostLoadEventListener;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.SearchQuery;

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Scenario.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Scenario.java
@@ -248,7 +248,7 @@ public void setExperiments(Set<Experiment> experiments) {
 		this.experiments = experiments;
 	}
 
-	@XmlJavaTypeAdapter(BlobSerializer.class)
+	//@XmlJavaTypeAdapter(BlobSerializer.class)
 	@Basic(fetch=FetchType.LAZY)
 	@Lob
 	@Column(name = "SCENARIO_FILE", nullable = true)

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/webservices/client/ClientServiceImpl.java b/src/main/java/cz/zcu/kiv/eegdatabase/webservices/client/ClientServiceImpl.java
@@ -253,8 +253,9 @@ public int addDataFile(DataFileInfo info, DataHandler inputData) throws ClientSe
 
 		try {
 			if (inputData != null) {
-
-				file.setFileContent(Hibernate.createBlob(inputData.getInputStream()));
+
+                file.setFileContent(Hibernate.getLobCreator(personDao.getSessionFactory().getCurrentSession()).
+                        createBlob(inputData.getInputStream(), info.getFileLength()));
 			}
 		} catch (IOException ex) {
 			log.error(ex.getMessage(), ex);

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/webservices/datadownload/UserDataImpl.java b/src/main/java/cz/zcu/kiv/eegdatabase/webservices/datadownload/UserDataImpl.java
@@ -43,6 +43,7 @@
 import java.util.*;
 
 import org.hibernate.Hibernate;
+import org.hibernate.Session;
 
 /**
  * Web service providing user's data remotely.
@@ -351,10 +352,12 @@ public int addOrUpdateDataFile(DataFileInfo dataFile, DataHandler inputData) thr
         file.setDescription(dataFile.getDescription());
         file.setFilename(dataFile.getFileName());
         file.setMimetype(dataFile.getMimeType());
+        Session session = experimentDao.getSessionFactory().getCurrentSession();
 
         try {
             if (inputData != null) {
-                file.setFileContent(Hibernate.createBlob(inputData.getInputStream()));
+               // file.setFileContent(Hibernate.createBlob(inputData.getInputStream()));
+                file.setFileContent(Hibernate.getLobCreator(session).createBlob(inputData.getInputStream(), dataFile.getFileLength()));
             }
         } catch (IOException e) {
             log.error(e.getMessage(), e);

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/webservices/rest/common/utils/BlobSerializer.java b/src/main/java/cz/zcu/kiv/eegdatabase/webservices/rest/common/utils/BlobSerializer.java
@@ -5,6 +5,7 @@
 import java.sql.Blob;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import org.hibernate.Hibernate;
+import org.hibernate.Session;
 
 public class BlobSerializer extends XmlAdapter<String, Blob> {
 
@@ -13,7 +14,7 @@ public Blob unmarshal(String v) throws Exception {
 		if (v == null) {
 			v = "";
 		}
-		return Hibernate.createBlob(v.getBytes());
+		return Hibernate.getLobCreator((Session) null).createBlob(v.getBytes());
 	}
 
 	@Override

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/webservices/rest/datafile/DataFileServiceImpl.java b/src/main/java/cz/zcu/kiv/eegdatabase/webservices/rest/datafile/DataFileServiceImpl.java
@@ -82,7 +82,7 @@ public int create(int experimentId, String description, MultipartFile file) thro
         datafile.setExperiment(experimentDao.getExperimentForDetail(experimentId));
         datafile.setDescription(description);
         datafile.setFilename(file.getOriginalFilename().replace(" ", "_"));
-        datafile.setFileContent(Hibernate.createBlob(file.getBytes()));
+        datafile.setFileContent(Hibernate.getLobCreator(experimentDao.getSessionFactory().getCurrentSession()).createBlob(file.getBytes()));
         datafile.setMimetype(file.getContentType() != null ? file.getContentType().toLowerCase() : "application/octet-stream");
 
         //DB column size restriction

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/scenarios/ScenariosFacade.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/scenarios/ScenariosFacade.java
@@ -27,6 +27,7 @@
  */
 package cz.zcu.kiv.eegdatabase.wui.core.scenarios;
 
+import java.sql.Clob;
 import java.util.List;
 
 import cz.zcu.kiv.eegdatabase.data.pojo.Person;
@@ -79,4 +80,6 @@ public interface ScenariosFacade extends GenericFacade<Scenario, Integer> {
     void flush();
 
     Scenario getScenarioByTitle(String input);
+
+    Clob createClob(String content);
 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/scenarios/ScenariosFacadeImpl.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/scenarios/ScenariosFacadeImpl.java
@@ -27,6 +27,7 @@
  */
 package cz.zcu.kiv.eegdatabase.wui.core.scenarios;
 
+import java.sql.Clob;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -140,6 +141,11 @@ public Scenario getScenarioByTitle(String title) {
         return service.getScenarioByTitle(title);
     }
 
+    @Override
+    public Clob createClob(String content) {
+        return service.createClob(content);
+    }
+
     // @Override
     // public Integer create(ScenarioSchemas newInstance) {
     // return service.create(newInstance);

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/scenarios/ScenariosService.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/scenarios/ScenariosService.java
@@ -27,6 +27,7 @@
  */
 package cz.zcu.kiv.eegdatabase.wui.core.scenarios;
 
+import java.sql.Clob;
 import java.util.List;
 
 import cz.zcu.kiv.eegdatabase.data.pojo.Person;
@@ -79,4 +80,6 @@ public interface ScenariosService extends GenericService<Scenario, Integer> {
     List<ScenarioSchemas> getListOfScenarioSchemas();
 
     FileDTO getScenarioFile(int scenarioId);
+
+    Clob createClob(String content);
 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/scenarios/ScenariosServiceImpl.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/scenarios/ScenariosServiceImpl.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.Blob;
+import java.sql.Clob;
 import java.sql.SQLException;
 import java.util.List;
 
@@ -310,4 +311,9 @@ public FileDTO getScenarioFile(int scenarioId) {
         }
 
     }
+
+    @Override
+    public Clob createClob(String content) {
+        return schemaDAO.createClob(content);
+    }
 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/signalProcessing/SignalProcessingService.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/core/signalProcessing/SignalProcessingService.java
@@ -35,6 +35,7 @@
 import cz.zcu.kiv.eegdatabase.wui.core.file.FileDTO;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Blob;
 import java.sql.SQLException;
 import java.util.List;
 
@@ -65,4 +66,6 @@ public interface SignalProcessingService extends GenericService<ServiceResult, I
 
     @Transactional(readOnly = true)
     FileDTO getResultFile(int resultId);
+
+    public Blob createBlob(byte[] content);
 }
diff --git a/...in/java/cz/zcu/kiv/eegdatabase/wui/core/signalProcessing/SignalProcessingServiceImpl.java b/...in/java/cz/zcu/kiv/eegdatabase/wui/core/signalProcessing/SignalProcessingServiceImpl.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.sql.Blob;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -242,6 +243,11 @@ public FileDTO getResultFile(int resultId) {
 
     }
 
+    @Override
+    public Blob createBlob(byte[] content) {
+        return resultDao.createBlob(content);
+    }
+
     public ProcessService getEegService() {
         return eegService;
     }

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/scenarios/form/ScenarioSchemaFormPage.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/scenarios/form/ScenarioSchemaFormPage.java
@@ -159,9 +159,9 @@ public void onSubmit() {
                             String pojo = schemaGenerator.generatePojo();
                             String bean = schemaGenerator.generateBean();
 
-                            scenarioSchema.setSql(Hibernate.createClob(sql));
-                            scenarioSchema.setHbmXml(Hibernate.createClob(hbmXml));
-                            scenarioSchema.setPojo(Hibernate.createClob(pojo));
+                            scenarioSchema.setSql(scenarioFacade.createClob(sql));
+                            scenarioSchema.setHbmXml(scenarioFacade.createClob(hbmXml));
+                            scenarioSchema.setPojo(scenarioFacade.createClob(pojo));
                             scenarioSchema.setBean(bean);
                             scenarioSchema.setApproved('n');
                         }

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/signalProcessing/ServiceResultManager.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/signalProcessing/ServiceResultManager.java
@@ -62,7 +62,7 @@ public void run() {
         System.out.println("start");
 
         String output = new String(service.processService(files, format, methodName, parameters));
-        result.setContent(Hibernate.createBlob(output.getBytes()));
+        result.setContent(service.createBlob(output.getBytes()));
         result.setStatus("finished");
         result.setFilename(methodName + "_result.xml");
         service.update(result);

diff --git a/src/main/webapp/WEB-INF/persistence.xml b/src/main/webapp/WEB-INF/persistence.xml
@@ -108,26 +108,26 @@
 
 	<bean id="elasticSynchronizationInterceptor" class="cz.zcu.kiv.eegdatabase.data.nosql.ElasticSynchronizationInterceptor"/>
 
-	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
+	<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
 		<property name="dataSource" ref="dataSource"/>
 
 		<property name="entityInterceptor">
 			<ref bean="elasticSynchronizationInterceptor"/>
 		</property>
 
-        <property name="eventListeners">
-            <map>
-                <entry key="post-load"><ref local="postLoadListener" /></entry>
-            </map>
-        </property>
+        <!--<property name="eventListeners">-->
+            <!--<map>-->
+                <!--<entry key="post-load"><ref local="postLoadListener" /></entry>-->
+            <!--</map>-->
+        <!--</property>-->
 
 		<property name="hibernateProperties">
 			<props>
 				<prop key="hibernate.dialect">${db.dialect}</prop>
 				<prop key="autocommmit">true</prop>
 				<prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
-				<prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
-				<prop key="hibernate.cache.provider_class">${hibernate.cache.provider_class}</prop>
+				<!--<prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>-->
+				<!--<prop key="hibernate.cache.provider_class">${hibernate.cache.provider_class}</prop>-->
 			</props>
 		</property>
 		<property name="packagesToScan" value="cz.zcu.kiv.eegdatabase.data.pojo"/>