sabeel
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Pull Requests Activity

reorganized package and fixed test

This commit is contained in:
Sandro La Bruzzo 2020-04-20 10:02:42 +02:00
parent 618bc1fc72
commit 4d0d9de07e
7 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dhp-workflows/dhp-doiboost/pom.xml
View File

@ -10,6 +10,37 @@
<artifactId>dhp-doiboost</artifactId> <artifactId>dhp-doiboost</artifactId>
<build>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.0.1</version>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>initialize</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
</configuration>
</plugin>
</plugins>
</build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

3
dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/orciddsmanager/OrcidDSManager.java → dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcid/OrcidDSManager.java
View File

@ -1,4 +1,4 @@
package eu.dnetlib.orciddsmanager; package eu.dnetlib.doiboost.orcid;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
@ -6,7 +6,6 @@ import java.net.URI;
import java.util.Properties; import java.util.Properties;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

9
dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/orciddsmanager/SummariesDecompressor.java → dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcid/SummariesDecompressor.java
View File

@ -1,5 +1,8 @@
package eu.dnetlib.orciddsmanager; package eu.dnetlib.doiboost.orcid;
import eu.dnetlib.doiboost.orcid.json.JsonWriter;
import eu.dnetlib.doiboost.orcid.model.AuthorData;
import eu.dnetlib.doiboost.orcid.xml.XMLRecordParser;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
@ -13,10 +16,6 @@ import org.apache.hadoop.io.compress.CompressionCodecFactory;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import eu.dnetlib.orciddsmanager.json.JsonWriter;
import eu.dnetlib.orciddsmanager.model.AuthorData;
import eu.dnetlib.orciddsmanager.xml.XMLRecordParser;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;

4
dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/orciddsmanager/json/JsonWriter.java → dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcid/json/JsonWriter.java
View File

@ -1,8 +1,8 @@
package eu.dnetlib.orciddsmanager.json; package eu.dnetlib.doiboost.orcid.json;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import eu.dnetlib.orciddsmanager.model.AuthorData; import eu.dnetlib.doiboost.orcid.model.AuthorData;
public class JsonWriter { public class JsonWriter {

2
dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/orciddsmanager/model/AuthorData.java → dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcid/model/AuthorData.java
View File

@ -1,4 +1,4 @@
package eu.dnetlib.orciddsmanager.model; package eu.dnetlib.doiboost.orcid.model;
public class AuthorData { public class AuthorData {

5
dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/orciddsmanager/xml/XMLRecordParser.java → dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcid/xml/XMLRecordParser.java
View File

@ -1,4 +1,4 @@
package eu.dnetlib.orciddsmanager.xml; package eu.dnetlib.doiboost.orcid.xml;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
@ -13,12 +13,11 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactory;
import eu.dnetlib.doiboost.orcid.model.AuthorData;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import eu.dnetlib.orciddsmanager.model.AuthorData;
public class XMLRecordParser { public class XMLRecordParser {

2
dhp-workflows/dhp-doiboost/src/test/java/eu/dnetlib/doiboost/DoiBoostTest.java
View File

@ -21,7 +21,7 @@ public class DoiBoostTest {
Logger logger = LoggerFactory.getLogger(DoiBoostTest.class); Logger logger = LoggerFactory.getLogger(DoiBoostTest.class);
@Test
public void test() throws Exception { public void test() throws Exception {
//SparkDownloadContentFromCrossref.main(null); //SparkDownloadContentFromCrossref.main(null);