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

resolved conflict

This commit is contained in:
Sandro La Bruzzo 2021-10-26 09:45:46 +02:00
parent 034304b33a
commit aafdffa6b3
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java
View File

@ -1,12 +1,12 @@
package eu.dnetlib.dhp.utils; package eu.dnetlib.dhp.utils;
import com.fasterxml.jackson.databind.ObjectMapper; import java.io.*;
import com.google.common.collect.Maps; import java.nio.charset.StandardCharsets;
import com.jayway.jsonpath.JsonPath; import java.security.MessageDigest;
import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo; import java.util.*;
import eu.dnetlib.dhp.schema.oaf.utils.CleaningFunctions; import java.util.stream.Collectors;
import net.minidev.json.JSONArray;
import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.binary.Hex;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -21,15 +21,17 @@ import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.SaveMode; import org.apache.spark.sql.SaveMode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Maps;
import com.jayway.jsonpath.JsonPath;
import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo;
import eu.dnetlib.dhp.schema.oaf.utils.CleaningFunctions;
import net.minidev.json.JSONArray;
import scala.collection.JavaConverters; import scala.collection.JavaConverters;
import scala.collection.Seq; import scala.collection.Seq;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.*;
import java.util.stream.Collectors;
public class DHPUtils { public class DHPUtils {
private static final Logger log = LoggerFactory.getLogger(DHPUtils.class); private static final Logger log = LoggerFactory.getLogger(DHPUtils.class);