From 3ab98d8b37aa567a83bc93d8c4654b10b1697c54 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Tue, 10 Aug 2021 09:36:37 +0200 Subject: [PATCH] suggestions from SonarLint --- .../action/AtomicActionDeserializer.java | 11 ++++--- .../schema/common/AccessRightComparator.java | 1 - .../dhp/schema/common/ModelConstants.java | 2 ++ .../dhp/schema/common/ModelSupport.java | 7 ++-- .../dnetlib/dhp/schema/dump/oaf/Author.java | 1 - .../dhp/schema/dump/oaf/Container.java | 1 - .../dhp/schema/dump/oaf/Qualifier.java | 4 --- .../dnetlib/dhp/schema/dump/oaf/Result.java | 2 -- .../schema/dump/oaf/community/Context.java | 12 +++++-- .../dhp/schema/dump/oaf/community/Funder.java | 2 -- .../schema/dump/oaf/community/Project.java | 2 -- .../dhp/schema/dump/oaf/graph/Datasource.java | 1 - .../dhp/schema/dump/oaf/graph/Funder.java | 2 -- .../dhp/schema/dump/oaf/graph/Granted.java | 1 - .../schema/dump/oaf/graph/Organization.java | 3 -- .../dnetlib/dhp/schema/oaf/AccessRight.java | 1 + .../eu/dnetlib/dhp/schema/oaf/OafEntity.java | 3 +- .../eu/dnetlib/dhp/schema/oaf/Project.java | 4 --- .../eu/dnetlib/dhp/schema/oaf/Relation.java | 6 ++-- .../eu/dnetlib/dhp/schema/oaf/Result.java | 8 ++--- .../dhp/schema/oaf/StructuredProperty.java | 2 -- .../schema/oaf/utils/CleaningFunctions.java | 2 ++ .../schema/oaf/utils/IdentifierFactory.java | 6 ++-- .../dhp/schema/oaf/utils/ModelHardLimits.java | 2 ++ .../oaf/utils/PidBlacklistProvider.java | 2 ++ .../oaf/utils/ResultTypeComparator.java | 3 +- .../dnetlib/dhp/schema/orcid/Contributor.java | 3 -- .../dnetlib/dhp/schema/orcid/WorkDetail.java | 5 --- .../dhp/schema/action/AtomicActionTest.java | 5 +-- .../dhp/schema/common/ModelSupportTest.java | 4 +-- .../dnetlib/dhp/schema/oaf/MeasureTest.java | 4 +-- .../eu/dnetlib/dhp/schema/oaf/MergeTest.java | 33 ++++++++++--------- .../oaf/utils/BlackListProviderTest.java | 4 +-- .../oaf/utils/IdentifierFactoryTest.java | 6 ++-- 34 files changed, 70 insertions(+), 85 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java b/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java index 7b88e9c..628d8fe 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java +++ b/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java @@ -4,7 +4,6 @@ package eu.dnetlib.dhp.schema.action; import java.io.IOException; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; @@ -12,10 +11,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.dnetlib.dhp.schema.oaf.Oaf; -public class AtomicActionDeserializer extends JsonDeserializer { +public class AtomicActionDeserializer extends JsonDeserializer> { @Override - public Object deserialize(JsonParser jp, DeserializationContext ctxt) + @SuppressWarnings("unchecked") + public AtomicAction deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { JsonNode node = jp.getCodec().readTree(jp); String classTag = node.get("clazz").asText(); @@ -23,8 +23,9 @@ public class AtomicActionDeserializer extends JsonDeserializer { ObjectMapper mapper = new ObjectMapper(); try { - final Class clazz = Class.forName(classTag); - return new AtomicAction(clazz, (Oaf) mapper.readValue(payload.toString(), clazz)); + final Class clazz = (Class) Class.forName(classTag); + final T oaf = mapper.readValue(payload.toString(), clazz); + return new AtomicAction(clazz, oaf); } catch (ClassNotFoundException e) { throw new IOException(e); } diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/AccessRightComparator.java b/src/main/java/eu/dnetlib/dhp/schema/common/AccessRightComparator.java index 6116bc4..f77e2af 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/common/AccessRightComparator.java +++ b/src/main/java/eu/dnetlib/dhp/schema/common/AccessRightComparator.java @@ -3,7 +3,6 @@ package eu.dnetlib.dhp.schema.common; import java.util.Comparator; -import eu.dnetlib.dhp.schema.oaf.AccessRight; import eu.dnetlib.dhp.schema.oaf.Qualifier; public class AccessRightComparator implements Comparator { diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java index 4537c1d..5c08765 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java +++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java @@ -8,6 +8,8 @@ import eu.dnetlib.dhp.schema.oaf.Qualifier; public class ModelConstants { + private ModelConstants() {} + public static final String ORCID = "orcid"; public static final String ORCID_PENDING = "orcid_pending"; public static final String ORCID_CLASSNAME = "Open Researcher and Contributor ID"; diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java index a6d164c..89eddd0 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java +++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java @@ -7,13 +7,14 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.ParseException; -import java.time.format.DateTimeParseException; -import java.util.*; +import java.util.Date; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.function.Function; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; import com.github.sisyphsu.dateparser.DateParserUtils; import com.google.common.collect.Maps; diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java index 34920bc..ef035a1 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java @@ -2,7 +2,6 @@ package eu.dnetlib.dhp.schema.dump.oaf; import java.io.Serializable; -import java.util.List; /** * Used to represent the generic author of the result. It has six parameters: - name of type String to store the given diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java index 8699528..ad9ea48 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java @@ -2,7 +2,6 @@ package eu.dnetlib.dhp.schema.dump.oaf; import java.io.Serializable; -import java.util.Objects; /** * To store information about the conference or journal where the result has been presented or published. It contains diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java index 348c22b..fd21424 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java @@ -3,10 +3,6 @@ package eu.dnetlib.dhp.schema.dump.oaf; import java.io.Serializable; -import org.apache.commons.lang3.StringUtils; - -import com.fasterxml.jackson.annotation.JsonIgnore; - /** * To represent the information described by a code and a value It has two parameters: - code to store the code * (generally the classid of the eu.dnetlib.dhp.schema.oaf.Qualifier element) - label to store the label (generally the diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java index 1981776..932df9e 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java @@ -4,8 +4,6 @@ package eu.dnetlib.dhp.schema.dump.oaf; import java.io.Serializable; import java.util.List; -import eu.dnetlib.dhp.schema.dump.oaf.community.Project; - /** * To represent the dumped result. It will be extended in the dump for Research Communities - Research * Initiative/Infrastructures. It has the following parameters: - author of type diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java index 16d5a6e..d4c1d40 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java @@ -3,6 +3,8 @@ package eu.dnetlib.dhp.schema.dump.oaf.community; import java.util.List; import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; import eu.dnetlib.dhp.schema.dump.oaf.Provenance; import eu.dnetlib.dhp.schema.dump.oaf.Qualifier; @@ -32,9 +34,13 @@ public class Context extends Qualifier { @Override public int hashCode() { - String provenance = ""; - this.provenance.forEach(p -> provenance.concat(p.toString())); - return Objects.hash(getCode(), getLabel(), provenance); + final String p = Optional.ofNullable(getProvenance()) + .map(prov -> prov.stream() + .map(Provenance::toString) + .collect(Collectors.joining())) + .orElse(""); + + return Objects.hash(getCode(), getLabel(), p); } } diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java index adb4163..5ea0d12 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java @@ -1,8 +1,6 @@ package eu.dnetlib.dhp.schema.dump.oaf.community; -import java.io.Serializable; - /** * To store information about the funder funding the project related to the result. It has the following parameters: - * shortName of type String to store the funder short name (e.c. AKA). - name of type String to store the funder name diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java index 030b565..aadb790 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java @@ -1,8 +1,6 @@ package eu.dnetlib.dhp.schema.dump.oaf.community; -import java.io.Serializable; - import eu.dnetlib.dhp.schema.dump.oaf.Provenance; /** diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java index 6b2b7b1..62a32a0 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java @@ -6,7 +6,6 @@ import java.util.List; import eu.dnetlib.dhp.schema.dump.oaf.Container; import eu.dnetlib.dhp.schema.dump.oaf.ControlledField; -import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; /** * To store information about the datasource OpenAIRE collects information from. It contains the following parameters: - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java index 3b298c8..19e068f 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java @@ -1,8 +1,6 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import java.io.Serializable; - /** * To store information about the funder funding the project related to the result. It extends * eu.dnetlib.dhp.schema.dump.oaf.Funder with the following parameter: - - private diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java index 94ace55..3dec2df 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java @@ -2,7 +2,6 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; import java.io.Serializable; -import java.util.Optional; /** * To describe the funded amount. It has the following parameters: - private String currency to store the currency of diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java index 2407c9c..c1fd0e9 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java @@ -5,10 +5,7 @@ import java.io.Serializable; import java.util.List; import eu.dnetlib.dhp.schema.dump.oaf.ControlledField; -import eu.dnetlib.dhp.schema.dump.oaf.Country; -import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; import eu.dnetlib.dhp.schema.dump.oaf.Qualifier; -import eu.dnetlib.dhp.schema.dump.oaf.community.Project; /** * To represent the generic organizaiton. It has the following parameters: - private String legalshortname to store the diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java index 14fe748..c680555 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java @@ -18,6 +18,7 @@ public class AccessRight extends Qualifier { this.openAccessRoute = openAccessRoute; } + @Override public String toComparableString() { String s = super.toComparableString(); return Optional diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java index 17c3e6b..0411821 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java @@ -96,7 +96,8 @@ public abstract class OafEntity extends Oaf implements Serializable { oaiprovenance = e.getOaiprovenance(); } - protected List mergeLists(final List... lists) { + @SafeVarargs + protected final List mergeLists(final List... lists) { return Arrays .stream(lists) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java index 6e3ac1a..0798212 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java @@ -348,10 +348,6 @@ public class Project extends OafEntity implements Serializable { : contactemail; summary = p.getSummary() != null && compareTrust(this, e) < 0 ? p.getSummary() : summary; currency = p.getCurrency() != null && compareTrust(this, e) < 0 ? p.getCurrency() : currency; -// totalcost = p.getTotalcost() != null && compareTrust(this, e) < 0 ? p.getTotalcost() : totalcost; -// fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0 -// ? p.getFundedamount() -// : fundedamount; if (p.getH2020topiccode() != null && StringUtils.isEmpty(h2020topiccode)){ h2020topiccode = p.getH2020topiccode(); diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java index adfc6af..fc6c5e0 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java @@ -4,9 +4,9 @@ package eu.dnetlib.dhp.schema.oaf; import static com.google.common.base.Preconditions.checkArgument; import java.text.ParseException; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; import eu.dnetlib.dhp.schema.common.ModelSupport; diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java index 701f9ef..68e715d 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java @@ -349,10 +349,10 @@ public class Result extends OafEntity implements Serializable { private StructuredProperty getMainTitle(List titles) { // need to check if the list of titles contains more than 1 main title? (in that case, we should chose which // main title select in the list) - for (StructuredProperty title : titles) { - if (title.getQualifier() != null && title.getQualifier().getClassid() != null) - if (title.getQualifier().getClassid().equals("main title")) - return title; + for (StructuredProperty t : titles) { + if (t.getQualifier() != null && t.getQualifier().getClassid() != null) + if (t.getQualifier().getClassid().equals("main title")) + return t; } return null; } diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java index 024b915..8750950 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java @@ -8,8 +8,6 @@ import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import com.google.common.base.Joiner; - public class StructuredProperty implements Serializable { private String value; diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java index c56eed4..d759114 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java @@ -22,6 +22,8 @@ public class CleaningFunctions { PID_BLACKLIST.add("na"); } + private CleaningFunctions() {} + /** * Utility method that filter PID values on a per-type basis. * @param s the PID whose value will be checked. diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java index 2b7a5f3..35d1536 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java @@ -120,7 +120,7 @@ public class IdentifierFactory implements Serializable { return pids .values() .stream() - .flatMap(s -> s.stream()) + .flatMap(Set::stream) .min(new PidComparator<>(entity)) .map( min -> Optional @@ -140,8 +140,7 @@ public class IdentifierFactory implements Serializable { if (entity instanceof Result) { return Optional .ofNullable(((Result) entity).getInstance()) - .map( - instance -> mapPids(instance)) + .map(IdentifierFactory::mapPids) .orElse(new HashMap<>()); } else { return entity @@ -247,7 +246,6 @@ public class IdentifierFactory implements Serializable { md.update(s.getBytes(StandardCharsets.UTF_8)); return new String(Hex.encodeHex(md.digest())); } catch (final Exception e) { - System.err.println("Error creating id"); return null; } } diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java index b8f81ea..ea40509 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java @@ -3,6 +3,8 @@ package eu.dnetlib.dhp.schema.oaf.utils; public class ModelHardLimits { + private ModelHardLimits() {} + public static final String LAYOUT = "index"; public static final String INTERPRETATION = "openaire"; public static final String SEPARATOR = "-"; diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java index 1c1c21f..3bcd0ab 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java @@ -34,4 +34,6 @@ public class PidBlacklistProvider { .orElse(new HashSet<>()); } + private PidBlacklistProvider() {} + } diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java index 80a7ce0..04d855d 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java @@ -9,6 +9,7 @@ import java.util.Optional; import java.util.stream.Collectors; import eu.dnetlib.dhp.schema.common.ModelConstants; +import eu.dnetlib.dhp.schema.oaf.KeyValue; import eu.dnetlib.dhp.schema.oaf.Result; public class ResultTypeComparator implements Comparator { @@ -69,7 +70,7 @@ public class ResultTypeComparator implements Comparator { .map( cf -> cf .stream() - .map(c -> c.getKey()) + .map(KeyValue::getKey) .collect(Collectors.toCollection(HashSet::new))) .orElse(new HashSet<>()); } diff --git a/src/main/java/eu/dnetlib/dhp/schema/orcid/Contributor.java b/src/main/java/eu/dnetlib/dhp/schema/orcid/Contributor.java index 3b543db..23161d7 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/orcid/Contributor.java +++ b/src/main/java/eu/dnetlib/dhp/schema/orcid/Contributor.java @@ -3,12 +3,9 @@ package eu.dnetlib.dhp.schema.orcid; import java.io.Serializable; -import eu.dnetlib.dhp.schema.orcid.AuthorData; - /** * This class models the data related to a contributor, that are retrieved from an orcid publication */ - public class Contributor extends AuthorData implements Serializable { private String sequence; private String role; diff --git a/src/main/java/eu/dnetlib/dhp/schema/orcid/WorkDetail.java b/src/main/java/eu/dnetlib/dhp/schema/orcid/WorkDetail.java index 614d415..f0e2ceb 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/orcid/WorkDetail.java +++ b/src/main/java/eu/dnetlib/dhp/schema/orcid/WorkDetail.java @@ -4,11 +4,6 @@ package eu.dnetlib.dhp.schema.orcid; import java.io.Serializable; import java.util.List; -import eu.dnetlib.dhp.schema.orcid.Contributor; -import eu.dnetlib.dhp.schema.orcid.ExternalId; -import eu.dnetlib.dhp.schema.orcid.OrcidData; -import eu.dnetlib.dhp.schema.orcid.PublicationDate; - /** * This class models the data that are retrieved from orcid publication */ diff --git a/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java b/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java index 9818d03..22cd48c 100644 --- a/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java +++ b/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java @@ -14,10 +14,11 @@ import eu.dnetlib.dhp.schema.common.ModelConstants; import eu.dnetlib.dhp.schema.oaf.Relation; /** @author claudio.atzori */ -public class AtomicActionTest { +class AtomicActionTest { @Test - public void serializationTest() throws IOException { + @SuppressWarnings("unchecked") + void serializationTest() throws IOException { Relation rel = new Relation(); rel.setSource("1"); diff --git a/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java b/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java index 73e8c47..b40e119 100644 --- a/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java +++ b/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java @@ -17,7 +17,7 @@ public class ModelSupportTest { class IsSubClass { @Test - public void shouldReturnFalseWhenSubClassDoesNotExtendSuperClass() { + void shouldReturnFalseWhenSubClassDoesNotExtendSuperClass() { // when Boolean result = ModelSupport.isSubClass(Relation.class, OafEntity.class); @@ -26,7 +26,7 @@ public class ModelSupportTest { } @Test - public void shouldReturnTrueWhenSubClassExtendsSuperClass() { + void shouldReturnTrueWhenSubClassExtendsSuperClass() { // when Boolean result = ModelSupport.isSubClass(Result.class, OafEntity.class); diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java index 26b4407..c6f8aa8 100644 --- a/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java +++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java @@ -12,13 +12,13 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -public class MeasureTest { +class MeasureTest { public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper() .setSerializationInclusion(JsonInclude.Include.NON_NULL); @Test - public void testMeasureSerialization() throws IOException { + void testMeasureSerialization() throws IOException { Measure popularity = new Measure(); popularity.setId("popularity"); diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java index f9e70c7..e271e47 100644 --- a/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java +++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MergeTest { +class MergeTest { OafEntity oaf; @@ -20,7 +20,8 @@ public class MergeTest { } @Test - public void mergeListsTest() { + @SuppressWarnings("unchecked") + void mergeListsTest() { // string list merge test List a = Arrays.asList("a", "b", "c", "e"); @@ -35,7 +36,7 @@ public class MergeTest { } @Test - public void mergePublicationCollectedFromTest() { + void mergePublicationCollectedFromTest() { Publication a = publication(); Publication b = publication(); @@ -50,7 +51,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_bothPresent() { + void mergePublicationDateOfAcceptanceTest_bothPresent() { Publication a = publication(); Publication b = publication(); @@ -65,7 +66,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_bothPresent_1() { + void mergePublicationDateOfAcceptanceTest_bothPresent_1() { Publication a = publication("0.8"); Publication b = publication("0.9"); @@ -80,7 +81,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_bothPresent_2() { + void mergePublicationDateOfAcceptanceTest_bothPresent_2() { Publication a = publication("0.9"); Publication b = publication("0.8"); @@ -95,7 +96,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_leftMissing() { + void mergePublicationDateOfAcceptanceTest_leftMissing() { Publication a = publication(); Publication b = publication(); @@ -109,7 +110,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_leftMissing_1() { + void mergePublicationDateOfAcceptanceTest_leftMissing_1() { Publication a = publication("0.9"); Publication b = publication("0.8"); @@ -123,7 +124,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_leftMissing_2() { + void mergePublicationDateOfAcceptanceTest_leftMissing_2() { Publication a = publication("0.8"); Publication b = publication("0.9"); @@ -137,7 +138,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_rightMissing() { + void mergePublicationDateOfAcceptanceTest_rightMissing() { Publication a = publication(); Publication b = publication(); @@ -151,7 +152,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_rightMissing_1() { + void mergePublicationDateOfAcceptanceTest_rightMissing_1() { Publication a = publication("0.8"); Publication b = publication("0.9"); @@ -165,7 +166,7 @@ public class MergeTest { } @Test - public void mergePublicationDateOfAcceptanceTest_rightMissing_2() { + void mergePublicationDateOfAcceptanceTest_rightMissing_2() { Publication a = publication("0.9"); Publication b = publication("0.8"); @@ -179,7 +180,7 @@ public class MergeTest { } @Test - public void mergePublicationSubjectTest() { + void mergePublicationSubjectTest() { Publication a = publication(); Publication b = publication(); @@ -194,7 +195,7 @@ public class MergeTest { } @Test - public void mergeRelationTest() { + void mergeRelationTest() { Relation a = createRel(null, null); Relation b = createRel(null, null); @@ -235,7 +236,7 @@ public class MergeTest { } @Test - public void mergeRelationTestParseException() { + void mergeRelationTestParseException() { assertThrows(DateTimeParseException.class, () -> { Relation a = createRel(true, "Once upon a time ..."); Relation b = createRel(true, "... in a far away land"); @@ -279,7 +280,7 @@ public class MergeTest { } private Field field(T value) { - Field f = new Field(); + Field f = new Field(); f.setValue(value); return f; } diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java index 203cda0..61d06a6 100644 --- a/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java +++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java @@ -6,10 +6,10 @@ import java.util.Set; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class BlackListProviderTest { +class BlackListProviderTest { @Test - public void blackListTest() { + void blackListTest() { Assertions.assertNotNull(PidBlacklistProvider.getBlacklist()); Assertions.assertNotNull(PidBlacklistProvider.getBlacklist().get("doi")); diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java index aec0878..0a434a1 100644 --- a/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java +++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java @@ -14,13 +14,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.dnetlib.dhp.schema.oaf.Publication; -public class IdentifierFactoryTest { +class IdentifierFactoryTest { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper() .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); @Test - public void testCreateIdentifierForPublication() throws IOException { + void testCreateIdentifierForPublication() throws IOException { verifyIdentifier( "publication_doi1.json", "50|doi_________::79dbc7a2a56dc1532659f9038843256e", true); @@ -51,7 +51,7 @@ public class IdentifierFactoryTest { } @Test - public void testCreateIdentifierForPublicationNoHash() throws IOException { + void testCreateIdentifierForPublicationNoHash() throws IOException { verifyIdentifier("publication_doi1.json", "50|doi_________::10.1016/j.cmet.2010.03.013", false); verifyIdentifier("publication_doi2.json", "50|doi_________::10.1016/j.cmet.2010.03.013", false);