-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ninja: split of audit options from previous hierchy, queue type fixes
producer->consumer queue was recently migrated to Containerable, but some PrismObjects were still forgotten, now it's fixed. Options for audit import/export inherited unusable options, fixed.
- Loading branch information
Showing
28 changed files
with
273 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
.../src/main/java/com/evolveum/midpoint/ninja/action/audit/BaseAuditImportExportOptions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright (C) 2010-2021 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.ninja.action.audit; | ||
|
|
||
| import com.beust.jcommander.Parameter; | ||
|
|
||
| import com.evolveum.midpoint.ninja.util.FileReference; | ||
| import com.evolveum.midpoint.ninja.util.FileReferenceConverter; | ||
|
|
||
| public class BaseAuditImportExportOptions { | ||
|
|
||
| public static final String P_FILTER = "-f"; | ||
| public static final String P_FILTER_LONG = "--filter"; | ||
|
|
||
| public static final String P_ZIP = "-z"; | ||
| public static final String P_ZIP_LONG = "--zip"; | ||
|
|
||
| public static final String P_MULTI_THREAD = "-l"; | ||
| public static final String P_MULTI_THREAD_LONG = "--multi-thread"; | ||
|
|
||
| @Parameter(names = { P_FILTER, P_FILTER_LONG }, descriptionKey = "base.filter", | ||
| converter = FileReferenceConverter.class, validateWith = FileReferenceConverter.class) | ||
| private FileReference filter; | ||
|
|
||
| @Parameter(names = { P_ZIP, P_ZIP_LONG }, descriptionKey = "baseImportExport.zip") | ||
| private boolean zip; | ||
|
|
||
| @Parameter(names = { P_MULTI_THREAD, P_MULTI_THREAD_LONG }, descriptionKey = "baseImportExport.multiThread") | ||
| private int multiThread = 1; | ||
|
|
||
| public FileReference getFilter() { | ||
| return filter; | ||
| } | ||
|
|
||
| public boolean isZip() { | ||
| return zip; | ||
| } | ||
|
|
||
| public int getMultiThread() { | ||
| return multiThread; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/audit/ExportAuditOptions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright (C) 2010-2021 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.ninja.action.audit; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| import com.beust.jcommander.Parameter; | ||
| import com.beust.jcommander.Parameters; | ||
|
|
||
| import com.evolveum.midpoint.ninja.opts.BasicExportOptions; | ||
|
|
||
| @Parameters(resourceBundle = "messages", commandDescriptionKey = "exportAudit") | ||
| public class ExportAuditOptions extends BaseAuditImportExportOptions implements BasicExportOptions { | ||
|
|
||
| public static final String P_OUTPUT = "-O"; | ||
| public static final String P_OUTPUT_LONG = "--output"; | ||
|
|
||
| public static final String P_OVERWRITE = "-ow"; | ||
| public static final String P_OVERWRITE_LONG = "--overwrite"; | ||
|
|
||
| @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; | ||
|
|
||
| public File getOutput() { | ||
| return output; | ||
| } | ||
|
|
||
| public boolean isOverwrite() { | ||
| return overwrite; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.