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

Fix dspace-api module per new code style

Browse Source
This commit is contained in:
Tim Donohue
2018-02-14 10:53:46 -06:00
parent 8ffc97f7f9
commit 8a48f782ea
1051 changed files with 53347 additions and 63373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
View File

@@ -7,6 +7,9 @@
*/
package org.dspace.discovery;
import java.util.HashSet;
import java.util.Set;
import org.apache.log4j.Logger;
import org.dspace.content.Bundle;
import org.dspace.content.DSpaceObject;
@@ -16,9 +19,6 @@ import org.dspace.event.Consumer;
import org.dspace.event.Event;
import org.dspace.services.factory.DSpaceServicesFactory;
import java.util.HashSet;
import java.util.Set;
/**
* Class for updating search indices in discovery from content events.
*
@@ -38,7 +38,9 @@ public class IndexEventConsumer implements Consumer {
// handles to delete since IDs are not useful by now.
private Set<String> handlesToDelete = null;
IndexingService indexer = DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(IndexingService.class.getName(),IndexingService.class);
IndexingService indexer = DSpaceServicesFactory.getInstance().getServiceManager()
.getServiceByName(IndexingService.class.getName(),
IndexingService.class);
@Override
public void initialize() throws Exception {
@@ -62,10 +64,10 @@ public class IndexEventConsumer implements Consumer {
int st = event.getSubjectType();
if (!(st == Constants.ITEM || st == Constants.BUNDLE
|| st == Constants.COLLECTION || st == Constants.COMMUNITY)) {
|| st == Constants.COLLECTION || st == Constants.COMMUNITY)) {
log
.warn("IndexConsumer should not have been given this kind of Subject in an event, skipping: "
+ event.toString());
.warn("IndexConsumer should not have been given this kind of Subject in an event, skipping: "
+ event.toString());
return;
}
@@ -81,17 +83,15 @@ public class IndexEventConsumer implements Consumer {
int et = event.getEventType();
if (st == Constants.BUNDLE) {
if ((et == Event.ADD || et == Event.REMOVE) && subject != null
&& ((Bundle) subject).getName().equals("TEXT")) {
&& ((Bundle) subject).getName().equals("TEXT")) {
st = Constants.ITEM;
et = Event.MODIFY;
subject = ((Bundle) subject).getItems().get(0);
if (log.isDebugEnabled())
{
if (log.isDebugEnabled()) {
log.debug("Transforming Bundle event into MODIFY of Item "
+ subject.getHandle());
+ subject.getHandle());
}
} else
{
} else {
return;
}
}
@@ -100,14 +100,12 @@ public class IndexEventConsumer implements Consumer {
case Event.CREATE:
case Event.MODIFY:
case Event.MODIFY_METADATA:
if (subject == null)
{
if (subject == null) {
log.warn(event.getEventTypeAsString() + " event, could not get object for "
+ event.getSubjectTypeAsString() + " id="
+ String.valueOf(event.getSubjectID())
+ ", perhaps it has been deleted.");
}
else {
+ event.getSubjectTypeAsString() + " id="
+ String.valueOf(event.getSubjectID())
+ ", perhaps it has been deleted.");
} else {
log.debug("consume() adding event to update queue: " + event.toString());
objectsToUpdate.add(subject);
}
@@ -115,14 +113,12 @@ public class IndexEventConsumer implements Consumer {
case Event.REMOVE:
case Event.ADD:
if (object == null)
{
if (object == null) {
log.warn(event.getEventTypeAsString() + " event, could not get object for "
+ event.getObjectTypeAsString() + " id="
+ String.valueOf(event.getObjectID())
+ ", perhaps it has been deleted.");
}
else {
+ event.getObjectTypeAsString() + " id="
+ String.valueOf(event.getObjectID())
+ ", perhaps it has been deleted.");
} else {
log.debug("consume() adding event to update queue: " + event.toString());
objectsToUpdate.add(object);
}
@@ -130,21 +126,19 @@ public class IndexEventConsumer implements Consumer {
case Event.DELETE:
String detail = event.getDetail();
if (detail == null)
{
if (detail == null) {
log.warn("got null detail on DELETE event, skipping it.");
}
else {
} else {
log.debug("consume() adding event to delete queue: " + event.toString());
handlesToDelete.add(detail);
}
break;
default:
log
.warn("IndexConsumer should not have been given a event of type="
+ event.getEventTypeAsString()
+ " on subject="
+ event.getSubjectTypeAsString());
.warn("IndexConsumer should not have been given a event of type="
+ event.getEventTypeAsString()
+ " on subject="
+ event.getSubjectTypeAsString());
break;
}
}
@@ -161,8 +155,8 @@ public class IndexEventConsumer implements Consumer {
// update the changed Items not deleted because they were on create list
for (DSpaceObject o : objectsToUpdate) {
/* we let all types through here and
* allow the search indexer to make
/* we let all types through here and
* allow the search indexer to make
* decisions on indexing and/or removal
*/
DSpaceObject iu = ctx.reloadEntity(o);
@@ -171,11 +165,10 @@ public class IndexEventConsumer implements Consumer {
try {
indexer.indexContent(ctx, iu, true);
log.debug("Indexed "
+ Constants.typeText[iu.getType()]
+ ", id=" + String.valueOf(iu.getID())
+ ", handle=" + hdl);
}
catch (Exception e) {
+ Constants.typeText[iu.getType()]
+ ", id=" + String.valueOf(iu.getID())
+ ", handle=" + hdl);
} catch (Exception e) {
log.error("Failed while indexing object: ", e);
}
}
@@ -184,12 +177,10 @@ public class IndexEventConsumer implements Consumer {
for (String hdl : handlesToDelete) {
try {
indexer.unIndexContent(ctx, hdl, true);
if (log.isDebugEnabled())
{
if (log.isDebugEnabled()) {
log.debug("UN-Indexed Item, handle=" + hdl);
}
}
catch (Exception e) {
} catch (Exception e) {
log.error("Failed while UN-indexing object: " + hdl, e);
}