Chan public Connector connector = new Connector();

ges

.classpath

@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-8-oracle">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

src/main/java/org/develop/officialjournal/controllers/JudgeController.java

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import dao.connection.LuceneConnector;
 import dao.entity.Judge;
 import dao.lucene.tables.DAOJudge;
 
@@ -26,15 +27,15 @@ public class JudgeController {
 	@RequestMapping("/judge/{id}")
 	public Judge getById(@PathVariable Integer id ) {
 
-		Judge judge = this.daoJudge.get(id);
+		Judge judge = this.daoJudge.get(id, LuceneConnector.getSearcherDisk());
 		return judge;
 
 	}
 	
 	@RequestMapping("/judge/{id}/info")
-	public Judge getInfoById(@PathVariable Integer id ) {
+	public Judge getInfoById(@PathVariable Long id ) {
 
-		Judge judge = this.daoJudge.get(id);
+		Judge judge = this.daoJudge.get(id, LuceneConnector.getSearcherDisk());
 		return judge;
 
 	}
@@ -44,6 +45,6 @@ public class JudgeController {
 	public Judge getByName(@RequestParam (required = true) String name ) {
 
 		Judge judge = new Judge(name);
-		return daoJudge.get(judge);
+		return daoJudge.get(judge, LuceneConnector.getSearcherDisk());
 	}
 }

src/main/java/org/develop/officialjournal/controllers/LawyerController.java

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import dao.connection.LuceneConnector;
 import dao.entity.Lawyer;
 import dao.lucene.tables.DAOLawyer;
 
@@ -26,7 +27,7 @@ public class LawyerController {
 	@RequestMapping("/lawyer/{id}")
 	public Lawyer getById(@PathVariable Integer id ) {
 
-		Lawyer lawyer = this.daoLawyer.get(id);
+		Lawyer lawyer = this.daoLawyer.get(id, LuceneConnector.getSearcherDisk());
 		return lawyer;
 
 	}
@@ -35,6 +36,6 @@ public class LawyerController {
 	public Lawyer getByName(@RequestParam (required = true) String name ) {
 
 		Lawyer lawyer = new Lawyer(name);
-		return daoLawyer.get(lawyer);
+		return daoLawyer.get(lawyer, LuceneConnector.getSearcherDisk());
 	}
 }

src/main/java/org/develop/officialjournal/controllers/ProcessController.java

@@ -9,9 +9,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-
+import dao.connection.LuceneConnector;
 import dao.entity.DOProcess;
 import dao.entity.Entity;
+import dao.lucene.search.DAOSearch;
 import dao.lucene.tables.DAOProcess;
 
 @RestController
@@ -32,9 +33,9 @@ public class ProcessController {
 	/**returns lawyer by id*/
 
 	@RequestMapping("/process/{id}")
-	public DOProcess getById(@PathVariable Integer id ) {
+	public DOProcess getById(@PathVariable Long id ) {
 
-		DOProcess process = this.daoProcess.get(id);
+		DOProcess process = this.daoProcess.get(id, LuceneConnector.getSearcherDisk());
 		return process;
 
 	}
@@ -46,7 +47,7 @@ public class ProcessController {
 			daoProcess = Database.get().getDaoProcess();
 		
 		System.out.println("DAOPROCESS " +daoProcess);
-		DOProcess process = this.daoProcess.getAllInfo(id);
+		DOProcess process = this.daoProcess.getAllInfo(id, LuceneConnector.getSearcherDisk());
 		
 		return process;
 
@@ -60,7 +61,7 @@ public class ProcessController {
 		Entity entity = new Entity();
 		entity.setId(entityId);
 		entity.setType(type);
-		return daoSearch.search(entity, false, processId);
+		return daoSearch.search(entity);
 
 	}
 
@@ -70,7 +71,7 @@ public class ProcessController {
 											  	@RequestParam (required = false, defaultValue= "0") Integer processId   ) 
 	{
 		
-		List<DOProcess> searchResults =  daoSearch.search(processNumber, true, processId);
+		List<DOProcess> searchResults =  daoSearch.search(processNumber);
 
 		searchResults.sort(new Comparator<DOProcess>() {
 

src/main/java/org/develop/officialjournal/controllers/SearchController.java

@@ -7,11 +7,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-
+import dao.connection.LuceneConnector;
 import dao.entity.Entity;
 import dao.entity.Info;
 import dao.entity.Judge;
 import dao.entity.Lawyer;
+import dao.lucene.search.DAOSearch;
 import dao.lucene.tables.DAOEntity;
 import dao.lucene.tables.DAOJudge;
 import dao.lucene.tables.DAOLawyer;
@@ -54,20 +55,20 @@ public class SearchController {
 		Entity entity = new Entity();
 		entity.setName(text);
 
-		if(daoLawyer.contains(lawyer))
+		if(daoLawyer.contains(lawyer, LuceneConnector.getSearcherDisk()))
 		{
-			lawyer = daoLawyer.get(lawyer);
+			lawyer = daoLawyer.get(lawyer, LuceneConnector.getSearcherDisk());
 			return lawyer;
 		}
 		
-		if(daoJudge.contains(judge))
+		if(daoJudge.contains(judge, LuceneConnector.getSearcherDisk()))
 		{
-			judge = daoJudge.get(judge);
+			judge = daoJudge.get(judge, LuceneConnector.getSearcherDisk());
 			return judge;
 		}
-		if(daoEntity.contains(entity))
+		if(daoEntity.contains(entity, LuceneConnector.getSearcherDisk()))
 		{
-			entity = daoEntity.get(entity);
+			entity = daoEntity.get(entity, LuceneConnector.getSearcherDisk());
 			return entity;
 		}
 		return new Entity();

src/main/java/org/develop/officialjournal/services/Database.java

@@ -3,6 +3,7 @@ package org.develop.officialjournal.services;
 import java.sql.Connection;
 
 import dao.connection.Connector;
+import dao.lucene.search.DAOSearch;
 import dao.lucene.tables.DAOEntity;
 import dao.lucene.tables.DAOJudge;
 import dao.lucene.tables.DAOLawyer;