From: Andreas Müller Date: Thu, 29 Apr 2021 21:04:16 +0000 (+0200) Subject: remove generics from Identifier class X-Git-Tag: 5.23.0^2~233 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/0a140219ce2d2b487fa43fcd0367c2f3f46b9492 remove generics from Identifier class --- diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java index b9986652e7..ed223a6904 100755 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java @@ -1458,7 +1458,7 @@ public class CdmLightClassificationExport tableName = "PersonOrTeam"; } - for (Identifier identifier: identifiers){ + for (Identifier identifier: identifiers){ if (identifier.getType() == null && identifier.getIdentifier() == null){ state.getResult().addWarning("Please check the identifiers for " + cdmBaseStr(cdmBase) + " there is an empty identifier"); diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/identifier/IdentifierImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/identifier/IdentifierImport.java index ab9b4882af..20ed38fa16 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/identifier/IdentifierImport.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/identifier/IdentifierImport.java @@ -166,7 +166,7 @@ public class IdentifierImport return null; } - Identifier identifier = null; + Identifier identifier = null; //TODO clean redundant code if (config.isWarnAndDoNotOverrideIfExists()){ boolean wasAlreadyImported = entityUuidsHandled.contains(uuid); @@ -228,7 +228,7 @@ public class IdentifierImport } private void addNewIdentifier(DefinedTerm idType, IdentifiableEntity entity, String value, - Identifier identifier) { + Identifier identifier) { if (identifier == null){ identifier = Identifier.NewInstance(value, idType); entity.addIdentifier(identifier); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java index cd40189529..844f0bf3aa 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java @@ -30,7 +30,7 @@ public class IdentifiableEntityFormatter extends AbstractCdmFormatter { IdentifiableEntity identifiableEntity = (IdentifiableEntity)object; List identifiers = identifiableEntity.getIdentifiers(); String identifierString = null; - for (Identifier identifier : identifiers) { + for (Identifier identifier : identifiers) { if(identifier.getType()!=null && identifier.getType().getUuid().equals(UUID.fromString("fadeba12-1be3-4bc7-9ff5-361b088d86fc"))){ identifierString = identifier.getIdentifier(); break; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java index 536d4b7607..05a247e764 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java @@ -436,7 +436,7 @@ public abstract class IdentifiableEntity getIdentifiers(UUID identifierTypeUuid){ Set result = new HashSet<>(); - for (Identifier identifier : getIdentifiers()){ + for (Identifier identifier : getIdentifiers()){ if ( (identifier.getType()== null && identifierTypeUuid == null) || (identifier.getType().getUuid().equals(identifierTypeUuid))){ result.add(identifier.getIdentifier()); @@ -447,7 +447,7 @@ public abstract class IdentifiableEntity getIdentifiers_(UUID identifierTypeUuid){ Set result = new HashSet<>(); - for (Identifier identifier : getIdentifiers()){ + for (Identifier identifier : getIdentifiers()){ if ( (identifier.getType()== null && identifierTypeUuid == null) || (identifier.getType().getUuid().equals(identifierTypeUuid))){ result.add(identifier); @@ -458,7 +458,7 @@ public abstract class IdentifiableEntity result = Identifier.NewInstance(identifier, identifierType); + Identifier result = Identifier.NewInstance(identifier, identifierType); addIdentifier(result); return result; } @@ -703,8 +703,8 @@ public abstract class IdentifiableEntity(); - for (Identifier identifier : getIdentifiers() ){ - Identifier newIdentifier = identifier.clone(); + for (Identifier identifier : getIdentifiers() ){ + Identifier newIdentifier = identifier.clone(); result.addIdentifier(newIdentifier); } diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java index 203233b238..bb390a2f05 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java @@ -42,7 +42,7 @@ import eu.etaxonomy.cdm.validation.annotation.NullOrNotEmpty; @Entity @Audited @Table(name="Identifier", indexes = { @Index(name = "identifierIndex", columnList = "identifier") }) -public class Identifier> +public class Identifier extends AnnotatableEntity { private static final long serialVersionUID = 3337567049024506936L; @@ -64,13 +64,13 @@ public class Identifier> // **************************** FACTORY ******************************/ - public static > Identifier NewInstance(String identifier, DefinedTerm type){ - return new Identifier(identifier, type); + public static Identifier NewInstance(String identifier, DefinedTerm type){ + return new Identifier(identifier, type); } - public static > Identifier NewInstance(T identifiableEntity, + public static Identifier NewInstance(IdentifiableEntity identifiableEntity, String identifier, DefinedTerm type){ - Identifier result = new Identifier(identifier, type); + Identifier result = new Identifier(identifier, type); identifiableEntity.addIdentifier(result); return result; } @@ -110,8 +110,8 @@ public class Identifier> //****************** CLONE ************************************************/ @Override - public Identifier clone() throws CloneNotSupportedException{ - Identifier result = (Identifier)super.clone(); + public Identifier clone() throws CloneNotSupportedException{ + Identifier result = (Identifier)super.clone(); //no changes to: type, value return result; } diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/occurrence/DnaSampleDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/occurrence/DnaSampleDefaultCacheStrategyTest.java index 71201f805d..42e43d6c4b 100644 --- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/occurrence/DnaSampleDefaultCacheStrategyTest.java +++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/occurrence/DnaSampleDefaultCacheStrategyTest.java @@ -42,7 +42,7 @@ public class DnaSampleDefaultCacheStrategyTest extends TermTestBase { specimen.setAccessionNumber("123"); Assert.assertEquals("B 123", strategy.getTitleCache(specimen)); - Identifier identifier = Identifier.NewInstance(specimen, "id3", DefinedTerm.IDENTIFIER_NAME_IPNI()); + Identifier identifier = Identifier.NewInstance(specimen, "id3", DefinedTerm.IDENTIFIER_NAME_IPNI()); Assert.assertEquals("B 123", strategy.getTitleCache(specimen)); specimen.setCollection(null); specimen.setAccessionNumber(null); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java index 7029b52cad..5e218ed68a 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java @@ -965,7 +965,7 @@ public class FullCoverageDataGenerator { Extension.NewInstance(identifiableEntity, "extension", ExtensionType.INFORMAL_CATEGORY()); //Identifier - Identifier identifier = identifiableEntity.addIdentifier("ident23", DefinedTerm.SEX_FEMALE()); + Identifier identifier = identifiableEntity.addIdentifier("ident23", DefinedTerm.SEX_FEMALE()); handleAnnotatableEntity(identifier); //Links diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DeduplicationHelper.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DeduplicationHelper.java index 00bd88ebb2..9a803a9802 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DeduplicationHelper.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DeduplicationHelper.java @@ -408,17 +408,17 @@ public class DeduplicationHelper { } //identifiers - List> removeListIdentifier = new ArrayList<>(); - for (Identifier changeObject : identifiableEntity2.getIdentifiers()){ + List removeListIdentifier = new ArrayList<>(); + for (Identifier changeObject : identifiableEntity2.getIdentifiers()){ try { - Identifier clone = changeObject.clone(); + Identifier clone = changeObject.clone(); identifiableEntity1.addIdentifier(clone); removeListIdentifier.add(changeObject); } catch (CloneNotSupportedException e) { throw new RuntimeException(e); } } - for (Identifier removeObject : removeListIdentifier){ + for (Identifier removeObject : removeListIdentifier){ identifiableEntity2.removeIdentifier(removeObject); session.delete(removeObject); } diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java index 594c78a7c2..051a0a3317 100644 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java @@ -114,7 +114,7 @@ public class IdentifiableServiceBaseTest extends CdmTransactionalIntegrationTest Assert.assertEquals(UUID.fromString("888cded1-cadc-48de-8629-e32927919879"), taxon.getUuid()); Assert.assertEquals(UUID.fromString("888cded1-cadc-48de-8629-e32927919879"), entity.getUuid()); Assert.assertEquals("Taxon should have 1 identifier", 1, taxon.getIdentifiers().size()); - Identifier identifier = taxon.getIdentifiers().get(0); + Identifier identifier = taxon.getIdentifiers().get(0); DefinedTerm type = CdmBase.deproxy(identifier.getType(), DefinedTerm.class); Assert.assertEquals(uuidIdentifierType1, type.getUuid()); diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java index b5a34ac6ee..250afaab05 100644 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java @@ -1510,7 +1510,7 @@ public class OccurrenceServiceTest extends CdmTransactionalIntegrationTest { UUID dnaSampleUuid = UUID.fromString("4bee91b9-23d8-438b-8569-6d6aaa5b6587"); DnaSample dnaSample = HibernateProxyHelper.deproxy(occurrenceService.load(dnaSampleUuid), DnaSample.class); assertEquals(1, dnaSample.getIdentifiers().size()); - Identifier identifier = dnaSample.getIdentifiers().iterator().next(); + Identifier identifier = dnaSample.getIdentifiers().iterator().next(); assertEquals("NK 2088", identifier.getIdentifier()); assertEquals(sampleDesignationTermType, identifier.getType()); @@ -1519,7 +1519,7 @@ public class OccurrenceServiceTest extends CdmTransactionalIntegrationTest { occurrenceService.saveOrUpdate(dnaSample); SpecimenOrObservationBase dnaSampleReloaded = occurrenceService.load(dnaSampleUuid); assertEquals(1, dnaSample.getIdentifiers().size()); - Identifier identifierReloaded = dnaSample.getIdentifiers().iterator().next(); + Identifier identifierReloaded = dnaSample.getIdentifiers().iterator().next(); assertEquals("WB10", identifierReloaded.getIdentifier()); assertEquals(sampleDesignationTermType, identifierReloaded.getType());