Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] XML import now supports more options: 

- failOnUpdate
- add of elements
- update of elements
This commit is contained in:
Robert von Burg 2021-12-31 15:43:16 +01:00
parent 8003bd9bef
commit 9a05d6fb43
10 changed files with 153 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
li.strolch.agent/src/main/java/li/strolch/agent/impl/InMemoryElementListener.java
View File

@ -16,10 +16,12 @@
package li.strolch.agent.impl; package li.strolch.agent.impl;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.time.LocalDateTime;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchException;
import li.strolch.model.ModelStatistics;
import li.strolch.model.Order; import li.strolch.model.Order;
import li.strolch.model.Resource; import li.strolch.model.Resource;
import li.strolch.model.activity.Activity; import li.strolch.model.activity.Activity;
@ -31,6 +33,9 @@ import li.strolch.persistence.api.StrolchTransaction;
*/ */
public class InMemoryElementListener implements StrolchElementListener { public class InMemoryElementListener implements StrolchElementListener {
private final StrolchTransaction tx;
private final ModelStatistics statistics;
private boolean addOrders; private boolean addOrders;
private boolean addResources; private boolean addResources;
private boolean addActivities; private boolean addActivities;
@ -43,10 +48,10 @@ public class InMemoryElementListener implements StrolchElementListener {
private boolean failOnUpdate; private boolean failOnUpdate;
private StrolchTransaction tx;
public InMemoryElementListener(StrolchTransaction tx) { public InMemoryElementListener(StrolchTransaction tx) {
this.tx = tx; this.tx = tx;
this.statistics = new ModelStatistics();
this.statistics.startTime = LocalDateTime.now();
this.addResources = true; this.addResources = true;
this.addOrders = true; this.addOrders = true;
@ -139,6 +144,10 @@ public class InMemoryElementListener implements StrolchElementListener {
this.failOnUpdate = failOnUpdate; this.failOnUpdate = failOnUpdate;
} }
public ModelStatistics getStatistics() {
return this.statistics;
}
@Override @Override
public void notifyResource(Resource resource) { public void notifyResource(Resource resource) {
if (!this.resourceTypes.isEmpty() && !this.resourceTypes.contains(resource.getType())) if (!this.resourceTypes.isEmpty() && !this.resourceTypes.contains(resource.getType()))
@ -150,12 +159,15 @@ public class InMemoryElementListener implements StrolchElementListener {
Resource current = this.tx.getResourceBy(resource.getType(), resource.getId()); Resource current = this.tx.getResourceBy(resource.getType(), resource.getId());
resource.setVersion(current.getVersion()); resource.setVersion(current.getVersion());
this.tx.update(resource); this.tx.update(resource);
this.statistics.nrOfResourcesUpdated++;
} else if (this.failOnUpdate) { } else if (this.failOnUpdate) {
throw new StrolchException(MessageFormat throw new StrolchException(
.format("Resource {0} already exists and updating is disallowed!", resource.getLocator())); MessageFormat.format("Resource {0} already exists and updating is disallowed!",
resource.getLocator()));
} }
} else if (this.addResources) { } else if (this.addResources) {
this.tx.add(resource); this.tx.add(resource);
this.statistics.nrOfResources++;
} }
// else ignore // else ignore
} }
@ -171,12 +183,14 @@ public class InMemoryElementListener implements StrolchElementListener {
Order current = this.tx.getOrderBy(order.getType(), order.getId()); Order current = this.tx.getOrderBy(order.getType(), order.getId());
order.setVersion(current.getVersion()); order.setVersion(current.getVersion());
this.tx.update(order); this.tx.update(order);
this.statistics.nrOfOrdersUpdated++;
} else if (failOnUpdate) { } else if (failOnUpdate) {
throw new StrolchException(MessageFormat throw new StrolchException(MessageFormat.format("Order {0} already exists and updating is disallowed!",
.format("Order {0} already exists and updating is disallowed!", order.getLocator())); order.getLocator()));
} }
} else if (this.addOrders) { } else if (this.addOrders) {
this.tx.add(order); this.tx.add(order);
this.statistics.nrOfOrders++;
} }
// else ignore // else ignore
} }
@ -192,12 +206,15 @@ public class InMemoryElementListener implements StrolchElementListener {
Activity current = this.tx.getActivityBy(activity.getType(), activity.getId()); Activity current = this.tx.getActivityBy(activity.getType(), activity.getId());
activity.setVersion(current.getVersion()); activity.setVersion(current.getVersion());
this.tx.update(activity); this.tx.update(activity);
this.statistics.nrOfActivitiesUpdated++;
} else if (failOnUpdate) { } else if (failOnUpdate) {
throw new StrolchException(MessageFormat throw new StrolchException(
.format("Activity {0} already exists and updating is disallowed!", activity.getLocator())); MessageFormat.format("Activity {0} already exists and updating is disallowed!",
activity.getLocator()));
} }
} else if (this.addActivities) { } else if (this.addActivities) {
this.tx.add(activity); this.tx.add(activity);
this.statistics.nrOfActivities++;
} }
// else ignore // else ignore
} }

95
li.strolch.model/src/main/java/li/strolch/model/ModelStatistics.java
View File

@ -17,10 +17,14 @@ package li.strolch.model;
import static li.strolch.utils.helper.StringHelper.NULL; import static li.strolch.utils.helper.StringHelper.NULL;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
import java.util.Date; import java.util.Date;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import li.strolch.utils.helper.StringHelper; import li.strolch.utils.helper.StringHelper;
import li.strolch.utils.iso8601.ISO8601;
import li.strolch.utils.iso8601.ISO8601FormatFactory; import li.strolch.utils.iso8601.ISO8601FormatFactory;
/** /**
@ -28,40 +32,43 @@ import li.strolch.utils.iso8601.ISO8601FormatFactory;
*/ */
public class ModelStatistics { public class ModelStatistics {
public Date startTime; public LocalDateTime startTime;
public long durationNanos; public long durationNanos;
public long nrOfResources; public long nrOfResources;
public long nrOfResourcesUpdated;
public long nrOfOrders; public long nrOfOrders;
public long nrOfOrdersUpdated;
public long nrOfActivities; public long nrOfActivities;
public long nrOfActivitiesUpdated;
/**
* @return the nrOfOrders
*/
public long getNrOfOrders() {
return this.nrOfOrders;
}
/**
* @return the nrOfResources
*/
public long getNrOfResources() { public long getNrOfResources() {
return this.nrOfResources; return this.nrOfResources;
} }
/** public long getNrOfResourcesUpdated() {
* @return the nrOfResources + nrOfOrders return nrOfResourcesUpdated;
*/ }
public long getNrOfElements() {
return this.nrOfOrders + this.nrOfResources; public long getNrOfOrders() {
return this.nrOfOrders;
}
public long getNrOfOrdersUpdated() {
return nrOfOrdersUpdated;
} }
/**
* @return the nrOfActivities
*/
public long getNrOfActivities() { public long getNrOfActivities() {
return this.nrOfActivities; return this.nrOfActivities;
} }
public long getNrOfActivitiesUpdated() {
return nrOfActivitiesUpdated;
}
public long getNrOfElements() {
return this.nrOfResources + this.nrOfOrders + this.nrOfActivities;
}
/** /**
* Adds the statistics of the other statistics to this statistics instance * Adds the statistics of the other statistics to this statistics instance
* *
@ -69,38 +76,56 @@ public class ModelStatistics {
* further statistics to add to this {@link ModelStatistics} * further statistics to add to this {@link ModelStatistics}
*/ */
public void add(ModelStatistics statistics) { public void add(ModelStatistics statistics) {
this.nrOfOrders += statistics.nrOfOrders;
this.nrOfResources += statistics.nrOfResources; this.nrOfResources += statistics.nrOfResources;
this.nrOfResourcesUpdated += statistics.nrOfResourcesUpdated;
this.nrOfOrders += statistics.nrOfOrders;
this.nrOfOrdersUpdated += statistics.nrOfOrdersUpdated;
this.nrOfActivities += statistics.nrOfActivities; this.nrOfActivities += statistics.nrOfActivities;
this.nrOfActivitiesUpdated += statistics.nrOfActivitiesUpdated;
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(getClass().getSimpleName()); builder.append(getClass().getSimpleName());
builder.append(" [startTime="); builder.append(",\n- startTime=");
builder.append(this.startTime == null ? NULL : ISO8601FormatFactory.getInstance().formatDate(this.startTime)); builder.append(this.startTime == null ?
builder.append(", durationNanos="); NULL :
this.startTime.toLocalTime().truncatedTo(ChronoUnit.SECONDS).toString());
builder.append(",\n- duration=");
builder.append(StringHelper.formatNanoDuration(this.durationNanos)); builder.append(StringHelper.formatNanoDuration(this.durationNanos));
builder.append(", nrOfResources=");
builder.append(this.nrOfResources); if (this.nrOfResourcesUpdated == 0)
builder.append(", nrOfOrders="); builder.append(",\n- Resources=").append(this.nrOfResources);
builder.append(this.nrOfOrders); else
builder.append(", nrOfActivities="); builder.append(",\n- Resources: added=").append(this.nrOfResources).append(" updated=")
builder.append(this.nrOfActivities); .append(this.nrOfResourcesUpdated);
builder.append("]");
if (this.nrOfOrdersUpdated == 0)
builder.append(",\n- Orders=").append(this.nrOfOrders);
else
builder.append(",\n- Orders: added=").append(this.nrOfOrders).append(" updated=")
.append(this.nrOfOrdersUpdated);
if (this.nrOfActivitiesUpdated == 0)
builder.append(",\n- Activities=").append(this.nrOfActivities);
else
builder.append(",\n- Activities: added=").append(this.nrOfActivities).append(" updated=")
.append(this.nrOfActivitiesUpdated);
return builder.toString(); return builder.toString();
} }
public JsonObject toJson() { public JsonObject toJson() {
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
json.addProperty("startTime", json.addProperty("startTime", this.startTime == null ? NULL : ISO8601.toString(this.startTime));
this.startTime == null ? NULL : ISO8601FormatFactory.getInstance().formatDate(this.startTime));
json.addProperty("durationNanos", durationNanos); json.addProperty("durationNanos", durationNanos);
json.addProperty("nrOfResources", nrOfResources); json.addProperty("resourcesAdded", nrOfResources);
json.addProperty("nrOfOrders", nrOfOrders); json.addProperty("resourcesUpdated", nrOfResourcesUpdated);
json.addProperty("nrOfActivities", nrOfActivities); json.addProperty("ordersAdded", nrOfOrders);
json.addProperty("ordersUpdated", nrOfOrdersUpdated);
json.addProperty("activitiesAdded", nrOfActivities);
json.addProperty("activitiesUpdated", nrOfActivitiesUpdated);
return json; return json;
} }

42
li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxFileReader.java
View File

@ -15,10 +15,13 @@
*/ */
package li.strolch.model.xml; package li.strolch.model.xml;
import static li.strolch.utils.helper.StringHelper.*;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
import java.io.File; import java.io.File;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchException;
@ -32,14 +35,9 @@ import org.xml.sax.SAXException;
*/ */
public class XmlModelSaxFileReader extends XmlModelSaxReader { public class XmlModelSaxFileReader extends XmlModelSaxReader {
private File modelFile; private final File modelFile;
private boolean allowInclude; private final boolean allowInclude;
/**
* @param listener
* @param modelFile
* @param allowInclude
*/
public XmlModelSaxFileReader(StrolchElementListener listener, File modelFile, boolean allowInclude) { public XmlModelSaxFileReader(StrolchElementListener listener, File modelFile, boolean allowInclude) {
super(listener); super(listener);
this.modelFile = modelFile; this.modelFile = modelFile;
@ -49,36 +47,30 @@ public class XmlModelSaxFileReader extends XmlModelSaxReader {
@Override @Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
switch (qName) { if (!Tags.INCLUDE_FILE.equals(qName)) {
super.startElement(uri, localName, qName, attributes);
case Tags.INCLUDE_FILE: } else {
if (!this.allowInclude) { if (!this.allowInclude) {
String msg = "ModelFile {0} has includes which are disabled for this parse invocation!"; String msg = "ModelFile {0} has includes which are disabled for this parse invocation!";
throw new IllegalArgumentException( throw new IllegalArgumentException(MessageFormat.format(msg, this.modelFile.getAbsolutePath()));
MessageFormat.format(msg, this.modelFile.getAbsolutePath())); //$NON-NLS-1$
} }
String includeFileS = attributes.getValue(Tags.FILE); String includeFileS = attributes.getValue(Tags.FILE);
if (StringHelper.isEmpty(includeFileS)) { if (isEmpty(includeFileS)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
MessageFormat.format("The attribute {0} is missing for IncludeFile!", Tags.FILE)); //$NON-NLS-1$ MessageFormat.format("The attribute {0} is missing for IncludeFile!", Tags.FILE));
} }
File includeFile = new File(this.modelFile.getParentFile(), includeFileS); File includeFile = new File(this.modelFile.getParentFile(), includeFileS);
if (!includeFile.exists() || !includeFile.canRead()) { if (!includeFile.exists() || !includeFile.canRead()) {
String msg = "The IncludeFile does not exist, or is not readable. Source model: {0} with IncludeFile: {1}"; //$NON-NLS-1$ String msg = "The IncludeFile does not exist, or is not readable. Source model: {0} with IncludeFile: {1}";
msg = MessageFormat.format(msg, this.modelFile.getAbsolutePath(), includeFileS); msg = MessageFormat.format(msg, this.modelFile.getAbsolutePath(), includeFileS);
throw new IllegalArgumentException(msg); throw new IllegalArgumentException(msg);
} }
XmlModelSaxFileReader handler = new XmlModelSaxFileReader(this.listener, includeFile, this.allowInclude); XmlModelSaxFileReader handler = new XmlModelSaxFileReader(this.listener, includeFile, true);
handler.parseFile(); handler.parseFile();
this.statistics.add(handler.statistics); this.statistics.add(handler.statistics);
break;
default:
super.startElement(uri, localName, qName, attributes);
} }
} }
@ -86,7 +78,7 @@ public class XmlModelSaxFileReader extends XmlModelSaxReader {
try { try {
long startNanos = System.nanoTime(); long startNanos = System.nanoTime();
this.statistics.startTime = new Date(); this.statistics.startTime = LocalDateTime.now();
SAXParserFactory spf = SAXParserFactory.newInstance(); SAXParserFactory spf = SAXParserFactory.newInstance();
SAXParser sp = spf.newSAXParser(); SAXParser sp = spf.newSAXParser();
@ -95,13 +87,13 @@ public class XmlModelSaxFileReader extends XmlModelSaxReader {
long endNanos = System.nanoTime(); long endNanos = System.nanoTime();
this.statistics.durationNanos = endNanos - startNanos; this.statistics.durationNanos = endNanos - startNanos;
String msg = "SAX parsed model file {0} took {1}"; //$NON-NLS-1$ String msg = "SAX parsed model file {0} took {1}";
logger.info(MessageFormat.format(msg, this.modelFile.getAbsolutePath(), logger.info(MessageFormat.format(msg, this.modelFile.getAbsolutePath(),
StringHelper.formatNanoDuration(this.statistics.durationNanos))); formatNanoDuration(this.statistics.durationNanos)));
} catch (Exception e) { } catch (Exception e) {
String msg = "Parsing of {0} failed due to internal error: {1}"; //$NON-NLS-1$ String msg = "Parsing of {0} failed due to internal error: {1}";
throw new StrolchException(MessageFormat.format(msg, this.modelFile.getAbsolutePath(), e.getMessage()), e); throw new StrolchException(MessageFormat.format(msg, this.modelFile.getAbsolutePath(), e.getMessage()), e);
} }
} }

2
li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxReader.java
View File

@ -53,7 +53,7 @@ public class XmlModelSaxReader extends DefaultHandler {
private GroupedParameterizedElement parameterizedElement; private GroupedParameterizedElement parameterizedElement;
private TextParameter textParam; private TextParameter textParam;
private Deque<Activity> activityStack; private final Deque<Activity> activityStack;
private ParameterBag pBag; private ParameterBag pBag;
private StrolchTimedState<? extends IValue<?>> state; private StrolchTimedState<? extends IValue<?>> state;
private PolicyDefs policies; private PolicyDefs policies;

3
li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxStreamReader.java
View File

@ -25,6 +25,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchException;
@ -85,7 +86,7 @@ public class XmlModelSaxStreamReader extends XmlModelSaxReader {
try { try {
long startNanos = System.nanoTime(); long startNanos = System.nanoTime();
this.statistics.startTime = new Date(); this.statistics.startTime = LocalDateTime.now();
SAXParserFactory spf = SAXParserFactory.newInstance(); SAXParserFactory spf = SAXParserFactory.newInstance();
SAXParser sp = spf.newSAXParser(); SAXParser sp = spf.newSAXParser();

27
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
View File

@ -993,7 +993,16 @@ public class Inspector {
@Produces(MediaType.APPLICATION_XML) @Produces(MediaType.APPLICATION_XML)
@Consumes(MediaType.APPLICATION_XML) @Consumes(MediaType.APPLICATION_XML)
@Path("{realm}/import") @Path("{realm}/import")
public Response importAsXml(@Context HttpServletRequest request, @PathParam("realm") String realm, String data) { public Response importAsXml(@Context HttpServletRequest request, //
@PathParam("realm") String realm, //
@QueryParam("failOnUpdate") boolean failOnUpdate, //
@QueryParam("addResources") boolean addResources, //
@QueryParam("addOrders") boolean addOrders, //
@QueryParam("addActivities") boolean addActivities, //
@QueryParam("updateResources") boolean updateResources, //
@QueryParam("updateOrders") boolean updateOrders, //
@QueryParam("updateActivities") boolean updateActivities, //
String data) {
Certificate cert = (Certificate) request.getAttribute(STROLCH_CERTIFICATE); Certificate cert = (Certificate) request.getAttribute(STROLCH_CERTIFICATE);
@ -1010,12 +1019,16 @@ public class Inspector {
arg.modelFileName = tempFile.getAbsolutePath(); arg.modelFileName = tempFile.getAbsolutePath();
arg.allowInclude = false; arg.allowInclude = false;
arg.external = true; arg.external = true;
arg.addOrders = true; arg.failOnUpdate = failOnUpdate;
arg.addResources = true; arg.addResources = addResources;
arg.updateOrders = true; arg.addOrders = addOrders;
arg.updateResources = true; arg.addActivities = addActivities;
arg.orderTypes = Collections.emptySet(); arg.updateResources = updateResources;
arg.resourceTypes = Collections.emptySet(); arg.updateOrders = updateOrders;
arg.updateActivities = updateActivities;
arg.orderTypes = emptySet();
arg.resourceTypes = emptySet();
arg.activityTypes = emptySet();
arg.realm = realm; arg.realm = realm;
XmlImportModelResult svcResult = getServiceHandler().doService(cert, svc, arg); XmlImportModelResult svcResult = getServiceHandler().doService(cert, svc, arg);

7
li.strolch.service/src/main/java/li/strolch/command/XmlExportModelCommand.java
View File

@ -23,6 +23,7 @@ import java.io.FilenameFilter;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -106,7 +107,7 @@ public class XmlExportModelCommand extends Command {
long start = System.nanoTime(); long start = System.nanoTime();
this.statistics = new ModelStatistics(); this.statistics = new ModelStatistics();
this.statistics.startTime = new Date(); this.statistics.startTime = LocalDateTime.now();
String exportName = fileName.substring(0, fileName.indexOf(XML_FILE_SUFFIX)); String exportName = fileName.substring(0, fileName.indexOf(XML_FILE_SUFFIX));
@ -320,7 +321,7 @@ public class XmlExportModelCommand extends Command {
} }
/** /**
* @param multiFile *
*/ */
public void setMultiFile(boolean multiFile) { public void setMultiFile(boolean multiFile) {
this.multiFile = multiFile; this.multiFile = multiFile;
@ -382,7 +383,7 @@ public class XmlExportModelCommand extends Command {
} }
/** /**
* @param overwrite *
*/ */
public void setOverwrite(boolean overwrite) { public void setOverwrite(boolean overwrite) {
this.overwrite = overwrite; this.overwrite = overwrite;

22
li.strolch.service/src/main/java/li/strolch/command/XmlImportModelCommand.java
View File

@ -16,6 +16,8 @@
package li.strolch.command; package li.strolch.command;
import java.io.File; import java.io.File;
import java.time.Instant;
import java.time.ZoneId;
import java.util.Set; import java.util.Set;
import li.strolch.agent.impl.InMemoryElementListener; import li.strolch.agent.impl.InMemoryElementListener;
@ -31,6 +33,7 @@ import li.strolch.utils.dbc.DBC;
public class XmlImportModelCommand extends Command { public class XmlImportModelCommand extends Command {
// input // input
private boolean failOnUpdate;
private File modelFile; private File modelFile;
private boolean addOrders; private boolean addOrders;
private boolean addResources; private boolean addResources;
@ -46,10 +49,6 @@ public class XmlImportModelCommand extends Command {
private ModelStatistics statistics; private ModelStatistics statistics;
private boolean allowInclude; private boolean allowInclude;
/**
* @param container
* @param tx
*/
public XmlImportModelCommand(StrolchTransaction tx) { public XmlImportModelCommand(StrolchTransaction tx) {
super(tx); super(tx);
} }
@ -64,6 +63,7 @@ public class XmlImportModelCommand extends Command {
InMemoryElementListener elementListener = new InMemoryElementListener(tx()); InMemoryElementListener elementListener = new InMemoryElementListener(tx());
elementListener.setFailOnUpdate(this.failOnUpdate);
elementListener.setAddOrders(this.addOrders); elementListener.setAddOrders(this.addOrders);
elementListener.setAddResources(this.addResources); elementListener.setAddResources(this.addResources);
elementListener.setAddActivities(this.addActivities); elementListener.setAddActivities(this.addActivities);
@ -74,10 +74,12 @@ public class XmlImportModelCommand extends Command {
elementListener.setResourceTypes(this.resourceTypes); elementListener.setResourceTypes(this.resourceTypes);
elementListener.setActivityTypes(this.activityTypes); elementListener.setActivityTypes(this.activityTypes);
long start = System.nanoTime();
XmlModelSaxFileReader handler = new XmlModelSaxFileReader(elementListener, this.modelFile, this.allowInclude); XmlModelSaxFileReader handler = new XmlModelSaxFileReader(elementListener, this.modelFile, this.allowInclude);
handler.parseFile(); handler.parseFile();
this.statistics = handler.getStatistics(); this.statistics = elementListener.getStatistics();
this.statistics.durationNanos = System.nanoTime() - start;
} }
@Override @Override
@ -85,16 +87,14 @@ public class XmlImportModelCommand extends Command {
logger.warn("Not undoing import of file " + this.modelFile); logger.warn("Not undoing import of file " + this.modelFile);
} }
/** public void setFailOnUpdate(boolean failOnUpdate) {
* @param modelFileName this.failOnUpdate = failOnUpdate;
*/ }
public void setModelFile(File modelFileName) { public void setModelFile(File modelFileName) {
this.modelFile = modelFileName; this.modelFile = modelFileName;
} }
/**
* @param allowInclude
*/
public void setAllowInclude(boolean allowInclude) { public void setAllowInclude(boolean allowInclude) {
this.allowInclude = allowInclude; this.allowInclude = allowInclude;
} }

6
li.strolch.service/src/main/java/li/strolch/service/XmlImportModelArgument.java
View File

@ -22,6 +22,7 @@ import li.strolch.service.api.ServiceArgument;
public class XmlImportModelArgument extends ServiceArgument { public class XmlImportModelArgument extends ServiceArgument {
public String modelFileName; public String modelFileName;
public boolean failOnUpdate = false;
public boolean external = false; public boolean external = false;
public boolean allowInclude = true; public boolean allowInclude = true;
public boolean addOrders = true; public boolean addOrders = true;
@ -39,7 +40,10 @@ public class XmlImportModelArgument extends ServiceArgument {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append("XmlImportModelArgument [ "); builder.append("XmlImportModelArgument [ ");
builder.append("external="); builder.append("failOnUpdate=");
builder.append(this.failOnUpdate);
builder.append(", external=");
builder.append(this.external); builder.append(this.external);
builder.append(", allowInclude="); builder.append(", allowInclude=");

15
li.strolch.service/src/main/java/li/strolch/service/XmlImportModelService.java
View File

@ -75,6 +75,7 @@ public class XmlImportModelService extends AbstractService<XmlImportModelArgumen
try (StrolchTransaction tx = openArgOrUserTx(arg)) { try (StrolchTransaction tx = openArgOrUserTx(arg)) {
command = new XmlImportModelCommand(tx); command = new XmlImportModelCommand(tx);
command.setFailOnUpdate(arg.failOnUpdate);
command.setModelFile(modelFile); command.setModelFile(modelFile);
command.setAllowInclude(arg.allowInclude); command.setAllowInclude(arg.allowInclude);
command.setAddOrders(arg.addOrders); command.setAddOrders(arg.addOrders);
@ -87,18 +88,18 @@ public class XmlImportModelService extends AbstractService<XmlImportModelArgumen
command.setResourceTypes(arg.resourceTypes); command.setResourceTypes(arg.resourceTypes);
command.setActivityTypes(arg.activityTypes); command.setActivityTypes(arg.activityTypes);
tx.addCommand(command); command.validate();
command.doCommand();
tx.commitOnClose(); tx.commitOnClose();
} }
ModelStatistics statistics = command.getStatistics(); ModelStatistics statistics = command.getStatistics();
String durationS = StringHelper.formatNanoDuration(statistics.durationNanos); String durationS = StringHelper.formatNanoDuration(statistics.durationNanos);
logger.info(MessageFormat logger.info(MessageFormat.format("Loading XML Model file {0} for realm {1} took {2}.", modelFile.getName(),
.format("Loading XML Model file {0} for realm {1} took {2}.", modelFile.getName(), //$NON-NLS-1$ arg.realm, durationS));
arg.realm, durationS)); logger.info(MessageFormat.format("Loaded {0} Orders", statistics.nrOfOrders));
logger.info(MessageFormat.format("Loaded {0} Orders", statistics.nrOfOrders)); //$NON-NLS-1$ logger.info(MessageFormat.format("Loaded {0} Resources", statistics.nrOfResources));
logger.info(MessageFormat.format("Loaded {0} Resources", statistics.nrOfResources)); //$NON-NLS-1$ logger.info(MessageFormat.format("Loaded {0} Activities", statistics.nrOfActivities));
logger.info(MessageFormat.format("Loaded {0} Activities", statistics.nrOfActivities)); //$NON-NLS-1$
return new XmlImportModelResult(statistics); return new XmlImportModelResult(statistics);
} }