Skip to content

Commit

Permalink
ninja: Added support for export without container ids
Browse files Browse the repository at this point in the history
  • Loading branch information
tonydamage committed Aug 13, 2021
1 parent 48a04ec commit 21d63a2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
package com.evolveum.midpoint.ninja.action.worker;

import com.evolveum.midpoint.ninja.impl.NinjaContext;
import com.evolveum.midpoint.ninja.impl.NinjaException;
import com.evolveum.midpoint.ninja.opts.ExportOptions;
import com.evolveum.midpoint.ninja.util.Log;
import com.evolveum.midpoint.ninja.util.NinjaUtils;
import com.evolveum.midpoint.ninja.util.OperationStatus;
import com.evolveum.midpoint.prism.PrismObject;
Expand All @@ -22,7 +20,6 @@
import java.io.IOException;
import java.io.Writer;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;

/**
* Created by Viliam Repan (lazyman).
Expand All @@ -40,7 +37,7 @@ public ExportConsumerWorker(NinjaContext context, ExportOptions options, Blockin
protected void init() {
serializer = context.getPrismContext()
.xmlSerializer()
.options(SerializationOptions.createSerializeForExport());
.options(SerializationOptions.createSerializeForExport().skipContainerIds(options.isSkipContainerIds()));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,18 @@ public class ExportOptions extends BaseImportExportOptions {
public static final String P_SPLIT = "-n";
public static final String P_SPLIT_LONG = "-split";

public static final String P_NO_IDS = "-ni";
public static final String P_NO_IDS_LONG = "--no-container-ids";

@Parameter(names = {P_OUTPUT, P_OUTPUT_LONG}, descriptionKey = "export.output")
private File output;

@Parameter(names = {P_OVERWRITE, P_OVERWRITE_LONG}, descriptionKey = "export.overwrite")
private boolean overwrite;

@Parameter(names = {P_NO_IDS, P_NO_IDS_LONG}, descriptionKey = "export.skipids")
private boolean skipIds;

// @Parameter(names = {P_SPLIT, P_SPLIT_LONG}, descriptionKey = "export.split")
// private boolean split;

Expand All @@ -43,6 +49,10 @@ public boolean isOverwrite() {
return overwrite;
}

public boolean isSkipContainerIds() {
return skipIds;
}

// public boolean isSplit() {
// return split;
// }
Expand Down
1 change: 1 addition & 0 deletions tools/ninja/src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export=Exports objects from midPoint
export.output=
export.overwrite=
export.split=
export.skipids=Skips container ids
verify=Verify objects in midPoint repository
verify.warn=List of displayed warning categories, e.g. deprecated,plannedRemoval
passwordReset=Command will reset password of user specified by oid
Expand Down

0 comments on commit 21d63a2

Please sign in to comment.