Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MET-861 file reordering introduced to validation topology #148

Merged
merged 1 commit into from
May 11, 2018
+504 −8
Merged

MET-861 file reordering introduced to validation topology #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions service/dps/storm/topologies/validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,45 @@

<dependencies>

<dependency>
<groupId>eu.europeana.metis</groupId>
<artifactId>metis-transformation-service</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
<exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>eu.europeana.cloud</groupId>
Expand Down
41 changes: 33 additions & 8 deletions ...uropeana/cloud/service/dps/storm/topologies/validation/topology/bolts/ValidationBolt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,28 @@
import eu.europeana.cloud.service.dps.PluginParameterKeys;
import eu.europeana.cloud.service.dps.storm.AbstractDpsBolt;
import eu.europeana.cloud.service.dps.storm.StormTaskTuple;
import eu.europeana.metis.transformation.service.TransformationException;
import eu.europeana.metis.transformation.service.XsltTransformer;
import eu.europeana.validation.model.ValidationResult;
import eu.europeana.validation.service.ValidationExecutionService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.StringWriter;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.Properties;

/**
* Created by Tarek on 12/5/2017.
*/
public class ValidationBolt extends AbstractDpsBolt {

public static final Logger LOGGER = LoggerFactory.getLogger(ValidationBolt.class);
private static final String XSLT_SORTER_FILE_NAME = "edm_sorter.xsl";

private ValidationExecutionService validationService;
private XsltTransformer transformer;
private Properties properties;

public ValidationBolt(Properties properties) {
Expand All @@ -21,22 +33,37 @@ public ValidationBolt(Properties properties) {

@Override
public void execute(StormTaskTuple stormTaskTuple) {
ValidationResult result = validateFile(stormTaskTuple);
try {
reorderFileContent(stormTaskTuple);
validateFile(stormTaskTuple);
} catch (Exception e) {
LOGGER.error("XsltBolt error: {}", e.getMessage());
emitErrorNotification(stormTaskTuple.getTaskId(), "", e.getMessage(), stormTaskTuple
.getParameters().toString());
}
}

private void reorderFileContent(StormTaskTuple stormTaskTuple) throws TransformationException {
LOGGER.info("Reordering the file");
URL url = getClass().getClassLoader().getResource(XSLT_SORTER_FILE_NAME);
StringWriter writer = transformer.transform(url.toString(), stormTaskTuple.getFileData());
stormTaskTuple.setFileData(writer.toString().getBytes(Charset.forName("UTF-8")));
}

private void validateFile(StormTaskTuple stormTaskTuple) {
String document = new String(stormTaskTuple.getFileData());
ValidationResult result = validationService.singleValidation(getSchemaName(stormTaskTuple), getRootLocation(stormTaskTuple), getSchematromLocation(stormTaskTuple), document);
if (result.isSuccess()) {
outputCollector.emit(inputTuple, stormTaskTuple.toStormTuple());
} else {
emitErrorNotification(stormTaskTuple.getTaskId(), stormTaskTuple.getFileUrl(), result.getMessage(), getAdditionalInfo(result));
}
}

private ValidationResult validateFile(StormTaskTuple stormTaskTuple) {
String document = new String(stormTaskTuple.getFileData());
return validationService.singleValidation(getSchemaName(stormTaskTuple), getRootLocation(stormTaskTuple), getSchematromLocation(stormTaskTuple), document);
}

@Override
public void prepare() {
validationService = new ValidationExecutionService(properties);
transformer = new XsltTransformer();
}

private String getAdditionalInfo(ValidationResult vr) {
Expand Down Expand Up @@ -67,6 +94,4 @@ private String getRootLocation(StormTaskTuple stormTaskTuple) {
private String getSchematromLocation(StormTaskTuple stormTaskTuple) {
return stormTaskTuple.getParameter(PluginParameterKeys.SCHEMATRON_LOCATION);
}

}

Loading