diff --git a/pom.xml b/pom.xml index 72b8965..bd25e14 100644 --- a/pom.xml +++ b/pom.xml @@ -1,63 +1,78 @@ 4.0.0 org.wikitolearn wiki-rating 0.0.1-SNAPSHOT jar wiki-rating SpringBoot microservice to serve rating functionalities org.springframework.boot spring-boot-starter-parent 1.5.2.RELEASE UTF-8 UTF-8 1.8 org.springframework.boot spring-boot-starter org.springframework.boot spring-boot-starter-test test org.springframework.boot spring-boot-starter-web org.wikidata.wdtk wdtk-wikibaseapi 0.7.0 org.json json + + org.apache.tinkerpop + gremlin-core + 3.2.4 + + + com.orientechnologies + orientdb-client + 2.2.17 + + + com.orientechnologies + orientdb-graphdb + 2.2.17 + org.springframework.boot spring-boot-maven-plugin diff --git a/src/main/java/org/wikitolearn/controllers/mediawikiClient/PageMediaWikiController.java b/src/main/java/org/wikitolearn/controllers/mediawikiClient/PageMediaWikiController.java index 614ed67..a13e905 100644 --- a/src/main/java/org/wikitolearn/controllers/mediawikiClient/PageMediaWikiController.java +++ b/src/main/java/org/wikitolearn/controllers/mediawikiClient/PageMediaWikiController.java @@ -1,81 +1,81 @@ /** * */ package org.wikitolearn.controllers.mediawikiClient; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.wikidata.wdtk.wikibaseapi.ApiConnection; import org.wikitolearn.models.Page; import org.wikitolearn.utils.MediaWikiApiUtils; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; /** * @author alessandro * */ @Service public class PageMediaWikiController { private static final Logger LOG = LoggerFactory.getLogger(PageMediaWikiController.class); @Autowired private MediaWikiApiUtils mediaWikiApiUtils; @Autowired private ObjectMapper mapper; public List getAllPages(){ - ApiConnection connection = mediaWikiApiUtils.getApiConnection("https://it.wikitolearn.org/api.php"); + ApiConnection connection = mediaWikiApiUtils.getApiConnection("https://de.wikitolearn.org/api.php"); Map parameters = mediaWikiApiUtils.getListAllPagesParamsMap("2800"); InputStream response; boolean morePages = true; JSONArray pagesJson = new JSONArray(); List toBeConcat = new ArrayList<>(); try { while(morePages){ response = mediaWikiApiUtils.sendRequest(connection, "GET", parameters); JSONObject responseJson = mediaWikiApiUtils.streamToJson(response); //JSONArray toBeConcatArray = responseJson.getJSONObject("query").getJSONArray("allpages"); toBeConcat.add(responseJson.getJSONObject("query").getJSONArray("allpages")); /*for(int i = 0; i < toBeConcatArray.length(); i++){ pagesJson.put(toBeConcatArray.get(i)); }*/ if(responseJson.has("continue")){ String continueFrom = responseJson.getJSONObject("continue").getString("apcontinue"); parameters.put("apfrom", continueFrom); }else{ morePages = false; pagesJson = concatArrays(toBeConcat); } } return mapper.readValue(pagesJson.toString(), new TypeReference>(){}); } catch (JSONException e){ LOG.error("An error occurred while a JSONObject or JSONArray", e.getMessage()); } catch(IOException e){ LOG.error("An error occurred while converting an InputStream to JSONObject", e.getMessage()); } return null; } private JSONArray concatArrays(List arrays) throws JSONException{ JSONArray result = new JSONArray(); for (JSONArray arr : arrays) { for (int i = 0; i < arr.length(); i++) { result.put(arr.get(i)); } } return result; } } diff --git a/src/main/java/org/wikitolearn/dao/PageDAO.java b/src/main/java/org/wikitolearn/dao/PageDAO.java new file mode 100644 index 0000000..b0639be --- /dev/null +++ b/src/main/java/org/wikitolearn/dao/PageDAO.java @@ -0,0 +1,12 @@ +/** + * + */ +package org.wikitolearn.dao; + +/** + * @author alessandro + * + */ +public class PageDAO { + +} diff --git a/src/main/java/org/wikitolearn/utils/DbConnection.java b/src/main/java/org/wikitolearn/utils/DbConnection.java new file mode 100644 index 0000000..b78d718 --- /dev/null +++ b/src/main/java/org/wikitolearn/utils/DbConnection.java @@ -0,0 +1,43 @@ +/** + * + */ +package org.wikitolearn.utils; + +import com.orientechnologies.orient.core.intent.OIntentMassiveInsert; +import com.tinkerpop.blueprints.impls.orient.OrientGraph; +import com.tinkerpop.blueprints.impls.orient.OrientGraphFactory; +import com.tinkerpop.blueprints.impls.orient.OrientGraphNoTx; + +/** + * @author alessandro + * + */ +public class DbConnection { + /** + * This method will return the OreintDB graph instance after connection. + * @return Transaction enabled OrientGraph object + */ + public OrientGraph getDbGraph() { + + OrientGraphFactory factory = new OrientGraphFactory("remote:localhost/wikirate", + "root", "wikitolearn"); + OrientGraph graph = factory.getTx(); + + return graph; + } + + /** + * This method will return the OreintDB graph instance after connection, + * for massive inserts to improve performance,no transaction method + * @return Transaction disabled OrientGraph object + */ + + public OrientGraphNoTx getDbGraphNT() { + + OrientGraphFactory factory = new OrientGraphFactory("remote:localhost/wikirate", "root", "wikitolearn"); + factory.declareIntent(new OIntentMassiveInsert()); + OrientGraphNoTx graph =factory.getNoTx(); + + return graph; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e69de29..0ef4f9b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -0,0 +1,4 @@ +#Database connection properties +DB_URL= +DB_USER= +DB_PWD= \ No newline at end of file