Reworked exception handling for recreateIndex()

komoot · Dec 19, 2014 · 1a50011 · 1a50011
1 parent 8b67963
commit 1a50011
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/src/main/java/de/komoot/photon/importer/App.java b/src/main/java/de/komoot/photon/importer/App.java
@@ -15,6 +15,7 @@
 import spark.Route;
 
 import java.io.FileNotFoundException;
+import java.io.IOException;
 
 import static spark.Spark.*;
 
@@ -57,14 +58,26 @@ public static void main(String[] rawArgs) {
 
 		Client esNodeClient = esServer.getClient();
 
-		if(args.isDeleteIndex()) {
-			esServer.recreateIndex();
+		if(args.isDeleteIndex()) {                        
+                        try {
+                                esServer.recreateIndex();
+                        } catch (IOException e) {
+                                log.error("cannot setup index, elastic search config files not readable", e);
+                                return;
+                        }
+
 			log.info("deleted photon index and created an empty new one.");
 			return;
 		}
 
 		if(args.isNominatimImport()) {
-			esServer.recreateIndex(); // dump previous data
+			try {
+                                esServer.recreateIndex(); // dump previous data
+                        } catch (IOException e) {
+                                log.error("cannot setup index, elastic search config files not readable", e);
+                                return;
+                        }
+
                         log.info("starting import from nominatim to photon with languages: " + args.getLanguages());
 			Importer importer = new Importer(esNodeClient, args.getLanguages());
 			NominatimConnector nominatimConnector = new NominatimConnector(args.getHost(), args.getPort(), args.getDatabase(), args.getUser(), args.getPassword());

diff --git a/src/main/java/de/komoot/photon/importer/elasticsearch/Server.java b/src/main/java/de/komoot/photon/importer/elasticsearch/Server.java
@@ -137,30 +137,20 @@ private File setupDirectories(URL directoryName) {
 		return mainDirectory;
 	}
 
-	public void recreateIndex() {
+	public void recreateIndex() throws IOException {
 		deleteIndex();
 
 		final Client client = this.getClient();
 		final InputStream mappings = Thread.currentThread().getContextClassLoader().getResourceAsStream("mappings.json");
 		final InputStream index_settings = Thread.currentThread().getContextClassLoader().getResourceAsStream("index_settings.json");
 
-                String mappingsString = "";
-		try {
-                        // get mappings as JSONObject
-                        mappingsString = IOUtils.toString(mappings);
-                } catch(IOException e) {
-			log.error("cannot setup index, elastic search config files not readable", e);
-		}
+                String mappingsString = IOUtils.toString(mappings);                
                 JSONObject mappingsJSON = new JSONObject(mappingsString);
 
                 // add all langs to the mapping
                 mappingsJSON = addLangsToMapping(mappingsJSON);
-                try {        
-			client.admin().indices().prepareCreate("photon").setSettings(IOUtils.toString(index_settings)).execute().actionGet();
-			client.admin().indices().preparePutMapping("photon").setType("place").setSource(mappingsJSON.toString()).execute().actionGet();
-		} catch(IOException e) {
-			log.error("cannot setup index, elastic search config files not readable", e);
-		}
+                client.admin().indices().prepareCreate("photon").setSettings(IOUtils.toString(index_settings)).execute().actionGet();
+                client.admin().indices().preparePutMapping("photon").setType("place").setSource(mappingsJSON.toString()).execute().actionGet();
 	}
 
 	public DeleteIndexResponse deleteIndex() {

diff --git a/src/test/java/de/komoot/photon/ESBaseTester.java b/src/test/java/de/komoot/photon/ESBaseTester.java
@@ -2,6 +2,7 @@
 
 import de.komoot.photon.importer.elasticsearch.Server;
 import java.io.File;
+import java.io.IOException;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -26,7 +27,7 @@ public static void tearDownClass() {
         shutdownES();
     }    
 
-    public void setUpES() {
+    public void setUpES() throws IOException {
         if (server != null)
             return;
 

diff --git a/src/test/java/de/komoot/photon/importer/elasticsearch/ImporterTest.java b/src/test/java/de/komoot/photon/importer/elasticsearch/ImporterTest.java
@@ -2,6 +2,7 @@
 
 import de.komoot.photon.ESBaseTester;
 import de.komoot.photon.importer.model.PhotonDoc;
+import java.io.IOException;
 import org.json.JSONObject;
 import org.junit.*;
 
@@ -17,7 +18,7 @@
 public class ImporterTest extends ESBaseTester {
 
 	@Before
-	public void setUp() {
+	public void setUp() throws IOException {
 		setUpES();
 		deleteAll();
 	}

diff --git a/src/test/java/de/komoot/photon/importer/elasticsearch/RemoveStreetDuplicatesTest.java b/src/test/java/de/komoot/photon/importer/elasticsearch/RemoveStreetDuplicatesTest.java
@@ -6,6 +6,7 @@
 import com.vividsolutions.jts.geom.PrecisionModel;
 import de.komoot.photon.ESBaseTester;
 import de.komoot.photon.importer.model.PhotonDoc;
+import java.io.IOException;
 import org.json.JSONObject;
 import org.junit.*;
 
@@ -20,7 +21,7 @@ public class RemoveStreetDuplicatesTest extends ESBaseTester {
 	GeometryFactory FACTORY = new GeometryFactory(new PrecisionModel(), 4326);
 
 	@Before
-	public void setUp() {
+	public void setUp() throws IOException {
 		setUpES();
 		deleteAll();
 		PhotonDoc street1 = this.createStreetDoc(1, "Walserstraße", "6993");