Merge branch 'master' into Production

INCF · Sep 22, 2016 · 96f6393 · 96f6393
2 parents 0d0120f + b98a45d
commit 96f6393
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,7 @@
 		<dependency>
 			<groupId>cz.zcu.kiv</groupId>
 			<artifactId>semantic-framework</artifactId>
-			<version>3.3.5.4</version>
+			<version>3.3.5.5</version>
 		</dependency>
         <dependency>
             <groupId>cz.zcu.kiv</groupId>

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/SimpleExperimentDao.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/dao/SimpleExperimentDao.java
@@ -359,7 +359,7 @@ public List<Experiment> getAllRecordsFull() {
 	private List<Experiment> transformEsResultToHibernate(List<ExperimentElastic> experiments) {
 		List<Integer> ids = new ArrayList<Integer>();
 		for (ExperimentElastic e : experiments) {
-			ids.add(Integer.parseInt(e.getExperimentId()));
+			ids.add(e.getExperimentId());
 		}
 		return this.getExperimentsById(ids);
 	}
@@ -459,7 +459,7 @@ public void update(Experiment transientObject) {
         ExperimentElastic elasticExperiment = transientObject.getElasticExperiment();
 
         IndexQuery indexQuery = new IndexQuery();
-        elasticExperiment.setExperimentId("" + transientObject.getExperimentId());
+        elasticExperiment.setExperimentId(transientObject.getExperimentId());
         elasticExperiment.setUserId(transientObject.getPersonByOwnerId().getPersonId());
         elasticExperiment.setGroupId(transientObject.getResearchGroup().getResearchGroupId());
         indexQuery.setObject(elasticExperiment);

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/nosql/ElasticSynchronizationInterceptor.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/nosql/ElasticSynchronizationInterceptor.java
@@ -64,7 +64,7 @@ public boolean onFlushDirty(Object entity, Serializable id, Object[] currentStat
         boolean res = super.onFlushDirty(entity, id, currentState, previousState, propertyNames, types);
         if (entity instanceof Experiment) {
             Experiment e = (Experiment) entity;
-            e.getElasticExperiment().setExperimentId("" + id);
+            e.getElasticExperiment().setExperimentId(Integer.parseInt("" + id));
             IndexQuery indexQuery = new IndexQuery();
             indexQuery.setObject(e.getElasticExperiment());
             indexQuery.setId("" + id);
@@ -80,7 +80,7 @@ public boolean onSave(Object entity, Serializable id, Object[] state, String[] p
         boolean res = super.onSave(entity, id, state, propertyNames, types);
         if (entity instanceof Experiment) {
             Experiment e = (Experiment) entity;
-            e.getElasticExperiment().setExperimentId("" + id);
+            e.getElasticExperiment().setExperimentId(Integer.parseInt("" + id));
             IndexQuery indexQuery = new IndexQuery();
             indexQuery.setObject(e.getElasticExperiment());
             indexQuery.setId("" + id);

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/nosql/entities/ExperimentElastic.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/nosql/entities/ExperimentElastic.java
@@ -46,7 +46,7 @@
 public class ExperimentElastic implements Serializable {
 
 	@Id
-	private String experimentId;
+	private int experimentId;
 	@Field(type = FieldType.Integer)
 	private int userId;
 	@Field(type = FieldType.Integer)
@@ -75,11 +75,11 @@ public void setGroupId(int groupId) {
 	}
 
 
-	public String getExperimentId() {
+	public int getExperimentId() {
 		return this.experimentId;
 	}
 
-	public void setExperimentId(String experimentId) {
+	public void setExperimentId(int experimentId) {
 		this.experimentId = experimentId;
 	}
 

diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/logic/semantic/SimpleSemanticFactory.java b/src/main/java/cz/zcu/kiv/eegdatabase/logic/semantic/SimpleSemanticFactory.java
@@ -250,7 +250,7 @@ private JenaBeanExtension creatingJenaBean() {
                     "configuration document: " + ontologyHeader.getFilename(), e);
         }
         jbe.loadOOM(dataList);
-        jbe.declareAllClassesDisjoint();
+     //   jbe.declareAllClassesDisjoint();
         return jbe;
     }
 

diff --git a/src/main/webapp/WEB-INF/project.properties b/src/main/webapp/WEB-INF/project.properties
@@ -78,4 +78,4 @@ solr.indexingPeriod=0 30 0/2 * * ?
 # interval between transformation tasks (in miliseconds): 1 day
 semantic.transformation.regularInterval=86400000
 # delay of the first transformation (in miliseconds): 5 minutes
-semantic.transformation.delayFirstTransform=30
+semantic.transformation.delayFirstTransform=300000