D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 12 Projects 2 Releases 2 Wiki Activity

[stats wf] indicators across stats dbs & updates in the org ids #248

Closed
dimitris.pierrakos wants to merge 1742 commits from beta into beta2master_sept_2022
pull from: beta
merge into: D-Net:beta2master_sept_2022
Conversation 3 Commits 1742 Files Changed 1525 +13 -6
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1c73bcf90 - Show all commits

2
dnet-pace-core/pom.xml
View File

@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>${google.guava.version}</version> <version>15.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>

7
dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/BlacklistAwareClusteringCombiner.java
View File

@ -22,9 +22,12 @@ public class BlacklistAwareClusteringCombiner extends ClusteringCombiner {
private static final Log log = LogFactory.getLog(BlacklistAwareClusteringCombiner.class); private static final Log log = LogFactory.getLog(BlacklistAwareClusteringCombiner.class);
public static Collection<String> filterAndCombine(final MapDocument a, final Config conf, final Map<String, List<String>> blacklists) {
final Document filtered = new BlacklistAwareClusteringCombiner().filter(a, blacklists);
public static Collection<String> filterAndCombine(final MapDocument a, final Config conf) {
final Document filtered = new BlacklistAwareClusteringCombiner().filter(a, conf.blacklists());
return combine(filtered, conf); return combine(filtered, conf);
} }

3
dnet-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java
View File

@ -1,6 +1,7 @@
package eu.dnetlib.pace.config; package eu.dnetlib.pace.config;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -19,7 +20,7 @@ import eu.dnetlib.pace.model.FieldDef;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
public class DedupConfig implements Config { public class DedupConfig implements Config, Serializable {
private static final Log log = LogFactory.getLog(DedupConfig.class); private static final Log log = LogFactory.getLog(DedupConfig.class);

4
dnet-pace-core/src/main/java/eu/dnetlib/pace/model/Field.java
View File

@ -2,10 +2,12 @@ package eu.dnetlib.pace.model;
import eu.dnetlib.pace.config.Type; import eu.dnetlib.pace.config.Type;
import java.io.Serializable;
/** /**
* The Interface Field. * The Interface Field.
*/ */
public interface Field extends Iterable<Field> { public interface Field extends Iterable<Field>, Serializable {
/** /**
* Gets the name. * Gets the name.

3
dnet-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocument.java
View File

@ -1,5 +1,6 @@
package eu.dnetlib.pace.model; package eu.dnetlib.pace.model;
import java.io.Serializable;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -10,7 +11,7 @@ import com.google.common.collect.Maps;
/** /**
* The Class MapDocument. * The Class MapDocument.
*/ */
public class MapDocument implements Document { public class MapDocument implements Document, Serializable {
/** The identifier. */ /** The identifier. */
private String identifier; private String identifier;