hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 06:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CST-5587] Fixed compilation errors

Browse Source
This commit is contained in:
Luca Giamminonni
2022-06-17 13:34:49 +02:00
parent c9ce57334b
commit 9f4cee5dbc
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/app/orcid/consumer/OrcidQueueConsumer.java
View File

@@ -132,7 +132,7 @@ public class OrcidQueueConsumer implements Consumer {
*/ */
private void consumeItem(Context context, Item item) throws SQLException { private void consumeItem(Context context, Item item) throws SQLException {
String entityType = itemService.getEntityType(item); String entityType = itemService.getEntityTypeLabel(item);
if (entityType == null) { if (entityType == null) {
return; return;
} }
@@ -322,7 +322,7 @@ public class OrcidQueueConsumer implements Consumer {
} }
private boolean isNotProfileItem(Item ownerItem) { private boolean isNotProfileItem(Item ownerItem) {
return !getProfileType().equals(itemService.getEntityType(ownerItem)); return !getProfileType().equals(itemService.getEntityTypeLabel(ownerItem));
} }
private String getMetadataValue(Item item, String metadataField) { private String getMetadataValue(Item item, String metadataField) {

2
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
View File

@@ -56,7 +56,7 @@ public class OrcidEntityFactoryServiceImpl implements OrcidEntityFactoryService
} }
private Optional<OrcidEntityType> getOrcidEntityType(Item item) { private Optional<OrcidEntityType> getOrcidEntityType(Item item) {
return Optional.ofNullable(OrcidEntityType.fromEntityType(itemService.getEntityType(item))); return Optional.ofNullable(OrcidEntityType.fromEntityType(itemService.getEntityTypeLabel(item)));
} }
} }

6
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidQueueServiceImpl.java
View File

@@ -93,7 +93,7 @@ public class OrcidQueueServiceImpl implements OrcidQueueService {
public OrcidQueue createEntityInsertionRecord(Context context, Item owner, Item entity) throws SQLException { public OrcidQueue createEntityInsertionRecord(Context context, Item owner, Item entity) throws SQLException {
OrcidQueue orcidQueue = new OrcidQueue(); OrcidQueue orcidQueue = new OrcidQueue();
orcidQueue.setEntity(entity); orcidQueue.setEntity(entity);
orcidQueue.setRecordType(itemService.getEntityType(entity)); orcidQueue.setRecordType(itemService.getEntityTypeLabel(entity));
orcidQueue.setOwner(owner); orcidQueue.setOwner(owner);
orcidQueue.setDescription(getMetadataValue(entity, "dc.title")); orcidQueue.setDescription(getMetadataValue(entity, "dc.title"));
orcidQueue.setOperation(OrcidOperation.INSERT); orcidQueue.setOperation(OrcidOperation.INSERT);
@@ -107,7 +107,7 @@ public class OrcidQueueServiceImpl implements OrcidQueueService {
orcidQueue.setOwner(owner); orcidQueue.setOwner(owner);
orcidQueue.setEntity(entity); orcidQueue.setEntity(entity);
orcidQueue.setPutCode(putCode); orcidQueue.setPutCode(putCode);
orcidQueue.setRecordType(itemService.getEntityType(entity)); orcidQueue.setRecordType(itemService.getEntityTypeLabel(entity));
orcidQueue.setDescription(getMetadataValue(entity, "dc.title")); orcidQueue.setDescription(getMetadataValue(entity, "dc.title"));
orcidQueue.setOperation(OrcidOperation.UPDATE); orcidQueue.setOperation(OrcidOperation.UPDATE);
return orcidQueueDAO.create(context, orcidQueue); return orcidQueueDAO.create(context, orcidQueue);
@@ -217,7 +217,7 @@ public class OrcidQueueServiceImpl implements OrcidQueueService {
return findRelationshipsByItem(context, profile).stream() return findRelationshipsByItem(context, profile).stream()
.map(relationship -> getRelatedItem(relationship, profile)) .map(relationship -> getRelatedItem(relationship, profile))
.filter(item -> entityType.equals(itemService.getEntityType(item))) .filter(item -> entityType.equals(itemService.getEntityTypeLabel(item)))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }

2
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidSynchronizationServiceImpl.java
View File

@@ -161,7 +161,7 @@ public class OrcidSynchronizationServiceImpl implements OrcidSynchronizationServ
@Override @Override
public boolean isSynchronizationEnabled(Item profile, Item item) { public boolean isSynchronizationEnabled(Item profile, Item item) {
String entityType = itemService.getEntityType(item); String entityType = itemService.getEntityTypeLabel(item);
if (entityType == null) { if (entityType == null) {
return false; return false;
} }

2
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -1669,7 +1669,7 @@ prevent the generation of resource policy entry values with null dspace_object a
private void createOrcidQueueRecordsToDeleteOnOrcid(Context context, Item entity) throws SQLException { private void createOrcidQueueRecordsToDeleteOnOrcid(Context context, Item entity) throws SQLException {
String entityType = getEntityType(entity); String entityType = getEntityTypeLabel(entity);
if (researcherProfileService.getProfileType().equals(entityType)) { if (researcherProfileService.getProfileType().equals(entityType)) {
return; return;
} }