diff --git a/keytool-api-8/src/main/java/org/codehaus/mojo/keytool/DefaultKeyToolCommandLineBuilder.java b/keytool-api-8/src/main/java/org/codehaus/mojo/keytool/DefaultKeyToolCommandLineBuilder.java
index 2800f79..3e1ffc9 100644
--- a/keytool-api-8/src/main/java/org/codehaus/mojo/keytool/DefaultKeyToolCommandLineBuilder.java
+++ b/keytool-api-8/src/main/java/org/codehaus/mojo/keytool/DefaultKeyToolCommandLineBuilder.java
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.maven.shared.utils.cli.Commandline;
import org.codehaus.mojo.keytool.requests.KeyToolChangeAliasRequest;
import org.codehaus.mojo.keytool.requests.KeyToolChangeKeyPasswordRequest;
@@ -34,20 +37,15 @@
import org.codehaus.mojo.keytool.requests.KeyToolPrintCertificateRequestRequest;
import org.codehaus.plexus.component.annotations.Component;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* To build the command line for a given {@link org.codehaus.mojo.keytool.KeyToolRequest}.
*
* @author tchemit
-
+ *
* @since 1.1
*/
-@Component( role = KeyToolCommandLineBuilder.class, hint = "default" )
-public class DefaultKeyToolCommandLineBuilder
- extends AbstractKeyToolCommandLineBuilder
-{
+@Component(role = KeyToolCommandLineBuilder.class, hint = "default")
+public class DefaultKeyToolCommandLineBuilder extends AbstractKeyToolCommandLineBuilder {
/**
* Unsupported request types.
@@ -59,95 +57,76 @@ public class DefaultKeyToolCommandLineBuilder
/**
* Constructor for DefaultKeyToolCommandLineBuilder.
*/
- public DefaultKeyToolCommandLineBuilder()
- {
+ public DefaultKeyToolCommandLineBuilder() {
this.unsupportedRequestTypes = new HashSet<>();
}
/** {@inheritDoc} */
- public boolean supportRequestType( Class requestType )
- {
- return !unsupportedRequestTypes.contains( requestType );
+ public boolean supportRequestType(Class requestType) {
+ return !unsupportedRequestTypes.contains(requestType);
}
/** {@inheritDoc} */
- public Commandline build( KeyToolRequest request )
- throws CommandLineConfigurationException, UnsupportedKeyToolRequestException
- {
+ public Commandline build(KeyToolRequest request)
+ throws CommandLineConfigurationException, UnsupportedKeyToolRequestException {
checkRequiredState();
- checkSupportedRequest( request );
+ checkSupportedRequest(request);
Commandline cli = new Commandline();
- cli.setExecutable( getKeyToolFile() );
+ cli.setExecutable(getKeyToolFile());
- cli.setWorkingDirectory( request.getWorkingDirectory() );
+ cli.setWorkingDirectory(request.getWorkingDirectory());
- if ( request instanceof KeyToolChangeAliasRequest )
- {
- build( (KeyToolChangeAliasRequest) request, cli );
+ if (request instanceof KeyToolChangeAliasRequest) {
+ build((KeyToolChangeAliasRequest) request, cli);
}
- if ( request instanceof KeyToolChangeKeyPasswordRequest )
- {
- build( (KeyToolChangeKeyPasswordRequest) request, cli );
+ if (request instanceof KeyToolChangeKeyPasswordRequest) {
+ build((KeyToolChangeKeyPasswordRequest) request, cli);
}
- if ( request instanceof KeyToolChangeStorePasswordRequest )
- {
- build( (KeyToolChangeStorePasswordRequest) request, cli );
+ if (request instanceof KeyToolChangeStorePasswordRequest) {
+ build((KeyToolChangeStorePasswordRequest) request, cli);
}
- if ( request instanceof KeyToolDeleteRequest )
- {
- build( (KeyToolDeleteRequest) request, cli );
+ if (request instanceof KeyToolDeleteRequest) {
+ build((KeyToolDeleteRequest) request, cli);
}
- if ( request instanceof KeyToolExportCertificateRequest )
- {
- build( (KeyToolExportCertificateRequest) request, cli );
+ if (request instanceof KeyToolExportCertificateRequest) {
+ build((KeyToolExportCertificateRequest) request, cli);
}
- if ( request instanceof KeyToolGenerateCertificateRequest )
- {
- build( (KeyToolGenerateCertificateRequest) request, cli );
+ if (request instanceof KeyToolGenerateCertificateRequest) {
+ build((KeyToolGenerateCertificateRequest) request, cli);
}
- if ( request instanceof KeyToolGenerateCertificateRequestRequest )
- {
- build( (KeyToolGenerateCertificateRequestRequest) request, cli );
+ if (request instanceof KeyToolGenerateCertificateRequestRequest) {
+ build((KeyToolGenerateCertificateRequestRequest) request, cli);
}
- if ( request instanceof KeyToolGenerateKeyPairRequest )
- {
- build( (KeyToolGenerateKeyPairRequest) request, cli );
+ if (request instanceof KeyToolGenerateKeyPairRequest) {
+ build((KeyToolGenerateKeyPairRequest) request, cli);
}
- if ( request instanceof KeyToolGenerateSecretKeyRequest )
- {
- build( (KeyToolGenerateSecretKeyRequest) request, cli );
+ if (request instanceof KeyToolGenerateSecretKeyRequest) {
+ build((KeyToolGenerateSecretKeyRequest) request, cli);
}
- if ( request instanceof KeyToolImportCertificateRequest )
- {
- build( (KeyToolImportCertificateRequest) request, cli );
+ if (request instanceof KeyToolImportCertificateRequest) {
+ build((KeyToolImportCertificateRequest) request, cli);
}
- if ( request instanceof KeyToolImportKeystoreRequest )
- {
- build( (KeyToolImportKeystoreRequest) request, cli );
+ if (request instanceof KeyToolImportKeystoreRequest) {
+ build((KeyToolImportKeystoreRequest) request, cli);
}
- if ( request instanceof KeyToolListRequest )
- {
- build( (KeyToolListRequest) request, cli );
+ if (request instanceof KeyToolListRequest) {
+ build((KeyToolListRequest) request, cli);
}
- if ( request instanceof KeyToolPrintCertificateRequest )
- {
- build( (KeyToolPrintCertificateRequest) request, cli );
+ if (request instanceof KeyToolPrintCertificateRequest) {
+ build((KeyToolPrintCertificateRequest) request, cli);
}
- if ( request instanceof KeyToolPrintCertificateRequestRequest )
- {
- build( (KeyToolPrintCertificateRequestRequest) request, cli );
+ if (request instanceof KeyToolPrintCertificateRequestRequest) {
+ build((KeyToolPrintCertificateRequestRequest) request, cli);
}
- if ( request instanceof KeyToolPrintCRLFileRequest )
- {
- build( (KeyToolPrintCRLFileRequest) request, cli );
+ if (request instanceof KeyToolPrintCRLFileRequest) {
+ build((KeyToolPrintCRLFileRequest) request, cli);
}
String[] arguments = request.getArguments();
- if ( arguments != null )
- {
- cli.addArguments( arguments );
+ if (arguments != null) {
+ cli.addArguments(arguments);
}
return cli;
@@ -159,11 +138,10 @@ public Commandline build( KeyToolRequest request )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolChangeAliasRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-changealias", request );
- addArgIfNotEmpty( cli, "-destalias", request.getDestalias() );
- addArgIfNotEmpty( cli, "-keypass", request.getKeypass() );
+ protected void build(KeyToolChangeAliasRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-changealias", request);
+ addArgIfNotEmpty(cli, "-destalias", request.getDestalias());
+ addArgIfNotEmpty(cli, "-keypass", request.getKeypass());
}
/**
@@ -172,11 +150,10 @@ protected void build( KeyToolChangeAliasRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolChangeKeyPasswordRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-keypasswd", request );
- addArgIfNotEmpty( cli, "-keypass", request.getKeypass() );
- addArgIfNotEmpty( cli, "-new", request.getNewPassword() );
+ protected void build(KeyToolChangeKeyPasswordRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-keypasswd", request);
+ addArgIfNotEmpty(cli, "-keypass", request.getKeypass());
+ addArgIfNotEmpty(cli, "-new", request.getNewPassword());
}
/**
@@ -185,10 +162,9 @@ protected void build( KeyToolChangeKeyPasswordRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolChangeStorePasswordRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-storepasswd", request );
- addArgIfNotEmpty( cli, "-new", request.getNewPassword() );
+ protected void build(KeyToolChangeStorePasswordRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-storepasswd", request);
+ addArgIfNotEmpty(cli, "-new", request.getNewPassword());
}
/**
@@ -197,9 +173,8 @@ protected void build( KeyToolChangeStorePasswordRequest request, Commandline cli
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolDeleteRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-delete", request );
+ protected void build(KeyToolDeleteRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-delete", request);
}
/**
@@ -208,11 +183,10 @@ protected void build( KeyToolDeleteRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolExportCertificateRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-export", request );
- addArgIfTrue( cli, "-rfc", request.isRfc() );
- addArgIfNotEmpty( cli, "-file", request.getFile() );
+ protected void build(KeyToolExportCertificateRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-export", request);
+ addArgIfTrue(cli, "-rfc", request.isRfc());
+ addArgIfNotEmpty(cli, "-file", request.getFile());
}
/**
@@ -221,18 +195,17 @@ protected void build( KeyToolExportCertificateRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolGenerateCertificateRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-gencert", request );
- addArgIfTrue( cli, "-rfc", request.isRfc() );
- addArgIfNotEmpty( cli, "-infile", request.getInfile() );
- addArgIfNotEmpty( cli, "-outfile", request.getOutfile() );
- addArgIfNotEmpty( cli, "-sigalg", request.getSigalg() );
- addArgIfNotEmpty( cli, "-dname", request.getDname() );
- addArgIfNotEmpty( cli, "-startdate", request.getStartdate() );
- addArgsIfNotEmpty( cli, "-ext", request.getExts() );
- addArgIfNotEmpty( cli, "-validity", request.getValidity() );
- addArgIfNotEmpty( cli, "-keypass", request.getKeypass() );
+ protected void build(KeyToolGenerateCertificateRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-gencert", request);
+ addArgIfTrue(cli, "-rfc", request.isRfc());
+ addArgIfNotEmpty(cli, "-infile", request.getInfile());
+ addArgIfNotEmpty(cli, "-outfile", request.getOutfile());
+ addArgIfNotEmpty(cli, "-sigalg", request.getSigalg());
+ addArgIfNotEmpty(cli, "-dname", request.getDname());
+ addArgIfNotEmpty(cli, "-startdate", request.getStartdate());
+ addArgsIfNotEmpty(cli, "-ext", request.getExts());
+ addArgIfNotEmpty(cli, "-validity", request.getValidity());
+ addArgIfNotEmpty(cli, "-keypass", request.getKeypass());
}
/**
@@ -241,14 +214,13 @@ protected void build( KeyToolGenerateCertificateRequest request, Commandline cli
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolGenerateCertificateRequestRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-certreq", request );
- addArgIfNotEmpty( cli, "-sigalg", request.getSigalg() );
- addArgsIfNotEmpty( cli, "-ext", request.getExts() );
- addArgIfNotEmpty( cli, "-file", request.getFile() );
- addArgIfNotEmpty( cli, "-keypass", request.getKeypass() );
- addArgIfNotEmpty( cli, "-dname", request.getDname() );
+ protected void build(KeyToolGenerateCertificateRequestRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-certreq", request);
+ addArgIfNotEmpty(cli, "-sigalg", request.getSigalg());
+ addArgsIfNotEmpty(cli, "-ext", request.getExts());
+ addArgIfNotEmpty(cli, "-file", request.getFile());
+ addArgIfNotEmpty(cli, "-keypass", request.getKeypass());
+ addArgIfNotEmpty(cli, "-dname", request.getDname());
}
/**
@@ -257,17 +229,16 @@ protected void build( KeyToolGenerateCertificateRequestRequest request, Commandl
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolGenerateKeyPairRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-genkeypair", request );
- addArgIfNotEmpty( cli, "-dname", request.getDname() );
- addArgIfNotEmpty( cli, "-keypass", request.getKeypass() );
- addArgIfNotEmpty( cli, "-validity", request.getValidity() );
- addArgIfNotEmpty( cli, "-keyalg", request.getKeyalg() );
- addArgIfNotEmpty( cli, "-keysize", request.getKeysize() );
- addArgIfNotEmpty( cli, "-sigalg", request.getSigalg() );
- addArgIfNotEmpty( cli, "-startdate", request.getStartdate() );
- addArgsIfNotEmpty( cli, "-ext", request.getExts() );
+ protected void build(KeyToolGenerateKeyPairRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-genkeypair", request);
+ addArgIfNotEmpty(cli, "-dname", request.getDname());
+ addArgIfNotEmpty(cli, "-keypass", request.getKeypass());
+ addArgIfNotEmpty(cli, "-validity", request.getValidity());
+ addArgIfNotEmpty(cli, "-keyalg", request.getKeyalg());
+ addArgIfNotEmpty(cli, "-keysize", request.getKeysize());
+ addArgIfNotEmpty(cli, "-sigalg", request.getSigalg());
+ addArgIfNotEmpty(cli, "-startdate", request.getStartdate());
+ addArgsIfNotEmpty(cli, "-ext", request.getExts());
}
/**
@@ -276,12 +247,11 @@ protected void build( KeyToolGenerateKeyPairRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolGenerateSecretKeyRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-genseckey", request );
- addArgIfNotEmpty( cli, "-keypass", request.getKeypass() );
- addArgIfNotEmpty( cli, "-keyalg", request.getKeyalg() );
- addArgIfNotEmpty( cli, "-keysize", request.getKeysize() );
+ protected void build(KeyToolGenerateSecretKeyRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-genseckey", request);
+ addArgIfNotEmpty(cli, "-keypass", request.getKeypass());
+ addArgIfNotEmpty(cli, "-keyalg", request.getKeyalg());
+ addArgIfNotEmpty(cli, "-keysize", request.getKeysize());
}
/**
@@ -290,13 +260,12 @@ protected void build( KeyToolGenerateSecretKeyRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolImportCertificateRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-importcert", request );
- addArgIfTrue( cli, "-noprompt", request.isNoprompt() );
- addArgIfTrue( cli, "-trustcacerts", request.isTrustcacerts() );
- addArgIfNotEmpty( cli, "-file", request.getFile() );
- addArgIfNotEmpty( cli, "-keypass", request.getKeypass() );
+ protected void build(KeyToolImportCertificateRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-importcert", request);
+ addArgIfTrue(cli, "-noprompt", request.isNoprompt());
+ addArgIfTrue(cli, "-trustcacerts", request.isTrustcacerts());
+ addArgIfNotEmpty(cli, "-file", request.getFile());
+ addArgIfNotEmpty(cli, "-keypass", request.getKeypass());
}
/**
@@ -305,26 +274,25 @@ protected void build( KeyToolImportCertificateRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolImportKeystoreRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-importkeystore", request );
- addArgIfTrue( cli, "-noprompt", request.isNoprompt() );
- addArgIfNotEmpty( cli, "-srcprotected", request.isSrcprotected() ? Boolean.TRUE.toString() : "" );
- addArgIfNotEmpty( cli, "-srckeystore", request.getSrckeystore() );
- addArgIfNotEmpty( cli, "-destkeystore", request.getDestkeystore() );
- addArgIfNotEmpty( cli, "-srcstoretype", request.getSrcstoretype() );
- addArgIfNotEmpty( cli, "-deststoretype", request.getDeststoretype() );
- addArgIfNotEmpty( cli, "-srcstorepass", request.getSrcstorepass() );
- addArgIfNotEmpty( cli, "-deststorepass", request.getDeststorepass() );
- addArgIfNotEmpty( cli, "-srcprovidername", request.getSrcprovidername() );
- addArgIfNotEmpty( cli, "-destprovidername", request.getDestprovidername() );
- addArgIfNotEmpty( cli, "-srcalias", request.getSrcalias() );
- addArgIfNotEmpty( cli, "-destalias", request.getDestalias() );
- addArgIfNotEmpty( cli, "-srckeypass", request.getSrckeypass() );
- addArgIfNotEmpty( cli, "-destkeypass", request.getDestkeypass() );
- addArgIfNotEmpty( cli, "-providerclass", request.getProviderclass() );
- addArgIfNotEmpty( cli, "-providerarg", request.getProviderarg() );
- addArgIfNotEmpty( cli, "-providerpath", request.getProviderpath() );
+ protected void build(KeyToolImportKeystoreRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-importkeystore", request);
+ addArgIfTrue(cli, "-noprompt", request.isNoprompt());
+ addArgIfNotEmpty(cli, "-srcprotected", request.isSrcprotected() ? Boolean.TRUE.toString() : "");
+ addArgIfNotEmpty(cli, "-srckeystore", request.getSrckeystore());
+ addArgIfNotEmpty(cli, "-destkeystore", request.getDestkeystore());
+ addArgIfNotEmpty(cli, "-srcstoretype", request.getSrcstoretype());
+ addArgIfNotEmpty(cli, "-deststoretype", request.getDeststoretype());
+ addArgIfNotEmpty(cli, "-srcstorepass", request.getSrcstorepass());
+ addArgIfNotEmpty(cli, "-deststorepass", request.getDeststorepass());
+ addArgIfNotEmpty(cli, "-srcprovidername", request.getSrcprovidername());
+ addArgIfNotEmpty(cli, "-destprovidername", request.getDestprovidername());
+ addArgIfNotEmpty(cli, "-srcalias", request.getSrcalias());
+ addArgIfNotEmpty(cli, "-destalias", request.getDestalias());
+ addArgIfNotEmpty(cli, "-srckeypass", request.getSrckeypass());
+ addArgIfNotEmpty(cli, "-destkeypass", request.getDestkeypass());
+ addArgIfNotEmpty(cli, "-providerclass", request.getProviderclass());
+ addArgIfNotEmpty(cli, "-providerarg", request.getProviderarg());
+ addArgIfNotEmpty(cli, "-providerpath", request.getProviderpath());
}
/**
@@ -333,10 +301,9 @@ protected void build( KeyToolImportKeystoreRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolListRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-list", request );
- addArgIfTrue( cli, "-rfc", request.isRfc() );
+ protected void build(KeyToolListRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-list", request);
+ addArgIfTrue(cli, "-rfc", request.isRfc());
}
/**
@@ -345,13 +312,12 @@ protected void build( KeyToolListRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolPrintCertificateRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-printcert", request );
- addArgIfTrue( cli, "-rfc", request.isRfc() );
- addArgIfNotEmpty( cli, "-file", request.getFile() );
- addArgIfNotEmpty( cli, "-sslserver", request.getSslserver() );
- addArgIfNotEmpty( cli, "-jarfile", request.getJarfile() );
+ protected void build(KeyToolPrintCertificateRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-printcert", request);
+ addArgIfTrue(cli, "-rfc", request.isRfc());
+ addArgIfNotEmpty(cli, "-file", request.getFile());
+ addArgIfNotEmpty(cli, "-sslserver", request.getSslserver());
+ addArgIfNotEmpty(cli, "-jarfile", request.getJarfile());
}
/**
@@ -360,10 +326,9 @@ protected void build( KeyToolPrintCertificateRequest request, Commandline cli )
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolPrintCertificateRequestRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-printcertreq", request );
- addArgIfNotEmpty( cli, "-file", request.getFile() );
+ protected void build(KeyToolPrintCertificateRequestRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-printcertreq", request);
+ addArgIfNotEmpty(cli, "-file", request.getFile());
}
/**
@@ -372,10 +337,8 @@ protected void build( KeyToolPrintCertificateRequestRequest request, Commandline
* @param request the keytool request to consume
* @param cli the commandline client to prepare
*/
- protected void build( KeyToolPrintCRLFileRequest request, Commandline cli )
- {
- addKeytoolCommandAndDefaultoptions( cli, "-printcrl", request );
- addArgIfNotEmpty( cli, "-file", request.getFile() );
+ protected void build(KeyToolPrintCRLFileRequest request, Commandline cli) {
+ addKeytoolCommandAndDefaultoptions(cli, "-printcrl", request);
+ addArgIfNotEmpty(cli, "-file", request.getFile());
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeAliasRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeAliasRequestIT.java
index c38628a..36b0aa3 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeAliasRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeAliasRequestIT.java
@@ -16,27 +16,38 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolChangeAliasRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolChangeAliasRequestIT
- extends AbstractKeyToolChangeAliasRequestIT
-{
+public class KeyToolChangeAliasRequestIT extends AbstractKeyToolChangeAliasRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-changealias", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "foo_alias", "-destalias", "new_alias",
- "-keypass", "key-passwd" }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-changealias",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "foo_alias",
+ "-destalias",
+ "new_alias",
+ "-keypass",
+ "key-passwd"
+ },
+ 0);
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeKeyPasswordRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeKeyPasswordRequestIT.java
index c32e62b..60eab69 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeKeyPasswordRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeKeyPasswordRequestIT.java
@@ -16,26 +16,38 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolChangeKeyPasswordRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolChangeKeyPasswordRequestIT
- extends AbstractKeyToolChangeKeyPasswordRequestIT
-{
+public class KeyToolChangeKeyPasswordRequestIT extends AbstractKeyToolChangeKeyPasswordRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-keypasswd", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "foo_alias", "-keypass", "key-passwd",
- "-new", "new-key-passwd", }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-keypasswd",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "foo_alias",
+ "-keypass",
+ "key-passwd",
+ "-new",
+ "new-key-passwd",
+ },
+ 0);
}
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeStorePasswordRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeStorePasswordRequestIT.java
index d4fc618..4db27bd 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeStorePasswordRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolChangeStorePasswordRequestIT.java
@@ -16,26 +16,34 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolChangeStorePasswordRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolChangeStorePasswordRequestIT
- extends AbstractKeyToolChangeStorePasswordRequestIT
-{
+public class KeyToolChangeStorePasswordRequestIT extends AbstractKeyToolChangeStorePasswordRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-storepasswd", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-new", "new-changeit", }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-storepasswd",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-new",
+ "new-changeit",
+ },
+ 0);
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolDeleteRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolDeleteRequestIT.java
index 8fe5afa..0c50dee 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolDeleteRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolDeleteRequestIT.java
@@ -16,26 +16,34 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolDeleteRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolDeleteRequestIT
- extends AbstractKeyToolDeleteRequestIT
-{
+public class KeyToolDeleteRequestIT extends AbstractKeyToolDeleteRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-delete", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "foo_alias" }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-delete",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "foo_alias"
+ },
+ 0);
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolExportCertificateRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolExportCertificateRequestIT.java
index 25e5a65..6d2feab 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolExportCertificateRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolExportCertificateRequestIT.java
@@ -16,29 +16,39 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolExportCertificateRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolExportCertificateRequestIT
- extends AbstractKeyToolExportCertificateRequestIT
-{
+public class KeyToolExportCertificateRequestIT extends AbstractKeyToolExportCertificateRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore, File outputFile )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-export", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "foo_alias", "-rfc", "-file",
- outputFile.getAbsolutePath() }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore, File outputFile) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-export",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "foo_alias",
+ "-rfc",
+ "-file",
+ outputFile.getAbsolutePath()
+ },
+ 0);
- assertTrue( outputFile.exists() );
+ assertTrue(outputFile.exists());
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestIT.java
index ae0d8d6..0c178fd 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestIT.java
@@ -16,32 +16,51 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
import org.junit.Assert;
-import java.io.File;
-
/**
* Test the {@link KeyToolGenerateCertificateRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolGenerateCertificateRequestIT
- extends AbstractKeyToolGenerateCertificateRequestIT
-{
+public class KeyToolGenerateCertificateRequestIT extends AbstractKeyToolGenerateCertificateRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore, File inFile, File outputFile )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-gencert", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "foo_alias", "-rfc", "-infile",
- inFile.getAbsolutePath(), "-outfile", outputFile.getAbsolutePath(), "-sigalg",
- "SHA1withDSA", "-dname",
- "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France", "-startdate",
- "2011/11/11", "-validity", "100", "-keypass", "key-passwd" }, 0 );
- Assert.assertTrue( outputFile.exists() );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore, File inFile, File outputFile) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-gencert",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "foo_alias",
+ "-rfc",
+ "-infile",
+ inFile.getAbsolutePath(),
+ "-outfile",
+ outputFile.getAbsolutePath(),
+ "-sigalg",
+ "SHA1withDSA",
+ "-dname",
+ "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France",
+ "-startdate",
+ "2011/11/11",
+ "-validity",
+ "100",
+ "-keypass",
+ "key-passwd"
+ },
+ 0);
+ Assert.assertTrue(outputFile.exists());
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestRequestIT.java
index 9cfe0c8..d479872 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestRequestIT.java
@@ -16,28 +16,43 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolGenerateCertificateRequestRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolGenerateCertificateRequestRequestIT
- extends AbstractKeyToolGenerateCertificateRequestRequestIT
-{
+public class KeyToolGenerateCertificateRequestRequestIT extends AbstractKeyToolGenerateCertificateRequestRequestIT {
- protected void requestResult( JavaToolResult keyToolResult, File keyStore, File outputFile )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-certreq", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "foo_alias", "-sigalg", "SHA1withDSA",
- "-file", outputFile.getAbsolutePath(), "-keypass", "key-passwd", "-dname",
- "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France" }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore, File outputFile) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-certreq",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "foo_alias",
+ "-sigalg",
+ "SHA1withDSA",
+ "-file",
+ outputFile.getAbsolutePath(),
+ "-keypass",
+ "key-passwd",
+ "-dname",
+ "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France"
+ },
+ 0);
- assertTrue( outputFile.exists() );
+ assertTrue(outputFile.exists());
}
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateKeyPairRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateKeyPairRequestIT.java
index 7d168ce..a3c614d 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateKeyPairRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateKeyPairRequestIT.java
@@ -16,33 +16,52 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
import org.junit.Assert;
-import java.io.File;
-
/**
* Test the {@link KeyToolGenerateKeyPairRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolGenerateKeyPairRequestIT
- extends AbstractKeyToolGenerateKeyPairRequestIT
-{
+public class KeyToolGenerateKeyPairRequestIT extends AbstractKeyToolGenerateKeyPairRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-genkeypair", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "dest_foo_alias", "-dname",
- "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France", "-keypass",
- "key-passwd", "-validity", "100", "-keyalg", "DSA", "-keysize", "1024", "-sigalg",
- "SHA1withDSA", "-startdate", "2011/11/11" }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-genkeypair",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "dest_foo_alias",
+ "-dname",
+ "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France",
+ "-keypass",
+ "key-passwd",
+ "-validity",
+ "100",
+ "-keyalg",
+ "DSA",
+ "-keysize",
+ "1024",
+ "-sigalg",
+ "SHA1withDSA",
+ "-startdate",
+ "2011/11/11"
+ },
+ 0);
// key store was created
- Assert.assertTrue( keyStore.exists() );
+ Assert.assertTrue(keyStore.exists());
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateSecretKeyRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateSecretKeyRequestIT.java
index 45f6a4e..98a85b7 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateSecretKeyRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateSecretKeyRequestIT.java
@@ -16,27 +16,41 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolGenerateSecretKeyRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolGenerateSecretKeyRequestIT
- extends AbstractKeyToolGenerateSecretKeyRequestIT
-{
+public class KeyToolGenerateSecretKeyRequestIT extends AbstractKeyToolGenerateSecretKeyRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-genseckey", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "new_foo_alias", "-keypass", "key-passwd",
- "-keyalg", "DES", "-keysize", "56" }, 1 );
- //FIXME tchemit 2011-11-06 Can not generate in this keystore a non private key, make this works
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-genseckey",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "new_foo_alias",
+ "-keypass",
+ "key-passwd",
+ "-keyalg",
+ "DES",
+ "-keysize",
+ "56"
+ },
+ 1);
+ // FIXME tchemit 2011-11-06 Can not generate in this keystore a non private key, make this works
}
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolImportCertificateRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolImportCertificateRequestIT.java
index ba3487e..5f91c45 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolImportCertificateRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolImportCertificateRequestIT.java
@@ -16,32 +16,45 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolImportCertificateRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolImportCertificateRequestIT
- extends AbstractKeyToolImportCertificateRequestIT
-{
+public class KeyToolImportCertificateRequestIT extends AbstractKeyToolImportCertificateRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore, File file )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-importcert", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "foo_alias2", "-noprompt", "-trustcacerts",
- "-file", file.getAbsolutePath(), "-keypass", "new-passwd" }, 0 );
-
- assertTrue( file.exists() );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore, File file) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-importcert",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "foo_alias2",
+ "-noprompt",
+ "-trustcacerts",
+ "-file",
+ file.getAbsolutePath(),
+ "-keypass",
+ "new-passwd"
+ },
+ 0);
+
+ assertTrue(file.exists());
// key store was created
- assertTrue( keyStore.exists() );
+ assertTrue(keyStore.exists());
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolImportKeystoreRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolImportKeystoreRequestIT.java
index db6f6a5..d0e33d0 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolImportKeystoreRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolImportKeystoreRequestIT.java
@@ -16,29 +16,49 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolImportKeystoreRequest}.
*
* @author tchemit
* @since 1.3
*/
-public class KeyToolImportKeystoreRequestIT
- extends AbstractKeyToolImportKeystoreRequestIT
-{
+public class KeyToolImportKeystoreRequestIT extends AbstractKeyToolImportKeystoreRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File srcKeyStore, File destKeyStore )
- {
- assertKeyToolResult( keyToolResult, new String[]{ "-importkeystore", "-v", "-noprompt", "-srckeystore",
- srcKeyStore.getAbsolutePath(), "-destkeystore", destKeyStore.getAbsolutePath(), "-srcstoretype", "jks",
- "-deststoretype", "jks", "-srcstorepass", "changeit", "-deststorepass", "changeit", "-srcalias",
- "foo_alias", "-destalias", "new_alias", "-srckeypass", "key-passwd", "-destkeypass", "key-passwd", }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File srcKeyStore, File destKeyStore) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-importkeystore",
+ "-v",
+ "-noprompt",
+ "-srckeystore",
+ srcKeyStore.getAbsolutePath(),
+ "-destkeystore",
+ destKeyStore.getAbsolutePath(),
+ "-srcstoretype",
+ "jks",
+ "-deststoretype",
+ "jks",
+ "-srcstorepass",
+ "changeit",
+ "-deststorepass",
+ "changeit",
+ "-srcalias",
+ "foo_alias",
+ "-destalias",
+ "new_alias",
+ "-srckeypass",
+ "key-passwd",
+ "-destkeypass",
+ "key-passwd",
+ },
+ 0);
- assertTrue( destKeyStore.exists() );
+ assertTrue(destKeyStore.exists());
}
-
-}
\ No newline at end of file
+}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolListRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolListRequestIT.java
index 8f62290..2a90300 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolListRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolListRequestIT.java
@@ -16,26 +16,34 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolListRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolListRequestIT
- extends AbstractKeyToolListRequestIT
-{
+public class KeyToolListRequestIT extends AbstractKeyToolListRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File keyStore )
- {
- assertKeyToolResult( keyToolResult,
- new String[]{ "-list", "-v", "-keystore", keyStore.getAbsolutePath(), "-storepass",
- "changeit", "-storetype", "jks", "-alias", "foo_alias" }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File keyStore) {
+ assertKeyToolResult(
+ keyToolResult,
+ new String[] {
+ "-list",
+ "-v",
+ "-keystore",
+ keyStore.getAbsolutePath(),
+ "-storepass",
+ "changeit",
+ "-storetype",
+ "jks",
+ "-alias",
+ "foo_alias"
+ },
+ 0);
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCRLFileRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCRLFileRequestIT.java
index 140bbca..b76d6aa 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCRLFileRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCRLFileRequestIT.java
@@ -16,27 +16,23 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolPrintCRLFileRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolPrintCRLFileRequestIT
- extends AbstractKeyToolPrintCRLFileRequestIT
-{
+public class KeyToolPrintCRLFileRequestIT extends AbstractKeyToolPrintCRLFileRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File file )
- {
- assertKeyToolResult( keyToolResult, new String[]{ "-printcrl", "-v", "-file", file.getAbsolutePath() }, 1 );
+ protected void requestResult(JavaToolResult keyToolResult, File file) {
+ assertKeyToolResult(keyToolResult, new String[] {"-printcrl", "-v", "-file", file.getAbsolutePath()}, 1);
- //FIXME tchemit 2011-11-06 : this only works with jdk 7
-// ,0);
+ // FIXME tchemit 2011-11-06 : this only works with jdk 7
+ // ,0);
}
-
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestIT.java
index 09ccb01..050672f 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestIT.java
@@ -16,24 +16,21 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolPrintCertificateRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolPrintCertificateRequestIT
- extends AbstractKeyToolPrintCertificateRequestIT
-{
+public class KeyToolPrintCertificateRequestIT extends AbstractKeyToolPrintCertificateRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File file )
- {
- assertKeyToolResult( keyToolResult, new String[]{ "-printcert", "-v", "-rfc", "-file", file.getAbsolutePath() },
- 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File file) {
+ assertKeyToolResult(
+ keyToolResult, new String[] {"-printcert", "-v", "-rfc", "-file", file.getAbsolutePath()}, 0);
}
}
diff --git a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestRequestIT.java b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestRequestIT.java
index 0c67dc5..31ffee2 100644
--- a/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestRequestIT.java
+++ b/keytool-api-8/src/test/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestRequestIT.java
@@ -16,24 +16,20 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link KeyToolPrintCertificateRequestRequest}.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolPrintCertificateRequestRequestIT
- extends AbstractKeyToolPrintCertificateRequestRequestIT
-{
+public class KeyToolPrintCertificateRequestRequestIT extends AbstractKeyToolPrintCertificateRequestRequestIT {
@Override
- protected void requestResult( JavaToolResult keyToolResult, File file )
- {
- assertKeyToolResult( keyToolResult, new String[]{ "-printcertreq", "-v", "-file", file.getAbsolutePath() }, 0 );
+ protected void requestResult(JavaToolResult keyToolResult, File file) {
+ assertKeyToolResult(keyToolResult, new String[] {"-printcertreq", "-v", "-file", file.getAbsolutePath()}, 0);
}
-
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeAliasRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeAliasRequestIT.java
index 1455861..24a262e 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeAliasRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeAliasRequestIT.java
@@ -16,50 +16,43 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolChangeAliasRequest}.
*
* @author tchemit
* @since 1.1
*/
-public abstract class AbstractKeyToolChangeAliasRequestIT
- extends AbstractKeyToolRequestIT
-{
+public abstract class AbstractKeyToolChangeAliasRequestIT extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolChangeAliasRequestIT.
*/
- protected AbstractKeyToolChangeAliasRequestIT()
- {
- }
+ protected AbstractKeyToolChangeAliasRequestIT() {}
/**
* Constructor for AbstractKeyToolChangeAliasRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolChangeAliasRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolChangeAliasRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
- KeyToolChangeAliasRequest request = requestFixtures.createKeyToolChangeAliasRequest( keyStore );
+ KeyToolChangeAliasRequest request = requestFixtures.createKeyToolChangeAliasRequest(keyStore);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, keyStore );
+ requestResult(keyToolResult, keyStore);
}
/**
@@ -68,5 +61,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param keyStore a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore );
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeKeyPasswordRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeKeyPasswordRequestIT.java
index 5f6b6ab..cdaf097 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeKeyPasswordRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeKeyPasswordRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolChangeKeyPasswordRequest}.
*
@@ -27,40 +27,33 @@
* @since 1.1
*/
public abstract class AbstractKeyToolChangeKeyPasswordRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolChangeKeyPasswordRequestIT.
*/
- protected AbstractKeyToolChangeKeyPasswordRequestIT()
- {
- }
+ protected AbstractKeyToolChangeKeyPasswordRequestIT() {}
/**
* Constructor for AbstractKeyToolChangeKeyPasswordRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolChangeKeyPasswordRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolChangeKeyPasswordRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
- KeyToolChangeKeyPasswordRequest request = requestFixtures.createKeyToolChangeKeyPasswordRequest( keyStore );
-
- JavaToolResult keyToolResult = consumeRequest( request );
+ KeyToolChangeKeyPasswordRequest request = requestFixtures.createKeyToolChangeKeyPasswordRequest(keyStore);
- requestResult( keyToolResult, keyStore );
+ JavaToolResult keyToolResult = consumeRequest(request);
+ requestResult(keyToolResult, keyStore);
}
/**
@@ -69,5 +62,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param keyStore a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore );
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeStorePasswordRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeStorePasswordRequestIT.java
index 730c57c..d373192 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeStorePasswordRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolChangeStorePasswordRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolChangeStorePasswordRequest}.
*
@@ -27,40 +27,33 @@
* @since 1.1
*/
public abstract class AbstractKeyToolChangeStorePasswordRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolChangeStorePasswordRequestIT.
*/
- protected AbstractKeyToolChangeStorePasswordRequestIT()
- {
- }
+ protected AbstractKeyToolChangeStorePasswordRequestIT() {}
/**
* Constructor for AbstractKeyToolChangeStorePasswordRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolChangeStorePasswordRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolChangeStorePasswordRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
- KeyToolChangeStorePasswordRequest request = requestFixtures.createKeyToolChangeStorePasswordRequest( keyStore );
-
- JavaToolResult keyToolResult = consumeRequest( request );
+ KeyToolChangeStorePasswordRequest request = requestFixtures.createKeyToolChangeStorePasswordRequest(keyStore);
- requestResult( keyToolResult, keyStore );
+ JavaToolResult keyToolResult = consumeRequest(request);
+ requestResult(keyToolResult, keyStore);
}
/**
@@ -69,6 +62,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param keyStore a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore );
-
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolDeleteRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolDeleteRequestIT.java
index 2e33604..996e7df 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolDeleteRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolDeleteRequestIT.java
@@ -16,51 +16,43 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolDeleteRequest}.
*
* @author tchemit
* @since 1.1
*/
-public abstract class AbstractKeyToolDeleteRequestIT
- extends AbstractKeyToolRequestIT
-{
+public abstract class AbstractKeyToolDeleteRequestIT extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolDeleteRequestIT.
*/
- protected AbstractKeyToolDeleteRequestIT()
- {
- }
+ protected AbstractKeyToolDeleteRequestIT() {}
/**
* Constructor for AbstractKeyToolDeleteRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolDeleteRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolDeleteRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
- KeyToolDeleteRequest request = requestFixtures.createKeyToolDeleteRequest( keyStore );
-
- JavaToolResult keyToolResult = consumeRequest( request );
+ KeyToolDeleteRequest request = requestFixtures.createKeyToolDeleteRequest(keyStore);
- requestResult( keyToolResult, keyStore );
+ JavaToolResult keyToolResult = consumeRequest(request);
+ requestResult(keyToolResult, keyStore);
}
/**
@@ -69,6 +61,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param keyStore a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore );
-
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolExportCertificateRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolExportCertificateRequestIT.java
index 9be72e3..02db91a 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolExportCertificateRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolExportCertificateRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolExportCertificateRequest}.
*
@@ -27,42 +27,36 @@
* @since 1.1
*/
public abstract class AbstractKeyToolExportCertificateRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolExportCertificateRequestIT.
*/
- protected AbstractKeyToolExportCertificateRequestIT()
- {
- }
+ protected AbstractKeyToolExportCertificateRequestIT() {}
/**
* Constructor for AbstractKeyToolExportCertificateRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolExportCertificateRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolExportCertificateRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
File outputFile = resourceFixtures.outputFile();
KeyToolExportCertificateRequest request =
- requestFixtures.createKeyToolExportCertificateRequest( keyStore, outputFile );
+ requestFixtures.createKeyToolExportCertificateRequest(keyStore, outputFile);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, keyStore, outputFile );
+ requestResult(keyToolResult, keyStore, outputFile);
}
/**
@@ -72,6 +66,5 @@ public final void testRequest()
* @param keyStore a {@link java.io.File} object
* @param outputFile a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore, File outputFile );
-
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore, File outputFile);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateCertificateRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateCertificateRequestIT.java
index c66ac8f..705e460 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateCertificateRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateCertificateRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolGenerateCertificateRequest}.
*
@@ -27,30 +27,24 @@
* @since 1.1
*/
public abstract class AbstractKeyToolGenerateCertificateRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolGenerateCertificateRequestIT.
*/
- protected AbstractKeyToolGenerateCertificateRequestIT()
- {
- }
+ protected AbstractKeyToolGenerateCertificateRequestIT() {}
/**
* Constructor for AbstractKeyToolGenerateCertificateRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolGenerateCertificateRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolGenerateCertificateRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
@@ -59,11 +53,11 @@ public final void testRequest()
File inFile = resourceFixtures.simpleCertificateRequest();
KeyToolGenerateCertificateRequest request =
- requestFixtures.createKeyToolGenerateCertificateRequest( keyStore, inFile, outputFile );
+ requestFixtures.createKeyToolGenerateCertificateRequest(keyStore, inFile, outputFile);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, keyStore, inFile, outputFile );
+ requestResult(keyToolResult, keyStore, inFile, outputFile);
}
/**
@@ -74,7 +68,5 @@ public final void testRequest()
* @param inFile a {@link java.io.File} object
* @param outputFile a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore, File inFile, File outputFile );
-
-
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore, File inFile, File outputFile);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateCertificateRequestRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateCertificateRequestRequestIT.java
index c7d0d52..79d2e0c 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateCertificateRequestRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateCertificateRequestRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolGenerateCertificateRequestRequest}.
*
@@ -27,23 +27,19 @@
* @since 1.1
*/
public abstract class AbstractKeyToolGenerateCertificateRequestRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolGenerateCertificateRequestRequestIT.
*/
- protected AbstractKeyToolGenerateCertificateRequestRequestIT()
- {
- }
+ protected AbstractKeyToolGenerateCertificateRequestRequestIT() {}
/**
* Constructor for AbstractKeyToolGenerateCertificateRequestRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolGenerateCertificateRequestRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolGenerateCertificateRequestRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/**
@@ -53,24 +49,20 @@ protected AbstractKeyToolGenerateCertificateRequestRequestIT( boolean supportedR
* @param keyStore a {@link java.io.File} object
* @param outputFile a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore, File outputFile );
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore, File outputFile);
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
File outputFile = resourceFixtures.outputFile();
KeyToolGenerateCertificateRequestRequest request =
- requestFixtures.createKeyToolGenerateCertificateRequestRequest( keyStore, outputFile );
+ requestFixtures.createKeyToolGenerateCertificateRequestRequest(keyStore, outputFile);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, keyStore, outputFile );
+ requestResult(keyToolResult, keyStore, outputFile);
}
-
-
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateKeyPairRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateKeyPairRequestIT.java
index 7f03b9f..3425df4 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateKeyPairRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateKeyPairRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolGenerateKeyPairRequest}.
*
@@ -27,24 +27,20 @@
* @since 1.1
*/
public abstract class AbstractKeyToolGenerateKeyPairRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolGenerateKeyPairRequestIT.
*/
- protected AbstractKeyToolGenerateKeyPairRequestIT()
- {
- }
+ protected AbstractKeyToolGenerateKeyPairRequestIT() {}
/**
* Constructor for AbstractKeyToolGenerateKeyPairRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolGenerateKeyPairRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolGenerateKeyPairRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/**
@@ -53,21 +49,18 @@ protected AbstractKeyToolGenerateKeyPairRequestIT( boolean supportedRequest )
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param keyStore a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore );
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore);
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
- File keyStore = resourceFixtures.simpleKeyStore( false );
+ File keyStore = resourceFixtures.simpleKeyStore(false);
- KeyToolGenerateKeyPairRequest request = requestFixtures.createKeyToolGenerateKeyPairRequest( keyStore );
+ KeyToolGenerateKeyPairRequest request = requestFixtures.createKeyToolGenerateKeyPairRequest(keyStore);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, keyStore );
+ requestResult(keyToolResult, keyStore);
}
-
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateSecretKeyRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateSecretKeyRequestIT.java
index 228871e..e0b4de7 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateSecretKeyRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolGenerateSecretKeyRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolGenerateSecretKeyRequest}.
*
@@ -27,39 +27,33 @@
* @since 1.1
*/
public abstract class AbstractKeyToolGenerateSecretKeyRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolGenerateSecretKeyRequestIT.
*/
- protected AbstractKeyToolGenerateSecretKeyRequestIT()
- {
- }
+ protected AbstractKeyToolGenerateSecretKeyRequestIT() {}
/**
* Constructor for AbstractKeyToolGenerateSecretKeyRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolGenerateSecretKeyRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolGenerateSecretKeyRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
- KeyToolGenerateSecretKeyRequest request = requestFixtures.createKeyToolGenerateSecretKeyRequest( keyStore );
+ KeyToolGenerateSecretKeyRequest request = requestFixtures.createKeyToolGenerateSecretKeyRequest(keyStore);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, keyStore );
+ requestResult(keyToolResult, keyStore);
}
/**
@@ -68,5 +62,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param keyStore a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore );
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolImportCertificateRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolImportCertificateRequestIT.java
index 19488f7..b78d609 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolImportCertificateRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolImportCertificateRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolImportCertificateRequest}.
*
@@ -27,41 +27,34 @@
* @since 1.1
*/
public abstract class AbstractKeyToolImportCertificateRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolImportCertificateRequestIT.
*/
- protected AbstractKeyToolImportCertificateRequestIT()
- {
- }
+ protected AbstractKeyToolImportCertificateRequestIT() {}
/**
* Constructor for AbstractKeyToolImportCertificateRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolImportCertificateRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolImportCertificateRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
- File keyStore = resourceFixtures.simpleKeyStore( false );
+ File keyStore = resourceFixtures.simpleKeyStore(false);
File file = resourceFixtures.simpleCertificate();
- KeyToolImportCertificateRequest request =
- requestFixtures.createKeyToolImportCertificateRequest( keyStore, file );
+ KeyToolImportCertificateRequest request = requestFixtures.createKeyToolImportCertificateRequest(keyStore, file);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, keyStore, file );
+ requestResult(keyToolResult, keyStore, file);
}
/**
@@ -71,5 +64,5 @@ public final void testRequest()
* @param keyStore a {@link java.io.File} object
* @param file a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore, File file );
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore, File file);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolImportKeystoreRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolImportKeystoreRequestIT.java
index 82f2805..8dba17f 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolImportKeystoreRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolImportKeystoreRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolImportKeystoreRequest}.
*
@@ -27,42 +27,36 @@
* @since 1.3
*/
public abstract class AbstractKeyToolImportKeystoreRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolImportKeystoreRequestIT.
*/
- protected AbstractKeyToolImportKeystoreRequestIT()
- {
- }
+ protected AbstractKeyToolImportKeystoreRequestIT() {}
/**
* Constructor for AbstractKeyToolImportKeystoreRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolImportKeystoreRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolImportKeystoreRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File srcKeyStore = resourceFixtures.simpleKeyStore();
File destKeyStore = resourceFixtures.simpleDestKeyStoreFile();
KeyToolImportKeystoreRequest request =
- requestFixtures.createKeyToolImportKeystoreRequest( srcKeyStore, destKeyStore );
+ requestFixtures.createKeyToolImportKeystoreRequest(srcKeyStore, destKeyStore);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, srcKeyStore, destKeyStore );
+ requestResult(keyToolResult, srcKeyStore, destKeyStore);
}
/**
@@ -72,6 +66,5 @@ public final void testRequest()
* @param srcKeyStore a {@link java.io.File} object
* @param destKeyStore a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File srcKeyStore, File destKeyStore );
-
+ protected abstract void requestResult(JavaToolResult keyToolResult, File srcKeyStore, File destKeyStore);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolListRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolListRequestIT.java
index 625509b..a2a5a2b 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolListRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolListRequestIT.java
@@ -16,50 +16,43 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolListRequest}.
*
* @author tchemit
* @since 1.1
*/
-public abstract class AbstractKeyToolListRequestIT
- extends AbstractKeyToolRequestIT
-{
+public abstract class AbstractKeyToolListRequestIT extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolListRequestIT.
*/
- protected AbstractKeyToolListRequestIT()
- {
- }
+ protected AbstractKeyToolListRequestIT() {}
/**
* Constructor for AbstractKeyToolListRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolListRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolListRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File keyStore = resourceFixtures.simpleKeyStore();
- KeyToolListRequest request = requestFixtures.createKeyToolListRequest( keyStore );
+ KeyToolListRequest request = requestFixtures.createKeyToolListRequest(keyStore);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, keyStore );
+ requestResult(keyToolResult, keyStore);
}
/**
@@ -68,6 +61,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param keyStore a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File keyStore );
-
+ protected abstract void requestResult(JavaToolResult keyToolResult, File keyStore);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCRLFileRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCRLFileRequestIT.java
index b3011b1..5dc69c9 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCRLFileRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCRLFileRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolPrintCRLFileRequest}.
*
@@ -27,39 +27,33 @@
* @since 1.1
*/
public abstract class AbstractKeyToolPrintCRLFileRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolPrintCRLFileRequestIT.
*/
- protected AbstractKeyToolPrintCRLFileRequestIT()
- {
- }
+ protected AbstractKeyToolPrintCRLFileRequestIT() {}
/**
* Constructor for AbstractKeyToolPrintCRLFileRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolPrintCRLFileRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolPrintCRLFileRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File file = resourceFixtures.simpleCertificate();
- KeyToolPrintCRLFileRequest request = requestFixtures.createKeyToolPrintCRLFileRequest( file );
+ KeyToolPrintCRLFileRequest request = requestFixtures.createKeyToolPrintCRLFileRequest(file);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, file );
+ requestResult(keyToolResult, file);
}
/**
@@ -68,6 +62,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param file a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File file );
-
+ protected abstract void requestResult(JavaToolResult keyToolResult, File file);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCertificateRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCertificateRequestIT.java
index 430ec91..425e569 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCertificateRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCertificateRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolPrintCertificateRequest}.
*
@@ -27,39 +27,33 @@
* @since 1.1
*/
public abstract class AbstractKeyToolPrintCertificateRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolPrintCertificateRequestIT.
*/
- protected AbstractKeyToolPrintCertificateRequestIT()
- {
- }
+ protected AbstractKeyToolPrintCertificateRequestIT() {}
/**
* Constructor for AbstractKeyToolPrintCertificateRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolPrintCertificateRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolPrintCertificateRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File file = resourceFixtures.simpleCertificate();
- KeyToolPrintCertificateRequest request = requestFixtures.createKeyToolPrintCertificateRequest( file );
+ KeyToolPrintCertificateRequest request = requestFixtures.createKeyToolPrintCertificateRequest(file);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, file );
+ requestResult(keyToolResult, file);
}
/**
@@ -68,5 +62,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param file a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File file );
+ protected abstract void requestResult(JavaToolResult keyToolResult, File file);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCertificateRequestRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCertificateRequestRequestIT.java
index 22aeac0..6a4a9f1 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCertificateRequestRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolPrintCertificateRequestRequestIT.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+
/**
* Test the {@link org.codehaus.mojo.keytool.requests.KeyToolPrintCertificateRequestRequest}.
*
@@ -27,40 +27,34 @@
* @since 1.1
*/
public abstract class AbstractKeyToolPrintCertificateRequestRequestIT
- extends AbstractKeyToolRequestIT
-{
+ extends AbstractKeyToolRequestIT {
/**
* Constructor for AbstractKeyToolPrintCertificateRequestRequestIT.
*/
- protected AbstractKeyToolPrintCertificateRequestRequestIT()
- {
- }
+ protected AbstractKeyToolPrintCertificateRequestRequestIT() {}
/**
* Constructor for AbstractKeyToolPrintCertificateRequestRequestIT.
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolPrintCertificateRequestRequestIT( boolean supportedRequest )
- {
- super( supportedRequest );
+ protected AbstractKeyToolPrintCertificateRequestRequestIT(boolean supportedRequest) {
+ super(supportedRequest);
}
/** {@inheritDoc} */
@Override
- public final void testRequest()
- throws Exception
- {
+ public final void testRequest() throws Exception {
File file = resourceFixtures.simpleCertificateRequest();
KeyToolPrintCertificateRequestRequest request =
- requestFixtures.createKeyToolPrintCertificateRequestRequest( file );
+ requestFixtures.createKeyToolPrintCertificateRequestRequest(file);
- JavaToolResult keyToolResult = consumeRequest( request );
+ JavaToolResult keyToolResult = consumeRequest(request);
- requestResult( keyToolResult, file );
+ requestResult(keyToolResult, file);
}
/**
@@ -69,6 +63,5 @@ public final void testRequest()
* @param keyToolResult a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param file a {@link java.io.File} object
*/
- protected abstract void requestResult( JavaToolResult keyToolResult, File file );
-
+ protected abstract void requestResult(JavaToolResult keyToolResult, File file);
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestIT.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestIT.java
index c759de6..9d33653 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestIT.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestIT.java
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+import java.io.File;
+import java.util.Arrays;
+
import org.apache.maven.shared.utils.cli.Commandline;
import org.apache.maven.shared.utils.cli.javatool.JavaToolException;
import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
@@ -27,18 +30,13 @@
import org.junit.Assert;
import org.junit.Before;
-import java.io.File;
-import java.util.Arrays;
-
/**
* abstract test of a keytool request.
*
* @author tchemit
* @since 1.1
*/
-public abstract class AbstractKeyToolRequestIT
- extends PlexusTestCase
-{
+public abstract class AbstractKeyToolRequestIT extends PlexusTestCase {
private static final long BUILD_TIMESTAMP = System.nanoTime();
@@ -58,9 +56,8 @@ public abstract class AbstractKeyToolRequestIT
/**
* Constructor for AbstractKeyToolRequestIT.
*/
- protected AbstractKeyToolRequestIT()
- {
- this( true );
+ protected AbstractKeyToolRequestIT() {
+ this(true);
}
/**
@@ -68,8 +65,7 @@ protected AbstractKeyToolRequestIT()
*
* @param supportedRequest a boolean
*/
- protected AbstractKeyToolRequestIT( boolean supportedRequest )
- {
+ protected AbstractKeyToolRequestIT(boolean supportedRequest) {
this.supportedRequest = supportedRequest;
}
@@ -78,8 +74,7 @@ protected AbstractKeyToolRequestIT( boolean supportedRequest )
*
* @throws java.lang.Exception if any.
*/
- public abstract void testRequest()
- throws Exception;
+ public abstract void testRequest() throws Exception;
/**
* consumeRequest.
@@ -88,19 +83,14 @@ public abstract void testRequest()
* @return a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @throws org.apache.maven.shared.utils.cli.javatool.JavaToolException if any.
*/
- protected final JavaToolResult consumeRequest( R request )
- throws JavaToolException
- {
+ protected final JavaToolResult consumeRequest(R request) throws JavaToolException {
JavaToolResult result = null;
- if ( supportedRequest )
- {
- result = executeKeyToolRequest( request );
- }
- else
- {
- executeUnsupportedKeyToolRequest( request );
+ if (supportedRequest) {
+ result = executeKeyToolRequest(request);
+ } else {
+ executeUnsupportedKeyToolRequest(request);
}
return result;
}
@@ -111,21 +101,21 @@ protected final JavaToolResult consumeRequest( R request )
* @throws java.lang.Exception if any.
*/
@Before
- public void setUp()
- throws Exception
- {
+ public void setUp() throws Exception {
super.setUp();
String basedir = getBasedir();
- workingDirectory = new File( basedir, "target" + File.separator + "surefire-workdir" + File.separator +
- getClass().getName() + "_" + BUILD_TIMESTAMP );
+ workingDirectory = new File(
+ basedir,
+ "target" + File.separator + "surefire-workdir" + File.separator
+ + getClass().getName() + "_" + BUILD_TIMESTAMP);
- tool = lookup( KeyTool.ROLE );
+ tool = lookup(KeyTool.ROLE);
- Assert.assertNotNull( tool );
+ Assert.assertNotNull(tool);
requestFixtures = new KeyToolRequestFixtures();
- resourceFixtures = new ResourceFixtures( workingDirectory );
+ resourceFixtures = new ResourceFixtures(workingDirectory);
}
/**
@@ -134,9 +124,7 @@ public void setUp()
* @throws java.lang.Exception if any.
*/
@After
- public void tearDown()
- throws Exception
- {
+ public void tearDown() throws Exception {
super.tearDown();
tool = null;
requestFixtures = null;
@@ -150,13 +138,11 @@ public void tearDown()
* @return a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @throws org.apache.maven.shared.utils.cli.javatool.JavaToolException if any.
*/
- protected JavaToolResult executeKeyToolRequest( KeyToolRequest request )
- throws JavaToolException
- {
- Assert.assertNotNull( request );
- JavaToolResult result = tool.execute( request );
- System.out.println( result.getCommandline().toString() );
- Assert.assertNotNull( result );
+ protected JavaToolResult executeKeyToolRequest(KeyToolRequest request) throws JavaToolException {
+ Assert.assertNotNull(request);
+ JavaToolResult result = tool.execute(request);
+ System.out.println(result.getCommandline().toString());
+ Assert.assertNotNull(result);
return result;
}
@@ -167,13 +153,14 @@ protected JavaToolResult executeKeyToolRequest( KeyToolRequest request )
* @param expectedCommandLineArguments an array of {@link java.lang.String} objects
* @param expectedExitCode a int
*/
- protected void assertKeyToolResult( JavaToolResult result, String[] expectedCommandLineArguments,
- int expectedExitCode )
- {
- assertKeyToolResult( result, expectedCommandLineArguments );
+ protected void assertKeyToolResult(
+ JavaToolResult result, String[] expectedCommandLineArguments, int expectedExitCode) {
+ assertKeyToolResult(result, expectedCommandLineArguments);
- assertEquals( "Differing exit code , required " + expectedExitCode + " but had : " + result.getExitCode(),
- expectedExitCode, result.getExitCode() );
+ assertEquals(
+ "Differing exit code , required " + expectedExitCode + " but had : " + result.getExitCode(),
+ expectedExitCode,
+ result.getExitCode());
}
/**
@@ -182,18 +169,18 @@ protected void assertKeyToolResult( JavaToolResult result, String[] expectedComm
* @param result a {@link org.apache.maven.shared.utils.cli.javatool.JavaToolResult} object
* @param expectedCommandLineArguments an array of {@link java.lang.String} objects
*/
- protected void assertKeyToolResult( JavaToolResult result, String[] expectedCommandLineArguments )
- {
+ protected void assertKeyToolResult(JavaToolResult result, String[] expectedCommandLineArguments) {
Commandline commandline = result.getCommandline();
String[] arguments = commandline.getArguments();
assertEquals(
- "Differing number of arguments, required " + Arrays.asList( expectedCommandLineArguments ) + " but had : " +
- Arrays.asList( arguments ), expectedCommandLineArguments.length, arguments.length );
- for ( int i = 0; i < arguments.length; i++ )
- {
- assertEquals( expectedCommandLineArguments[i], arguments[i] );
+ "Differing number of arguments, required " + Arrays.asList(expectedCommandLineArguments) + " but had : "
+ + Arrays.asList(arguments),
+ expectedCommandLineArguments.length,
+ arguments.length);
+ for (int i = 0; i < arguments.length; i++) {
+ assertEquals(expectedCommandLineArguments[i], arguments[i]);
}
}
@@ -203,18 +190,13 @@ protected void assertKeyToolResult( JavaToolResult result, String[] expectedComm
* @param request a {@link org.codehaus.mojo.keytool.KeyToolRequest} object
* @throws org.apache.maven.shared.utils.cli.javatool.JavaToolException if any.
*/
- protected void executeUnsupportedKeyToolRequest( KeyToolRequest request )
- throws JavaToolException
- {
- Assert.assertNotNull( request );
- try
- {
- tool.execute( request );
- Assert.fail( "Request of type " + request.getClass().getName() + " is not supported." );
- }
- catch ( UnsupportedKeyToolRequestException e )
- {
- Assert.assertTrue( true );
+ protected void executeUnsupportedKeyToolRequest(KeyToolRequest request) throws JavaToolException {
+ Assert.assertNotNull(request);
+ try {
+ tool.execute(request);
+ Assert.fail("Request of type " + request.getClass().getName() + " is not supported.");
+ } catch (UnsupportedKeyToolRequestException e) {
+ Assert.assertTrue(true);
}
}
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolRequestFixtures.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolRequestFixtures.java
index 7490f2b..e8d9d1b 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolRequestFixtures.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolRequestFixtures.java
@@ -24,24 +24,22 @@
* @author tchemit
* @since 1.3
*/
-public class KeyToolRequestFixtures
-{
+public class KeyToolRequestFixtures {
/**
* createKeyToolChangeAliasRequest.
*
* @param keyStore a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolChangeAliasRequest} object
*/
- public KeyToolChangeAliasRequest createKeyToolChangeAliasRequest( File keyStore )
- {
+ public KeyToolChangeAliasRequest createKeyToolChangeAliasRequest(File keyStore) {
KeyToolChangeAliasRequest request = new KeyToolChangeAliasRequest();
- request.setAlias( "foo_alias" );
- request.setDestalias( "new_alias" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setKeypass( "key-passwd" );
- request.setVerbose( true );
+ request.setAlias("foo_alias");
+ request.setDestalias("new_alias");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setKeypass("key-passwd");
+ request.setVerbose(true);
return request;
}
@@ -51,28 +49,25 @@ public KeyToolChangeAliasRequest createKeyToolChangeAliasRequest( File keyStore
* @param file a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolPrintCRLFileRequest} object
*/
- public KeyToolPrintCRLFileRequest createKeyToolPrintCRLFileRequest( File file )
- {
+ public KeyToolPrintCRLFileRequest createKeyToolPrintCRLFileRequest(File file) {
KeyToolPrintCRLFileRequest request = new KeyToolPrintCRLFileRequest();
- request.setFile( file );
- request.setVerbose( true );
+ request.setFile(file);
+ request.setVerbose(true);
return request;
}
-
/**
* createKeyToolPrintCertificateRequestRequest.
*
* @param file a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolPrintCertificateRequestRequest} object
*/
- public KeyToolPrintCertificateRequestRequest createKeyToolPrintCertificateRequestRequest( File file )
- {
+ public KeyToolPrintCertificateRequestRequest createKeyToolPrintCertificateRequestRequest(File file) {
KeyToolPrintCertificateRequestRequest request = new KeyToolPrintCertificateRequestRequest();
- request.setFile( file );
- request.setVerbose( true );
+ request.setFile(file);
+ request.setVerbose(true);
return request;
}
@@ -82,14 +77,13 @@ public KeyToolPrintCertificateRequestRequest createKeyToolPrintCertificateReques
* @param file a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolPrintCertificateRequest} object
*/
- public KeyToolPrintCertificateRequest createKeyToolPrintCertificateRequest( File file )
- {
+ public KeyToolPrintCertificateRequest createKeyToolPrintCertificateRequest(File file) {
KeyToolPrintCertificateRequest request = new KeyToolPrintCertificateRequest();
- request.setFile( file );
+ request.setFile(file);
- request.setVerbose( true );
- request.setRfc( true );
+ request.setVerbose(true);
+ request.setRfc(true);
return request;
}
@@ -99,16 +93,15 @@ public KeyToolPrintCertificateRequest createKeyToolPrintCertificateRequest( File
* @param keyStore a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolListRequest} object
*/
- public KeyToolListRequest createKeyToolListRequest( File keyStore )
- {
+ public KeyToolListRequest createKeyToolListRequest(File keyStore) {
KeyToolListRequest request = new KeyToolListRequest();
- request.setAlias( "foo_alias" );
+ request.setAlias("foo_alias");
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setVerbose( true );
- request.setRfc( false );
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setVerbose(true);
+ request.setRfc(false);
return request;
}
@@ -119,26 +112,25 @@ public KeyToolListRequest createKeyToolListRequest( File keyStore )
* @param destKeyStore a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolImportKeystoreRequest} object
*/
- public KeyToolImportKeystoreRequest createKeyToolImportKeystoreRequest( File srcKeyStore, File destKeyStore )
- {
+ public KeyToolImportKeystoreRequest createKeyToolImportKeystoreRequest(File srcKeyStore, File destKeyStore) {
KeyToolImportKeystoreRequest request = new KeyToolImportKeystoreRequest();
- request.setSrcalias( "foo_alias" );
- request.setDestalias( "new_alias" );
+ request.setSrcalias("foo_alias");
+ request.setDestalias("new_alias");
- request.setSrcstoretype( "jks" );
- request.setDeststoretype( "jks" );
+ request.setSrcstoretype("jks");
+ request.setDeststoretype("jks");
- request.setSrcstorepass( "changeit" );
- request.setDeststorepass( "changeit" );
+ request.setSrcstorepass("changeit");
+ request.setDeststorepass("changeit");
- request.setSrckeystore( srcKeyStore.getAbsolutePath() );
- request.setDestkeystore( destKeyStore.getAbsolutePath() );
+ request.setSrckeystore(srcKeyStore.getAbsolutePath());
+ request.setDestkeystore(destKeyStore.getAbsolutePath());
- request.setSrckeypass( "key-passwd" );
- request.setDestkeypass( "key-passwd" );
- request.setVerbose( true );
- request.setNoprompt( true );
+ request.setSrckeypass("key-passwd");
+ request.setDestkeypass("key-passwd");
+ request.setVerbose(true);
+ request.setNoprompt(true);
return request;
}
@@ -149,18 +141,17 @@ public KeyToolImportKeystoreRequest createKeyToolImportKeystoreRequest( File src
* @param file a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolImportCertificateRequest} object
*/
- public KeyToolImportCertificateRequest createKeyToolImportCertificateRequest( File keyStore, File file )
- {
+ public KeyToolImportCertificateRequest createKeyToolImportCertificateRequest(File keyStore, File file) {
KeyToolImportCertificateRequest request = new KeyToolImportCertificateRequest();
- request.setAlias( "foo_alias2" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setNoprompt( true );
- request.setVerbose( true );
- request.setTrustcacerts( true );
- request.setFile( file.getAbsolutePath() );
- request.setKeypass( "new-passwd" );
+ request.setAlias("foo_alias2");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setNoprompt(true);
+ request.setVerbose(true);
+ request.setTrustcacerts(true);
+ request.setFile(file.getAbsolutePath());
+ request.setKeypass("new-passwd");
return request;
}
@@ -170,17 +161,16 @@ public KeyToolImportCertificateRequest createKeyToolImportCertificateRequest( Fi
* @param keyStore a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolGenerateSecretKeyRequest} object
*/
- public KeyToolGenerateSecretKeyRequest createKeyToolGenerateSecretKeyRequest( File keyStore )
- {
+ public KeyToolGenerateSecretKeyRequest createKeyToolGenerateSecretKeyRequest(File keyStore) {
KeyToolGenerateSecretKeyRequest request = new KeyToolGenerateSecretKeyRequest();
- request.setAlias( "new_foo_alias" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setKeypass( "key-passwd" );
- request.setKeyalg( "DES" );
- request.setKeysize( "56" );
- request.setVerbose( true );
+ request.setAlias("new_foo_alias");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setKeypass("key-passwd");
+ request.setKeyalg("DES");
+ request.setKeysize("56");
+ request.setVerbose(true);
return request;
}
@@ -190,22 +180,21 @@ public KeyToolGenerateSecretKeyRequest createKeyToolGenerateSecretKeyRequest( Fi
* @param keyStore a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolGenerateKeyPairRequest} object
*/
- public KeyToolGenerateKeyPairRequest createKeyToolGenerateKeyPairRequest( File keyStore )
- {
+ public KeyToolGenerateKeyPairRequest createKeyToolGenerateKeyPairRequest(File keyStore) {
KeyToolGenerateKeyPairRequest request = new KeyToolGenerateKeyPairRequest();
- request.setAlias( "dest_foo_alias" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setKeypass( "key-passwd" );
- request.setSigalg( "SHA1withDSA" );
- request.setDname( "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France" );
- request.setVerbose( true );
- request.setValidity( "100" );
- request.setStartdate( "2011/11/11" );
- request.setKeyalg( "DSA" );
- request.setKeysize( "1024" );
- request.setExt( "" );
+ request.setAlias("dest_foo_alias");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setKeypass("key-passwd");
+ request.setSigalg("SHA1withDSA");
+ request.setDname("CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France");
+ request.setVerbose(true);
+ request.setValidity("100");
+ request.setStartdate("2011/11/11");
+ request.setKeyalg("DSA");
+ request.setKeysize("1024");
+ request.setExt("");
return request;
}
@@ -216,19 +205,18 @@ public KeyToolGenerateKeyPairRequest createKeyToolGenerateKeyPairRequest( File k
* @param outputFile a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolGenerateCertificateRequestRequest} object
*/
- public KeyToolGenerateCertificateRequestRequest createKeyToolGenerateCertificateRequestRequest( File keyStore,
- File outputFile )
- {
+ public KeyToolGenerateCertificateRequestRequest createKeyToolGenerateCertificateRequestRequest(
+ File keyStore, File outputFile) {
KeyToolGenerateCertificateRequestRequest request = new KeyToolGenerateCertificateRequestRequest();
- request.setAlias( "foo_alias" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setKeypass( "key-passwd" );
- request.setFile( outputFile );
- request.setSigalg( "SHA1withDSA" );
- request.setDname( "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France" );
- request.setVerbose( true );
+ request.setAlias("foo_alias");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setKeypass("key-passwd");
+ request.setFile(outputFile);
+ request.setSigalg("SHA1withDSA");
+ request.setDname("CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France");
+ request.setVerbose(true);
return request;
}
@@ -240,25 +228,24 @@ public KeyToolGenerateCertificateRequestRequest createKeyToolGenerateCertificate
* @param outputFile a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolGenerateCertificateRequest} object
*/
- public KeyToolGenerateCertificateRequest createKeyToolGenerateCertificateRequest( File keyStore, File inFile,
- File outputFile )
- {
+ public KeyToolGenerateCertificateRequest createKeyToolGenerateCertificateRequest(
+ File keyStore, File inFile, File outputFile) {
KeyToolGenerateCertificateRequest request = new KeyToolGenerateCertificateRequest();
- request.setAlias( "foo_alias" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setKeypass( "key-passwd" );
- request.setRfc( true );
+ request.setAlias("foo_alias");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setKeypass("key-passwd");
+ request.setRfc(true);
- request.setInfile( inFile );
- request.setOutfile( outputFile );
- request.setSigalg( "SHA1withDSA" );
- request.setDname( "CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France" );
- request.setStartdate( "2011/11/11" );
- request.setExt( "" );
- request.setValidity( "100" );
- request.setVerbose( true );
+ request.setInfile(inFile);
+ request.setOutfile(outputFile);
+ request.setSigalg("SHA1withDSA");
+ request.setDname("CN=Me, OU=Unknown, O=Codehaus, L=Unknown, ST=Unknown, C=France");
+ request.setStartdate("2011/11/11");
+ request.setExt("");
+ request.setValidity("100");
+ request.setVerbose(true);
return request;
}
@@ -269,16 +256,15 @@ public KeyToolGenerateCertificateRequest createKeyToolGenerateCertificateRequest
* @param outputFile a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolExportCertificateRequest} object
*/
- public KeyToolExportCertificateRequest createKeyToolExportCertificateRequest( File keyStore, File outputFile )
- {
+ public KeyToolExportCertificateRequest createKeyToolExportCertificateRequest(File keyStore, File outputFile) {
KeyToolExportCertificateRequest request = new KeyToolExportCertificateRequest();
- request.setAlias( "foo_alias" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setRfc( true );
- request.setFile( outputFile.getAbsolutePath() );
- request.setVerbose( true );
+ request.setAlias("foo_alias");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setRfc(true);
+ request.setFile(outputFile.getAbsolutePath());
+ request.setVerbose(true);
return request;
}
@@ -288,14 +274,13 @@ public KeyToolExportCertificateRequest createKeyToolExportCertificateRequest( Fi
* @param keyStore a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolDeleteRequest} object
*/
- public KeyToolDeleteRequest createKeyToolDeleteRequest( File keyStore )
- {
+ public KeyToolDeleteRequest createKeyToolDeleteRequest(File keyStore) {
KeyToolDeleteRequest request = new KeyToolDeleteRequest();
- request.setAlias( "foo_alias" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setVerbose( true );
+ request.setAlias("foo_alias");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setVerbose(true);
return request;
}
@@ -305,14 +290,13 @@ public KeyToolDeleteRequest createKeyToolDeleteRequest( File keyStore )
* @param keyStore a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolChangeStorePasswordRequest} object
*/
- public KeyToolChangeStorePasswordRequest createKeyToolChangeStorePasswordRequest( File keyStore )
- {
+ public KeyToolChangeStorePasswordRequest createKeyToolChangeStorePasswordRequest(File keyStore) {
KeyToolChangeStorePasswordRequest request = new KeyToolChangeStorePasswordRequest();
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setNewPassword( "new-changeit" );
- request.setVerbose( true );
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setNewPassword("new-changeit");
+ request.setVerbose(true);
return request;
}
@@ -322,16 +306,15 @@ public KeyToolChangeStorePasswordRequest createKeyToolChangeStorePasswordRequest
* @param keyStore a {@link java.io.File} object
* @return a {@link org.codehaus.mojo.keytool.requests.KeyToolChangeKeyPasswordRequest} object
*/
- public KeyToolChangeKeyPasswordRequest createKeyToolChangeKeyPasswordRequest( File keyStore )
- {
+ public KeyToolChangeKeyPasswordRequest createKeyToolChangeKeyPasswordRequest(File keyStore) {
KeyToolChangeKeyPasswordRequest request = new KeyToolChangeKeyPasswordRequest();
- request.setAlias( "foo_alias" );
- request.setStoretype( "jks" );
- request.setStorepass( "changeit" );
- request.setKeystore( keyStore.getAbsolutePath() );
- request.setKeypass( "key-passwd" );
- request.setNewPassword( "new-key-passwd" );
- request.setVerbose( true );
+ request.setAlias("foo_alias");
+ request.setStoretype("jks");
+ request.setStorepass("changeit");
+ request.setKeystore(keyStore.getAbsolutePath());
+ request.setKeypass("key-passwd");
+ request.setNewPassword("new-key-passwd");
+ request.setVerbose(true);
return request;
}
}
diff --git a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/ResourceFixtures.java b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/ResourceFixtures.java
index 0caaf36..1a14681 100644
--- a/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/ResourceFixtures.java
+++ b/keytool-api-test/src/main/java/org/codehaus/mojo/keytool/requests/ResourceFixtures.java
@@ -16,26 +16,24 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.junit.Assert;
-
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
import java.nio.file.Files;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.junit.Assert;
+
/**
* Input resources fixtures.
*
* @author tchemit
* @since 1.3
*/
-public class ResourceFixtures
-{
+public class ResourceFixtures {
protected final File workingDirectory;
@@ -44,8 +42,7 @@ public class ResourceFixtures
*
* @param workingDirectory a {@link java.io.File} object
*/
- public ResourceFixtures( File workingDirectory )
- {
+ public ResourceFixtures(File workingDirectory) {
this.workingDirectory = workingDirectory;
}
@@ -55,11 +52,10 @@ public ResourceFixtures( File workingDirectory )
* @param name a {@link java.lang.String} object
* @return a {@link java.io.File} object
*/
- public File simpleDestKeyStoreFile( String name )
- {
- File file = new File( workingDirectory, name );
+ public File simpleDestKeyStoreFile(String name) {
+ File file = new File(workingDirectory, name);
- Assert.assertFalse( file.exists() );
+ Assert.assertFalse(file.exists());
return file;
}
@@ -69,9 +65,8 @@ public File simpleDestKeyStoreFile( String name )
*
* @return a {@link java.io.File} object
*/
- public File simpleDestKeyStoreFile()
- {
- return simpleDestKeyStoreFile( "destkeystore" );
+ public File simpleDestKeyStoreFile() {
+ return simpleDestKeyStoreFile("destkeystore");
}
/**
@@ -82,14 +77,11 @@ public File simpleDestKeyStoreFile()
* @return a {@link java.io.File} object
* @throws java.io.IOException if any.
*/
- public File simpleKeyStore( String name, boolean copy )
- throws IOException
- {
- URL keyStoreURL = getKeyStoreURL( "simple" );
- File keyStore = new File( workingDirectory, name );
- if ( copy )
- {
- copyURLToFile( keyStoreURL, keyStore );
+ public File simpleKeyStore(String name, boolean copy) throws IOException {
+ URL keyStoreURL = getKeyStoreURL("simple");
+ File keyStore = new File(workingDirectory, name);
+ if (copy) {
+ copyURLToFile(keyStoreURL, keyStore);
}
return keyStore;
}
@@ -100,10 +92,8 @@ public File simpleKeyStore( String name, boolean copy )
* @return a {@link java.io.File} object
* @throws java.io.IOException if any.
*/
- public File simpleKeyStore()
- throws IOException
- {
- File keyStore = simpleKeyStore( true );
+ public File simpleKeyStore() throws IOException {
+ File keyStore = simpleKeyStore(true);
return keyStore;
}
@@ -114,11 +104,9 @@ public File simpleKeyStore()
* @return a {@link java.io.File} object
* @throws java.io.IOException if any.
*/
- public File simpleKeyStore( boolean copy )
- throws IOException
- {
- File keyStore = simpleKeyStore( "keystore.jks", copy );
- FileUtils.forceMkdir( keyStore.getParentFile() );
+ public File simpleKeyStore(boolean copy) throws IOException {
+ File keyStore = simpleKeyStore("keystore.jks", copy);
+ FileUtils.forceMkdir(keyStore.getParentFile());
return keyStore;
}
@@ -129,11 +117,9 @@ public File simpleKeyStore( boolean copy )
* @return a {@link java.io.File} object
* @throws java.io.IOException if any.
*/
- public File simpleKeyStore( String name )
- throws IOException
- {
- File keyStore = simpleKeyStore( name, true );
- Assert.assertTrue( keyStore.exists() );
+ public File simpleKeyStore(String name) throws IOException {
+ File keyStore = simpleKeyStore(name, true);
+ Assert.assertTrue(keyStore.exists());
return keyStore;
}
@@ -143,14 +129,12 @@ public File simpleKeyStore( String name )
* @return a {@link java.io.File} object
* @throws java.io.IOException if any.
*/
- public File simpleCertificateRequest()
- throws IOException
- {
- URL certificateRequestURL = getCertificateRequestURL( "simple" );
- File inFile = new File( workingDirectory, "inFile" );
- Assert.assertFalse( inFile.exists() );
- copyURLToFile( certificateRequestURL, inFile );
- Assert.assertTrue( inFile.exists() );
+ public File simpleCertificateRequest() throws IOException {
+ URL certificateRequestURL = getCertificateRequestURL("simple");
+ File inFile = new File(workingDirectory, "inFile");
+ Assert.assertFalse(inFile.exists());
+ copyURLToFile(certificateRequestURL, inFile);
+ Assert.assertTrue(inFile.exists());
return inFile;
}
@@ -160,14 +144,12 @@ public File simpleCertificateRequest()
* @return a {@link java.io.File} object
* @throws java.io.IOException if any.
*/
- public File simpleCertificate()
- throws IOException
- {
- URL certificateURL = getCertificateURL( "simple" );
- File inFile = new File( workingDirectory, "inFile" );
- Assert.assertFalse( inFile.exists() );
- copyURLToFile( certificateURL, inFile );
- Assert.assertTrue( inFile.exists() );
+ public File simpleCertificate() throws IOException {
+ URL certificateURL = getCertificateURL("simple");
+ File inFile = new File(workingDirectory, "inFile");
+ Assert.assertFalse(inFile.exists());
+ copyURLToFile(certificateURL, inFile);
+ Assert.assertTrue(inFile.exists());
return inFile;
}
@@ -176,10 +158,9 @@ public File simpleCertificate()
*
* @return a {@link java.io.File} object
*/
- public File outputFile()
- {
- File outputFile = new File( workingDirectory, "outputFile" );
- Assert.assertFalse( outputFile.exists() );
+ public File outputFile() {
+ File outputFile = new File(workingDirectory, "outputFile");
+ Assert.assertFalse(outputFile.exists());
return outputFile;
}
@@ -189,9 +170,8 @@ public File outputFile()
* @param prefix a {@link java.lang.String} object
* @return a {@link java.net.URL} object
*/
- protected URL getKeyStoreURL( String prefix )
- {
- return getClass().getResource( "/" + prefix + "-keystore" );
+ protected URL getKeyStoreURL(String prefix) {
+ return getClass().getResource("/" + prefix + "-keystore");
}
/**
@@ -200,9 +180,8 @@ protected URL getKeyStoreURL( String prefix )
* @param prefix a {@link java.lang.String} object
* @return a {@link java.net.URL} object
*/
- protected URL getCertificateRequestURL( String prefix )
- {
- return getClass().getResource( "/" + prefix + "-certificate-request" );
+ protected URL getCertificateRequestURL(String prefix) {
+ return getClass().getResource("/" + prefix + "-certificate-request");
}
/**
@@ -211,9 +190,8 @@ protected URL getCertificateRequestURL( String prefix )
* @param prefix a {@link java.lang.String} object
* @return a {@link java.net.URL} object
*/
- protected URL getCertificateURL( String prefix )
- {
- return getClass().getResource( "/" + prefix + "-certificate" );
+ protected URL getCertificateURL(String prefix) {
+ return getClass().getResource("/" + prefix + "-certificate");
}
/**
@@ -223,14 +201,11 @@ protected URL getCertificateURL( String prefix )
* @param dest a {@link java.io.File} object
* @throws java.io.IOException if any.
*/
- protected void copyURLToFile( URL url, File dest )
- throws IOException
- {
- FileUtils.mkdir( dest.getParentFile().getAbsolutePath() );
- try ( InputStream inputStream = url.openStream();
- OutputStream outputStream = Files.newOutputStream( dest.toPath() ) )
- {
- IOUtil.copy( inputStream, outputStream );
+ protected void copyURLToFile(URL url, File dest) throws IOException {
+ FileUtils.mkdir(dest.getParentFile().getAbsolutePath());
+ try (InputStream inputStream = url.openStream();
+ OutputStream outputStream = Files.newOutputStream(dest.toPath())) {
+ IOUtil.copy(inputStream, outputStream);
}
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolCommandLineBuilder.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolCommandLineBuilder.java
index 9e9e9d6..03e69d0 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolCommandLineBuilder.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolCommandLineBuilder.java
@@ -16,23 +16,21 @@
* limitations under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.shared.utils.cli.Commandline;
import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
-import java.io.File;
-import java.util.List;
-
/**
* To build the command line for a given {@link org.codehaus.mojo.keytool.KeyToolRequest}.
*
* @author tchemit
* @since 1.1
*/
-public abstract class AbstractKeyToolCommandLineBuilder
- implements KeyToolCommandLineBuilder
-{
+public abstract class AbstractKeyToolCommandLineBuilder implements KeyToolCommandLineBuilder {
/**
* Builder logger.
@@ -45,43 +43,36 @@ public abstract class AbstractKeyToolCommandLineBuilder
private String keyToolFile;
/** {@inheritDoc} */
- public final void setLogger( Logger logger )
- {
+ public final void setLogger(Logger logger) {
this.logger = logger;
}
/** {@inheritDoc} */
- public final void setKeyToolFile( String keyToolFile )
- {
+ public final void setKeyToolFile(String keyToolFile) {
this.keyToolFile = keyToolFile;
}
/**
* {@inheritDoc}
*/
- public final void checkRequiredState()
- {
- if ( logger == null )
- {
- throw new IllegalStateException( "A logger instance is required." );
+ public final void checkRequiredState() {
+ if (logger == null) {
+ throw new IllegalStateException("A logger instance is required.");
}
- if ( keyToolFile == null )
- {
- throw new IllegalStateException( "A keyTool file is required." );
+ if (keyToolFile == null) {
+ throw new IllegalStateException("A keyTool file is required.");
}
}
/** {@inheritDoc} */
- public final void checkSupportedRequest( KeyToolRequest request )
- throws UnsupportedKeyToolRequestException
- {
+ public final void checkSupportedRequest(KeyToolRequest request) throws UnsupportedKeyToolRequestException {
Class requestType = request.getClass();
- if ( !supportRequestType( requestType ) )
- {
- throw new UnsupportedKeyToolRequestException( "Request " + requestType.getName() +
- " is not supported by your version of keytool (java " +
- SystemUtils.JAVA_VERSION + ")" );
+ if (!supportRequestType(requestType)) {
+ throw new UnsupportedKeyToolRequestException(
+ "Request " + requestType.getName() + " is not supported by your version of keytool (java "
+ + SystemUtils.JAVA_VERSION
+ + ")");
}
}
@@ -90,8 +81,7 @@ public final void checkSupportedRequest( KeyToolRequest request )
*
* @return the builder logger
*/
- protected final Logger getLogger()
- {
+ protected final Logger getLogger() {
return logger;
}
@@ -100,8 +90,7 @@ protected final Logger getLogger()
*
* @return the builder keytool program location
*/
- protected final String getKeyToolFile()
- {
+ protected final String getKeyToolFile() {
return keyToolFile;
}
@@ -115,18 +104,15 @@ protected final String getKeyToolFile()
* @see KeyToolRequestWithKeyStoreParameters
* @see KeyToolRequestWithKeyStoreAndAliasParameters
*/
- protected final void addKeytoolCommandAndDefaultoptions( Commandline cli, String keytoolcommand,
- KeyToolRequest request )
- {
- addArg( cli, keytoolcommand );
- addArgIfTrue( cli, "-v", request.isVerbose() );
- if ( request instanceof KeyToolRequestWithKeyStoreParameters )
- {
- buildWithKeyStoreParameters( (KeyToolRequestWithKeyStoreParameters) request, cli );
+ protected final void addKeytoolCommandAndDefaultoptions(
+ Commandline cli, String keytoolcommand, KeyToolRequest request) {
+ addArg(cli, keytoolcommand);
+ addArgIfTrue(cli, "-v", request.isVerbose());
+ if (request instanceof KeyToolRequestWithKeyStoreParameters) {
+ buildWithKeyStoreParameters((KeyToolRequestWithKeyStoreParameters) request, cli);
}
- if ( request instanceof KeyToolRequestWithKeyStoreAndAliasParameters )
- {
- buildWithKeyStoreAndAliasParameters( (KeyToolRequestWithKeyStoreAndAliasParameters) request, cli );
+ if (request instanceof KeyToolRequestWithKeyStoreAndAliasParameters) {
+ buildWithKeyStoreAndAliasParameters((KeyToolRequestWithKeyStoreAndAliasParameters) request, cli);
}
}
@@ -136,15 +122,14 @@ protected final void addKeytoolCommandAndDefaultoptions( Commandline cli, String
* @param request the keytool import request
* @param cli the commandline client to prepare
*/
- protected void buildWithKeyStoreParameters( KeyToolRequestWithKeyStoreParameters request, Commandline cli )
- {
- addArgIfNotEmpty( cli, "-keystore", request.getKeystore() );
- addArgIfNotEmpty( cli, "-storepass", request.getStorepass() );
- addArgIfNotEmpty( cli, "-storetype", request.getStoretype() );
- addArgIfNotEmpty( cli, "-providername", request.getProvidername() );
- addArgIfNotEmpty( cli, "-providerclass", request.getProviderclass() );
- addArgIfNotEmpty( cli, "-providerarg", request.getProviderarg() );
- addArgIfNotEmpty( cli, "-providerpath", request.getProviderpath() );
+ protected void buildWithKeyStoreParameters(KeyToolRequestWithKeyStoreParameters request, Commandline cli) {
+ addArgIfNotEmpty(cli, "-keystore", request.getKeystore());
+ addArgIfNotEmpty(cli, "-storepass", request.getStorepass());
+ addArgIfNotEmpty(cli, "-storetype", request.getStoretype());
+ addArgIfNotEmpty(cli, "-providername", request.getProvidername());
+ addArgIfNotEmpty(cli, "-providerclass", request.getProviderclass());
+ addArgIfNotEmpty(cli, "-providerarg", request.getProviderarg());
+ addArgIfNotEmpty(cli, "-providerpath", request.getProviderpath());
}
/**
@@ -153,11 +138,10 @@ protected void buildWithKeyStoreParameters( KeyToolRequestWithKeyStoreParameters
* @param request the keytool import request
* @param cli the commandline client to prepare
*/
- protected void buildWithKeyStoreAndAliasParameters( KeyToolRequestWithKeyStoreAndAliasParameters request,
- Commandline cli )
- {
- addArgIfNotEmpty( cli, "-protected", request.isPasswordProtected() ? Boolean.TRUE.toString() : "" );
- addArgIfNotEmpty( cli, "-alias", request.getAlias() );
+ protected void buildWithKeyStoreAndAliasParameters(
+ KeyToolRequestWithKeyStoreAndAliasParameters request, Commandline cli) {
+ addArgIfNotEmpty(cli, "-protected", request.isPasswordProtected() ? Boolean.TRUE.toString() : "");
+ addArgIfNotEmpty(cli, "-alias", request.getAlias());
}
/**
@@ -167,12 +151,10 @@ protected void buildWithKeyStoreAndAliasParameters( KeyToolRequestWithKeyStoreAn
* @param key the argument name.
* @param value the argument value to be added.
*/
- protected final void addArgIfNotEmpty( Commandline cli, String key, String value )
- {
- if ( !StringUtils.isEmpty( value ) )
- {
- addArg( cli, key );
- addArg( cli, value );
+ protected final void addArgIfNotEmpty(Commandline cli, String key, String value) {
+ if (!StringUtils.isEmpty(value)) {
+ addArg(cli, key);
+ addArg(cli, value);
}
}
@@ -184,13 +166,10 @@ protected final void addArgIfNotEmpty( Commandline cli, String key, String value
* @param values the argument values to be added.
* @since 1.6
*/
- protected final void addArgsIfNotEmpty( Commandline cli, String key, List values )
- {
- if ( values != null )
- {
- for( String value : values )
- {
- addArgIfNotEmpty( cli, key, value );
+ protected final void addArgsIfNotEmpty(Commandline cli, String key, List values) {
+ if (values != null) {
+ for (String value : values) {
+ addArgIfNotEmpty(cli, key, value);
}
}
}
@@ -202,12 +181,10 @@ protected final void addArgsIfNotEmpty( Commandline cli, String key, Listnull.
* @param cause The nested exception, may be null.
*/
- public CommandLineConfigurationException( String message, Throwable cause )
- {
- super( message, cause );
+ public CommandLineConfigurationException(String message, Throwable cause) {
+ super(message, cause);
}
/**
@@ -44,10 +41,7 @@ public CommandLineConfigurationException( String message, Throwable cause )
*
* @param message The detail message for this exception, may be null.
*/
- public CommandLineConfigurationException( String message )
- {
- super( message );
+ public CommandLineConfigurationException(String message) {
+ super(message);
}
-
}
-
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/DefaultKeyTool.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/DefaultKeyTool.java
index 998fda8..b200e20 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/DefaultKeyTool.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/DefaultKeyTool.java
@@ -29,11 +29,8 @@
* @author tchemit§
* @since 1.1
*/
-@Component( role = KeyTool.class, hint = "default" )
-public class DefaultKeyTool
- extends AbstractJavaTool
- implements KeyTool
-{
+@Component(role = KeyTool.class, hint = "default")
+public class DefaultKeyTool extends AbstractJavaTool implements KeyTool {
/**
* Command line builder.
*/
@@ -43,67 +40,50 @@ public class DefaultKeyTool
/**
* Constructor for DefaultKeyTool.
*/
- public DefaultKeyTool()
- {
- super( "keytool" );
+ public DefaultKeyTool() {
+ super("keytool");
}
/** {@inheritDoc} */
@Override
- protected Commandline createCommandLine( KeyToolRequest request, String javaToolFile )
- throws JavaToolException
- {
- builder.setLogger( getLogger() );
- builder.setKeyToolFile( javaToolFile );
+ protected Commandline createCommandLine(KeyToolRequest request, String javaToolFile) throws JavaToolException {
+ builder.setLogger(getLogger());
+ builder.setKeyToolFile(javaToolFile);
Commandline cli;
- try
- {
- cli = builder.build( request );
+ try {
+ cli = builder.build(request);
+ } catch (CommandLineConfigurationException | UnsupportedKeyToolRequestException e) {
+ throw new JavaToolException("Error configuring command-line. Reason: " + e.getMessage(), e);
}
- catch ( CommandLineConfigurationException | UnsupportedKeyToolRequestException e )
- {
- throw new JavaToolException( "Error configuring command-line. Reason: " + e.getMessage(), e );
- }
- if ( request.isVerbose() )
- {
- getLogger().info( cli.toString() );
- }
- else
- {
- getLogger().debug( cli.toString() );
+ if (request.isVerbose()) {
+ getLogger().info(cli.toString());
+ } else {
+ getLogger().debug(cli.toString());
}
return cli;
}
/** {@inheritDoc} */
@Override
- protected StreamConsumer createSystemOutStreamConsumer( KeyToolRequest request )
- {
+ protected StreamConsumer createSystemOutStreamConsumer(KeyToolRequest request) {
StreamConsumer systemOut = request.getSystemOutStreamConsumer();
- if ( systemOut == null )
- {
+ if (systemOut == null) {
final boolean verbose = request.isVerbose();
- systemOut = new StreamConsumer()
- {
+ systemOut = new StreamConsumer() {
/**
* {@inheritDoc}
*/
- public void consumeLine( final String line )
- {
- if ( verbose )
- {
- getLogger().info( line );
- }
- else
- {
- getLogger().debug( line );
+ public void consumeLine(final String line) {
+ if (verbose) {
+ getLogger().info(line);
+ } else {
+ getLogger().debug(line);
}
}
-
};
}
return systemOut;
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyTool.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyTool.java
index 5d7a633..33b2395 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyTool.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyTool.java
@@ -24,9 +24,7 @@
* @author tchemit
* @since 1.1
*/
-public interface KeyTool
- extends JavaTool
-{
+public interface KeyTool extends JavaTool {
/**
* Plexus role name.
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolCommandLineBuilder.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolCommandLineBuilder.java
index 4db4f79..d8a3853 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolCommandLineBuilder.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolCommandLineBuilder.java
@@ -25,8 +25,7 @@
* @author tchemit
* @since 1.1
*/
-public interface KeyToolCommandLineBuilder
-{
+public interface KeyToolCommandLineBuilder {
/**
* Plexus role name.
*/
@@ -41,7 +40,7 @@ public interface KeyToolCommandLineBuilder
* @return {@code true} if can create a such request type, {@code false} otherwise.
* @since 1.3
*/
- boolean supportRequestType( Class requestType );
+ boolean supportRequestType(Class requestType);
/**
* Build the commandline given the incoming keytool request.
@@ -52,22 +51,22 @@ public interface KeyToolCommandLineBuilder
* if could not find keytool executable
* @throws org.codehaus.mojo.keytool.UnsupportedKeyToolRequestException if any.
*/
- Commandline build( KeyToolRequest request )
- throws CommandLineConfigurationException, UnsupportedKeyToolRequestException;
+ Commandline build(KeyToolRequest request)
+ throws CommandLineConfigurationException, UnsupportedKeyToolRequestException;
/**
* Sets the logger used by the builder.
*
* @param logger logger to use in this builder
*/
- void setLogger( Logger logger );
+ void setLogger(Logger logger);
/**
* Sets the keytool executable location.
*
* @param keyToolFile keytool executable location to use in this builder
*/
- void setKeyToolFile( String keyToolFile );
+ void setKeyToolFile(String keyToolFile);
/**
* Checks that builder is ready to produce commandline from incoming request.
@@ -82,7 +81,5 @@ Commandline build( KeyToolRequest request )
* @since 1.3
* @throws org.codehaus.mojo.keytool.UnsupportedKeyToolRequestException if any.
*/
- void checkSupportedRequest( KeyToolRequest request )
- throws UnsupportedKeyToolRequestException;
-
+ void checkSupportedRequest(KeyToolRequest request) throws UnsupportedKeyToolRequestException;
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequest.java
index 0e65b78..98a98bf 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequest.java
@@ -16,10 +16,9 @@
* limitations under the License.
*/
-import org.apache.maven.shared.utils.cli.javatool.JavaToolRequest;
-
import java.io.File;
+import org.apache.maven.shared.utils.cli.javatool.JavaToolRequest;
/**
* Specifies the common parameters used to control a KeyTool tool invocation.
@@ -27,8 +26,7 @@
* @author tchemit
* @since 1.1
*/
-public interface KeyToolRequest extends JavaToolRequest
-{
+public interface KeyToolRequest extends JavaToolRequest {
/**
* Gets the value of the {@code verbose} field.
@@ -56,19 +54,19 @@ public interface KeyToolRequest extends JavaToolRequest
*
* @param verbose the new value of the field {@code verbose}.
*/
- void setVerbose( boolean verbose );
+ void setVerbose(boolean verbose);
/**
* Sets the new given value to the field {@code arguments} of the request.
*
* @param arguments the new value of the field {@code arguments}.
*/
- void setArguments( String[] arguments );
+ void setArguments(String[] arguments);
/**
* Sets the new given value to the field {@code workingDirectory} of the request.
*
* @param workingDirectory the new value of the field {@code workingDirectory}.
*/
- void setWorkingDirectory( File workingDirectory );
+ void setWorkingDirectory(File workingDirectory);
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequestWithKeyStoreAndAliasParameters.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequestWithKeyStoreAndAliasParameters.java
index a57fd3f..37c0ea0 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequestWithKeyStoreAndAliasParameters.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequestWithKeyStoreAndAliasParameters.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public interface KeyToolRequestWithKeyStoreAndAliasParameters
- extends KeyToolRequestWithKeyStoreParameters
-{
+public interface KeyToolRequestWithKeyStoreAndAliasParameters extends KeyToolRequestWithKeyStoreParameters {
/**
* Gets the value of the {@code alias} field.
@@ -38,7 +36,7 @@ public interface KeyToolRequestWithKeyStoreAndAliasParameters
*
* @param alias the new value of the field {@code alias}.
*/
- void setAlias( String alias );
+ void setAlias(String alias);
/**
* Gets the value of the {@code passwordProtected} field.
@@ -52,6 +50,5 @@ public interface KeyToolRequestWithKeyStoreAndAliasParameters
*
* @param passwordProtected value of the field {@code passwordProtected} to set
*/
- void setPasswordProtected( boolean passwordProtected );
-
+ void setPasswordProtected(boolean passwordProtected);
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequestWithKeyStoreParameters.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequestWithKeyStoreParameters.java
index b145a97..f670a28 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequestWithKeyStoreParameters.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolRequestWithKeyStoreParameters.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public interface KeyToolRequestWithKeyStoreParameters
- extends KeyToolRequest
-{
+public interface KeyToolRequestWithKeyStoreParameters extends KeyToolRequest {
/**
* Gets the value of the {@code keystore} field.
@@ -38,7 +36,7 @@ public interface KeyToolRequestWithKeyStoreParameters
*
* @param keystore the new value of the field {@code keystore}.
*/
- void setKeystore( String keystore );
+ void setKeystore(String keystore);
/**
* Gets the value of the {@code storetype} field.
@@ -52,7 +50,7 @@ public interface KeyToolRequestWithKeyStoreParameters
*
* @param storetype the new value of the field {@code storetype}.
*/
- void setStoretype( String storetype );
+ void setStoretype(String storetype);
/**
* Gets the value of the {@code storepass} field.
@@ -66,7 +64,7 @@ public interface KeyToolRequestWithKeyStoreParameters
*
* @param storepass the new value of the field {@code storepass}.
*/
- void setStorepass( String storepass );
+ void setStorepass(String storepass);
/**
* Gets the value of the {@code providername} field.
@@ -80,7 +78,7 @@ public interface KeyToolRequestWithKeyStoreParameters
*
* @param providername value of the field {@code providername} to set
*/
- void setProvidername( String providername );
+ void setProvidername(String providername);
/**
* Gets the value of the {@code providerclass} field.
@@ -94,7 +92,7 @@ public interface KeyToolRequestWithKeyStoreParameters
*
* @param providerclass value of the field {@code providerclass} to set
*/
- void setProviderclass( String providerclass );
+ void setProviderclass(String providerclass);
/**
* Gets the value of the {@code providerarg} field.
@@ -108,7 +106,7 @@ public interface KeyToolRequestWithKeyStoreParameters
*
* @param providerarg value of the field {@code providerarg} to set
*/
- void setProviderarg( String providerarg );
+ void setProviderarg(String providerarg);
/**
* Gets the value of the {@code providerpath} field.
@@ -122,6 +120,5 @@ public interface KeyToolRequestWithKeyStoreParameters
*
* @param providerpath value of the field {@code providerpath} to set
*/
- void setProviderpath( String providerpath );
-
+ void setProviderpath(String providerpath);
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolUtil.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolUtil.java
index 5f8e5f2..15d24b0 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolUtil.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/KeyToolUtil.java
@@ -16,42 +16,36 @@
* limitations under the License.
*/
-import org.apache.commons.lang3.SystemUtils;
-
import java.io.File;
+import org.apache.commons.lang3.SystemUtils;
+
/**
* Util methods for keytool.
*
* @author tchemit
* @since 1.1
*/
-public class KeyToolUtil
-{
+public class KeyToolUtil {
/**
* Constructs the operating system specific File path of the JRE cacerts file.
*
* @return a File representing the path to the command.
*/
- public static File getJRECACerts()
- {
+ public static File getJRECACerts() {
File cacertsFile;
String cacertsFilepath = "lib" + File.separator + "security" + File.separator + "cacerts";
// For IBM's JDK 1.2
- if ( SystemUtils.IS_OS_AIX )
+ if (SystemUtils.IS_OS_AIX) {
+ cacertsFile = new File(SystemUtils.getJavaHome() + "/", cacertsFilepath);
+ } else if (SystemUtils.IS_OS_MAC_OSX) // what about IS_OS_MAC_OS ??
{
- cacertsFile = new File( SystemUtils.getJavaHome() + "/", cacertsFilepath );
- }
- else if ( SystemUtils.IS_OS_MAC_OSX ) // what about IS_OS_MAC_OS ??
- {
- cacertsFile = new File( SystemUtils.getJavaHome() + "/", cacertsFilepath );
- }
- else
- {
- cacertsFile = new File( SystemUtils.getJavaHome() + "/", cacertsFilepath );
+ cacertsFile = new File(SystemUtils.getJavaHome() + "/", cacertsFilepath);
+ } else {
+ cacertsFile = new File(SystemUtils.getJavaHome() + "/", cacertsFilepath);
}
return cacertsFile;
@@ -60,7 +54,5 @@ else if ( SystemUtils.IS_OS_MAC_OSX ) // what about IS_OS_MAC_OS ??
/**
* Prevent instanciation of util class.
*/
- private KeyToolUtil()
- {
- }
+ private KeyToolUtil() {}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/UnsupportedKeyToolRequestException.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/UnsupportedKeyToolRequestException.java
index d5e4c84..608bc53 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/UnsupportedKeyToolRequestException.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/UnsupportedKeyToolRequestException.java
@@ -24,9 +24,7 @@
* @author tchemit
* @since 1.3
*/
-public class UnsupportedKeyToolRequestException
- extends JavaToolException
-{
+public class UnsupportedKeyToolRequestException extends JavaToolException {
private static final long serialVersionUID = 1L;
/**
@@ -35,9 +33,8 @@ public class UnsupportedKeyToolRequestException
* @param message a {@link java.lang.String} object
* @param cause a {@link java.lang.Throwable} object
*/
- public UnsupportedKeyToolRequestException( String message, Throwable cause )
- {
- super( message, cause );
+ public UnsupportedKeyToolRequestException(String message, Throwable cause) {
+ super(message, cause);
}
/**
@@ -45,8 +42,7 @@ public UnsupportedKeyToolRequestException( String message, Throwable cause )
*
* @param message a {@link java.lang.String} object
*/
- public UnsupportedKeyToolRequestException( String message )
- {
- super( message );
+ public UnsupportedKeyToolRequestException(String message) {
+ super(message);
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequest.java
index 24a2c7b..ac01e60 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequest.java
@@ -16,21 +16,18 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.shared.utils.cli.javatool.AbstractJavaToolRequest;
import org.codehaus.mojo.keytool.KeyToolRequest;
-import java.io.File;
-
/**
* Specifies the commons parameters used to control a key tool invocation.
*
* @author tchemit
* @since 1.1
*/
-public abstract class AbstractKeyToolRequest
- extends AbstractJavaToolRequest
- implements KeyToolRequest
-{
+public abstract class AbstractKeyToolRequest extends AbstractJavaToolRequest implements KeyToolRequest {
/**
* Verbose output.
@@ -53,8 +50,7 @@ public abstract class AbstractKeyToolRequest
*
* @return a boolean
*/
- public boolean isVerbose()
- {
+ public boolean isVerbose() {
return verbose;
}
@@ -63,8 +59,7 @@ public boolean isVerbose()
*
* @return an array of {@link java.lang.String} objects
*/
- public String[] getArguments()
- {
+ public String[] getArguments() {
return arguments;
}
@@ -73,14 +68,12 @@ public String[] getArguments()
*
* @return a {@link java.io.File} object
*/
- public File getWorkingDirectory()
- {
+ public File getWorkingDirectory() {
return workingDirectory;
}
/** {@inheritDoc} */
- public void setVerbose( boolean verbose )
- {
+ public void setVerbose(boolean verbose) {
this.verbose = verbose;
}
@@ -89,14 +82,12 @@ public void setVerbose( boolean verbose )
*
* @param arguments an array of {@link java.lang.String} objects
*/
- public void setArguments( String[] arguments )
- {
+ public void setArguments(String[] arguments) {
this.arguments = arguments;
}
/** {@inheritDoc} */
- public void setWorkingDirectory( File workingDirectory )
- {
+ public void setWorkingDirectory(File workingDirectory) {
this.workingDirectory = workingDirectory;
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestWithKeyStoreAndAliasParameters.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestWithKeyStoreAndAliasParameters.java
index e8e6dd8..ff3dda6 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestWithKeyStoreAndAliasParameters.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestWithKeyStoreAndAliasParameters.java
@@ -25,9 +25,7 @@
* @since 1.1
*/
public abstract class AbstractKeyToolRequestWithKeyStoreAndAliasParameters
- extends AbstractKeyToolRequestWithKeyStoreParameters
- implements KeyToolRequestWithKeyStoreAndAliasParameters
-{
+ extends AbstractKeyToolRequestWithKeyStoreParameters implements KeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Password through protected mechanism.
@@ -46,14 +44,12 @@ public abstract class AbstractKeyToolRequestWithKeyStoreAndAliasParameters
*
* @return a boolean
*/
- public final boolean isPasswordProtected()
- {
+ public final boolean isPasswordProtected() {
return passwordProtected;
}
/** {@inheritDoc} */
- public final void setPasswordProtected( boolean passwordProtected )
- {
+ public final void setPasswordProtected(boolean passwordProtected) {
this.passwordProtected = passwordProtected;
}
@@ -62,15 +58,12 @@ public final void setPasswordProtected( boolean passwordProtected )
*
* @return a {@link java.lang.String} object
*/
- public final String getAlias()
- {
+ public final String getAlias() {
return alias;
}
/** {@inheritDoc} */
- public final void setAlias( String alias )
- {
+ public final void setAlias(String alias) {
this.alias = alias;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestWithKeyStoreParameters.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestWithKeyStoreParameters.java
index 2d4b25d..efa771f 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestWithKeyStoreParameters.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/AbstractKeyToolRequestWithKeyStoreParameters.java
@@ -24,10 +24,8 @@
* @author tchemit
* @since 1.1
*/
-public abstract class AbstractKeyToolRequestWithKeyStoreParameters
- extends AbstractKeyToolRequest
- implements KeyToolRequestWithKeyStoreParameters
-{
+public abstract class AbstractKeyToolRequestWithKeyStoreParameters extends AbstractKeyToolRequest
+ implements KeyToolRequestWithKeyStoreParameters {
/**
* Provider name.
@@ -76,14 +74,12 @@ public abstract class AbstractKeyToolRequestWithKeyStoreParameters
*
* @return a {@link java.lang.String} object
*/
- public final String getProvidername()
- {
+ public final String getProvidername() {
return providername;
}
/** {@inheritDoc} */
- public final void setProvidername( String providername )
- {
+ public final void setProvidername(String providername) {
this.providername = providername;
}
@@ -92,14 +88,12 @@ public final void setProvidername( String providername )
*
* @return a {@link java.lang.String} object
*/
- public final String getProviderclass()
- {
+ public final String getProviderclass() {
return providerclass;
}
/** {@inheritDoc} */
- public final void setProviderclass( String providerclass )
- {
+ public final void setProviderclass(String providerclass) {
this.providerclass = providerclass;
}
@@ -108,14 +102,12 @@ public final void setProviderclass( String providerclass )
*
* @return a {@link java.lang.String} object
*/
- public final String getProviderarg()
- {
+ public final String getProviderarg() {
return providerarg;
}
/** {@inheritDoc} */
- public final void setProviderarg( String providerarg )
- {
+ public final void setProviderarg(String providerarg) {
this.providerarg = providerarg;
}
@@ -124,14 +116,12 @@ public final void setProviderarg( String providerarg )
*
* @return a {@link java.lang.String} object
*/
- public final String getProviderpath()
- {
+ public final String getProviderpath() {
return providerpath;
}
/** {@inheritDoc} */
- public final void setProviderpath( String providerpath )
- {
+ public final void setProviderpath(String providerpath) {
this.providerpath = providerpath;
}
@@ -140,14 +130,12 @@ public final void setProviderpath( String providerpath )
*
* @return a {@link java.lang.String} object
*/
- public final String getKeystore()
- {
+ public final String getKeystore() {
return keystore;
}
/** {@inheritDoc} */
- public final void setKeystore( String keystore )
- {
+ public final void setKeystore(String keystore) {
this.keystore = keystore;
}
@@ -156,14 +144,12 @@ public final void setKeystore( String keystore )
*
* @return a {@link java.lang.String} object
*/
- public final String getStoretype()
- {
+ public final String getStoretype() {
return storetype;
}
/** {@inheritDoc} */
- public final void setStoretype( String storetype )
- {
+ public final void setStoretype(String storetype) {
this.storetype = storetype;
}
@@ -172,15 +158,12 @@ public final void setStoretype( String storetype )
*
* @return a {@link java.lang.String} object
*/
- public final String getStorepass()
- {
+ public final String getStorepass() {
return storepass;
}
/** {@inheritDoc} */
- public final void setStorepass( String storepass )
- {
+ public final void setStorepass(String storepass) {
this.storepass = storepass;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeAliasRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeAliasRequest.java
index bd8484f..ca13911 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeAliasRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeAliasRequest.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolChangeAliasRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolChangeAliasRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Destination alias.
@@ -43,8 +41,7 @@ public class KeyToolChangeAliasRequest
*
* @return the value of the {@link #destalias} field
*/
- public String getDestalias()
- {
+ public String getDestalias() {
return destalias;
}
@@ -53,8 +50,7 @@ public String getDestalias()
*
* @param destalias value of the field {@link #destalias} to set
*/
- public void setDestalias( String destalias )
- {
+ public void setDestalias(String destalias) {
this.destalias = destalias;
}
@@ -63,8 +59,7 @@ public void setDestalias( String destalias )
*
* @return the value of the {@code keypass} field.
*/
- public String getKeypass()
- {
+ public String getKeypass() {
return keypass;
}
@@ -73,9 +68,7 @@ public String getKeypass()
*
* @param keypass the new value of the field {@code keypass}.
*/
- public void setKeypass( String keypass )
- {
+ public void setKeypass(String keypass) {
this.keypass = keypass;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeKeyPasswordRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeKeyPasswordRequest.java
index 4122d31..7432acd 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeKeyPasswordRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeKeyPasswordRequest.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolChangeKeyPasswordRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolChangeKeyPasswordRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* New password.
@@ -43,8 +41,7 @@ public class KeyToolChangeKeyPasswordRequest
*
* @return the value of the {@link #newPassword} field
*/
- public String getNewPassword()
- {
+ public String getNewPassword() {
return newPassword;
}
@@ -53,8 +50,7 @@ public String getNewPassword()
*
* @param newPassword value of the field {@link #newPassword} to set
*/
- public void setNewPassword( String newPassword )
- {
+ public void setNewPassword(String newPassword) {
this.newPassword = newPassword;
}
@@ -63,8 +59,7 @@ public void setNewPassword( String newPassword )
*
* @return the value of the {@code keypass} field.
*/
- public String getKeypass()
- {
+ public String getKeypass() {
return keypass;
}
@@ -73,8 +68,7 @@ public String getKeypass()
*
* @param keypass the new value of the field {@code keypass}.
*/
- public void setKeypass( String keypass )
- {
+ public void setKeypass(String keypass) {
this.keypass = keypass;
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeStorePasswordRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeStorePasswordRequest.java
index 17e96bc..7bb4ca1 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeStorePasswordRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolChangeStorePasswordRequest.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolChangeStorePasswordRequest
- extends AbstractKeyToolRequestWithKeyStoreParameters
-{
+public class KeyToolChangeStorePasswordRequest extends AbstractKeyToolRequestWithKeyStoreParameters {
/**
* New password.
@@ -37,8 +35,7 @@ public class KeyToolChangeStorePasswordRequest
*
* @return the value of the {@link #newPassword} field
*/
- public String getNewPassword()
- {
+ public String getNewPassword() {
return newPassword;
}
@@ -47,9 +44,7 @@ public String getNewPassword()
*
* @param newPassword value of the field {@link #newPassword} to set
*/
- public void setNewPassword( String newPassword )
- {
+ public void setNewPassword(String newPassword) {
this.newPassword = newPassword;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolDeleteRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolDeleteRequest.java
index 40df9b4..1ffb1bc 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolDeleteRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolDeleteRequest.java
@@ -22,8 +22,4 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolDeleteRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
-
-}
+public class KeyToolDeleteRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolExportCertificateRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolExportCertificateRequest.java
index d1a24c7..c5ecd52 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolExportCertificateRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolExportCertificateRequest.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolExportCertificateRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolExportCertificateRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Output in RFC style.
@@ -43,8 +41,7 @@ public class KeyToolExportCertificateRequest
*
* @return the value of the {@link #rfc} field
*/
- public boolean isRfc()
- {
+ public boolean isRfc() {
return rfc;
}
@@ -53,8 +50,7 @@ public boolean isRfc()
*
* @param rfc value of the field {@link #rfc} to set
*/
- public void setRfc( boolean rfc )
- {
+ public void setRfc(boolean rfc) {
this.rfc = rfc;
}
@@ -63,8 +59,7 @@ public void setRfc( boolean rfc )
*
* @return the value of the {@link #file} field
*/
- public String getFile()
- {
+ public String getFile() {
return file;
}
@@ -73,8 +68,7 @@ public String getFile()
*
* @param file value of the field {@link #file} to set
*/
- public void setFile( String file )
- {
+ public void setFile(String file) {
this.file = file;
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequest.java
index d8110a0..0c72b98 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequest.java
@@ -27,9 +27,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolGenerateCertificateRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolGenerateCertificateRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Key password.
@@ -90,8 +88,7 @@ public class KeyToolGenerateCertificateRequest
*
* @return the value of the {@link #rfc} field
*/
- public boolean isRfc()
- {
+ public boolean isRfc() {
return rfc;
}
@@ -100,8 +97,7 @@ public boolean isRfc()
*
* @param rfc value of the field {@link #rfc} to set
*/
- public void setRfc( boolean rfc )
- {
+ public void setRfc(boolean rfc) {
this.rfc = rfc;
}
@@ -110,8 +106,7 @@ public void setRfc( boolean rfc )
*
* @return the value of the {@link #infile} field
*/
- public File getInfile()
- {
+ public File getInfile() {
return infile;
}
@@ -120,8 +115,7 @@ public File getInfile()
*
* @param infile value of the field {@link #infile} to set
*/
- public void setInfile( File infile )
- {
+ public void setInfile(File infile) {
this.infile = infile;
}
@@ -130,8 +124,7 @@ public void setInfile( File infile )
*
* @return the value of the {@link #outfile} field
*/
- public File getOutfile()
- {
+ public File getOutfile() {
return outfile;
}
@@ -140,8 +133,7 @@ public File getOutfile()
*
* @param outfile value of the field {@link #outfile} to set
*/
- public void setOutfile( File outfile )
- {
+ public void setOutfile(File outfile) {
this.outfile = outfile;
}
@@ -150,8 +142,7 @@ public void setOutfile( File outfile )
*
* @return the value of the {@link #sigalg} field
*/
- public String getSigalg()
- {
+ public String getSigalg() {
return sigalg;
}
@@ -160,8 +151,7 @@ public String getSigalg()
*
* @param sigalg value of the field {@link #sigalg} to set
*/
- public void setSigalg( String sigalg )
- {
+ public void setSigalg(String sigalg) {
this.sigalg = sigalg;
}
@@ -170,8 +160,7 @@ public void setSigalg( String sigalg )
*
* @return the value of the {@link #dname} field
*/
- public String getDname()
- {
+ public String getDname() {
return dname;
}
@@ -180,8 +169,7 @@ public String getDname()
*
* @param dname value of the field {@link #dname} to set
*/
- public void setDname( String dname )
- {
+ public void setDname(String dname) {
this.dname = dname;
}
@@ -190,8 +178,7 @@ public void setDname( String dname )
*
* @return the value of the {@link #startdate} field
*/
- public String getStartdate()
- {
+ public String getStartdate() {
return startdate;
}
@@ -200,8 +187,7 @@ public String getStartdate()
*
* @param startdate value of the field {@link #startdate} to set
*/
- public void setStartdate( String startdate )
- {
+ public void setStartdate(String startdate) {
this.startdate = startdate;
}
@@ -210,8 +196,7 @@ public void setStartdate( String startdate )
*
* @return the value of the {@link #exts} field
*/
- public String getExt()
- {
+ public String getExt() {
return exts.isEmpty() ? null : exts.get(0);
}
@@ -220,12 +205,10 @@ public String getExt()
*
* @param ext value of the field {@link #exts} to set
*/
- public void setExt( String ext )
- {
+ public void setExt(String ext) {
exts.clear();
- if (ext != null)
- {
+ if (ext != null) {
exts.add(ext);
}
}
@@ -236,12 +219,10 @@ public void setExt( String ext )
* @param exts values of the field {@link #exts} to set
* @since 1.6
*/
- public void setExts( List exts )
- {
+ public void setExts(List exts) {
this.exts.clear();
- if (exts != null)
- {
+ if (exts != null) {
this.exts.addAll(exts);
}
}
@@ -252,8 +233,7 @@ public void setExts( List exts )
* @return the values of the {@link #exts} field
* @since 1.6
*/
- public List getExts()
- {
+ public List getExts() {
return exts;
}
@@ -262,8 +242,7 @@ public List getExts()
*
* @return the value of the {@link #validity} field
*/
- public String getValidity()
- {
+ public String getValidity() {
return validity;
}
@@ -272,8 +251,7 @@ public String getValidity()
*
* @param validity value of the field {@link #validity} to set
*/
- public void setValidity( String validity )
- {
+ public void setValidity(String validity) {
this.validity = validity;
}
@@ -282,8 +260,7 @@ public void setValidity( String validity )
*
* @return the value of the {@code keypass} field.
*/
- public String getKeypass()
- {
+ public String getKeypass() {
return keypass;
}
@@ -292,8 +269,7 @@ public String getKeypass()
*
* @param keypass the new value of the field {@code keypass}.
*/
- public void setKeypass( String keypass )
- {
+ public void setKeypass(String keypass) {
this.keypass = keypass;
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestRequest.java
index a0063ab..103e72e 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateCertificateRequestRequest.java
@@ -26,9 +26,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolGenerateCertificateRequestRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolGenerateCertificateRequestRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Signature algorithm name.
* See options.
@@ -64,8 +62,7 @@ public class KeyToolGenerateCertificateRequestRequest
*
* @return the value of the {@link #file} field
*/
- public File getFile()
- {
+ public File getFile() {
return file;
}
@@ -74,8 +71,7 @@ public File getFile()
*
* @param file value of the field {@link #file} to set
*/
- public void setFile( File file )
- {
+ public void setFile(File file) {
this.file = file;
}
@@ -84,8 +80,7 @@ public void setFile( File file )
*
* @return the value of the {@link #sigalg} field
*/
- public String getSigalg()
- {
+ public String getSigalg() {
return sigalg;
}
@@ -94,8 +89,7 @@ public String getSigalg()
*
* @param sigalg value of the field {@link #sigalg} to set
*/
- public void setSigalg( String sigalg )
- {
+ public void setSigalg(String sigalg) {
this.sigalg = sigalg;
}
@@ -105,8 +99,7 @@ public void setSigalg( String sigalg )
* @return the value of the {@link #exts} field
* @since 1.6
*/
- public String getExt()
- {
+ public String getExt() {
return exts.isEmpty() ? null : exts.get(0);
}
@@ -116,12 +109,10 @@ public String getExt()
* @param ext value of the field {@link #exts} to set
* @since 1.6
*/
- public void setExt( String ext )
- {
+ public void setExt(String ext) {
exts.clear();
- if (ext != null)
- {
+ if (ext != null) {
exts.add(ext);
}
}
@@ -132,12 +123,10 @@ public void setExt( String ext )
* @param exts values of the field {@link #exts} to set
* @since 1.6
*/
- public void setExts( List exts )
- {
+ public void setExts(List exts) {
this.exts.clear();
- if (exts != null)
- {
+ if (exts != null) {
this.exts.addAll(exts);
}
}
@@ -148,8 +137,7 @@ public void setExts( List exts )
* @return the values of the {@link #exts} field
* @since 1.6
*/
- public List getExts()
- {
+ public List getExts() {
return exts;
}
@@ -158,8 +146,7 @@ public List getExts()
*
* @return the value of the {@link #dname} field
*/
- public String getDname()
- {
+ public String getDname() {
return dname;
}
@@ -168,8 +155,7 @@ public String getDname()
*
* @param dname value of the field {@link #dname} to set
*/
- public void setDname( String dname )
- {
+ public void setDname(String dname) {
this.dname = dname;
}
@@ -178,8 +164,7 @@ public void setDname( String dname )
*
* @return the value of the {@code keypass} field.
*/
- public String getKeypass()
- {
+ public String getKeypass() {
return keypass;
}
@@ -188,8 +173,7 @@ public String getKeypass()
*
* @param keypass the new value of the field {@code keypass}.
*/
- public void setKeypass( String keypass )
- {
+ public void setKeypass(String keypass) {
this.keypass = keypass;
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateKeyPairRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateKeyPairRequest.java
index 12f2ab2..261fd35 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateKeyPairRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateKeyPairRequest.java
@@ -25,9 +25,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolGenerateKeyPairRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolGenerateKeyPairRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Key algorithm name.
@@ -82,8 +80,7 @@ public class KeyToolGenerateKeyPairRequest
*
* @return the value of the {@link #keyalg} field
*/
- public String getKeyalg()
- {
+ public String getKeyalg() {
return keyalg;
}
@@ -92,8 +89,7 @@ public String getKeyalg()
*
* @param keyalg value of the field {@link #keyalg} to set
*/
- public void setKeyalg( String keyalg )
- {
+ public void setKeyalg(String keyalg) {
this.keyalg = keyalg;
}
@@ -102,8 +98,7 @@ public void setKeyalg( String keyalg )
*
* @return the value of the {@link #keysize} field
*/
- public String getKeysize()
- {
+ public String getKeysize() {
return keysize;
}
@@ -112,8 +107,7 @@ public String getKeysize()
*
* @param keysize value of the field {@link #keysize} to set
*/
- public void setKeysize( String keysize )
- {
+ public void setKeysize(String keysize) {
this.keysize = keysize;
}
@@ -122,8 +116,7 @@ public void setKeysize( String keysize )
*
* @return the value of the {@code keypass} field.
*/
- public String getKeypass()
- {
+ public String getKeypass() {
return keypass;
}
@@ -132,8 +125,7 @@ public String getKeypass()
*
* @param keypass the new value of the field {@code keypass}.
*/
- public void setKeypass( String keypass )
- {
+ public void setKeypass(String keypass) {
this.keypass = keypass;
}
@@ -142,8 +134,7 @@ public void setKeypass( String keypass )
*
* @return the value of the {@link #sigalg} field
*/
- public String getSigalg()
- {
+ public String getSigalg() {
return sigalg;
}
@@ -152,8 +143,7 @@ public String getSigalg()
*
* @param sigalg value of the field {@link #sigalg} to set
*/
- public void setSigalg( String sigalg )
- {
+ public void setSigalg(String sigalg) {
this.sigalg = sigalg;
}
@@ -162,8 +152,7 @@ public void setSigalg( String sigalg )
*
* @return the value of the {@link #validity} field
*/
- public String getValidity()
- {
+ public String getValidity() {
return validity;
}
@@ -172,8 +161,7 @@ public String getValidity()
*
* @param validity value of the field {@link #validity} to set
*/
- public void setValidity( String validity )
- {
+ public void setValidity(String validity) {
this.validity = validity;
}
@@ -182,8 +170,7 @@ public void setValidity( String validity )
*
* @return the value of the {@link #dname} field
*/
- public String getDname()
- {
+ public String getDname() {
return dname;
}
@@ -192,10 +179,9 @@ public String getDname()
*
* @param dname value of the field {@link #dname} to set
*/
- public void setDname( String dname )
- {
+ public void setDname(String dname) {
// Remove any extra spaces, see http://jira.codehaus.org/browse/MKEYTOOL-10
- this.dname = dname.replaceAll( "\\s+", " " );
+ this.dname = dname.replaceAll("\\s+", " ");
}
/**
@@ -203,8 +189,7 @@ public void setDname( String dname )
*
* @return the value of the {@link #startdate} field
*/
- public String getStartdate()
- {
+ public String getStartdate() {
return startdate;
}
@@ -213,8 +198,7 @@ public String getStartdate()
*
* @param startdate value of the field {@link #startdate} to set
*/
- public void setStartdate( String startdate )
- {
+ public void setStartdate(String startdate) {
this.startdate = startdate;
}
@@ -223,8 +207,7 @@ public void setStartdate( String startdate )
*
* @return the value of the {@link #exts} field
*/
- public String getExt()
- {
+ public String getExt() {
return exts.isEmpty() ? null : exts.get(0);
}
@@ -233,12 +216,10 @@ public String getExt()
*
* @param ext value of the field {@link #exts} to set
*/
- public void setExt( String ext )
- {
+ public void setExt(String ext) {
this.exts.clear();
- if (ext != null)
- {
+ if (ext != null) {
this.exts.add(ext);
}
}
@@ -249,12 +230,10 @@ public void setExt( String ext )
* @param exts values of the field {@link #exts} to set
* @since 1.6
*/
- public void setExts( List exts )
- {
+ public void setExts(List exts) {
this.exts.clear();
- if (exts != null)
- {
+ if (exts != null) {
this.exts.addAll(exts);
}
}
@@ -265,8 +244,7 @@ public void setExts( List exts )
* @return the values of the {@link #exts} field
* @since 1.6
*/
- public List getExts()
- {
+ public List getExts() {
return exts;
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateSecretKeyRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateSecretKeyRequest.java
index 13c3ada..a64e970 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateSecretKeyRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolGenerateSecretKeyRequest.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolGenerateSecretKeyRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolGenerateSecretKeyRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Key algorithm name.
@@ -49,8 +47,7 @@ public class KeyToolGenerateSecretKeyRequest
*
* @return the value of the {@link #keyalg} field
*/
- public String getKeyalg()
- {
+ public String getKeyalg() {
return keyalg;
}
@@ -59,8 +56,7 @@ public String getKeyalg()
*
* @param keyalg value of the field {@link #keyalg} to set
*/
- public void setKeyalg( String keyalg )
- {
+ public void setKeyalg(String keyalg) {
this.keyalg = keyalg;
}
@@ -69,8 +65,7 @@ public void setKeyalg( String keyalg )
*
* @return the value of the {@link #keysize} field
*/
- public String getKeysize()
- {
+ public String getKeysize() {
return keysize;
}
@@ -79,8 +74,7 @@ public String getKeysize()
*
* @param keysize value of the field {@link #keysize} to set
*/
- public void setKeysize( String keysize )
- {
+ public void setKeysize(String keysize) {
this.keysize = keysize;
}
@@ -89,8 +83,7 @@ public void setKeysize( String keysize )
*
* @return the value of the {@link #keypass} field
*/
- public String getKeypass()
- {
+ public String getKeypass() {
return keypass;
}
@@ -99,9 +92,7 @@ public String getKeypass()
*
* @param keypass value of the field {@link #keypass} to set
*/
- public void setKeypass( String keypass )
- {
+ public void setKeypass(String keypass) {
this.keypass = keypass;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolImportCertificateRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolImportCertificateRequest.java
index d6158a7..fde7470 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolImportCertificateRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolImportCertificateRequest.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolImportCertificateRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolImportCertificateRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Key password.
* See options.
@@ -54,8 +52,7 @@ public class KeyToolImportCertificateRequest
*
* @return the value of the {@link #file} field
*/
- public String getFile()
- {
+ public String getFile() {
return file;
}
@@ -64,8 +61,7 @@ public String getFile()
*
* @param file value of the field {@link #file} to set
*/
- public void setFile( String file )
- {
+ public void setFile(String file) {
this.file = file;
}
@@ -74,8 +70,7 @@ public void setFile( String file )
*
* @return the value of the {@link #noprompt} field
*/
- public boolean isNoprompt()
- {
+ public boolean isNoprompt() {
return noprompt;
}
@@ -84,8 +79,7 @@ public boolean isNoprompt()
*
* @param noprompt value of the field {@link #noprompt} to set
*/
- public void setNoprompt( boolean noprompt )
- {
+ public void setNoprompt(boolean noprompt) {
this.noprompt = noprompt;
}
@@ -94,8 +88,7 @@ public void setNoprompt( boolean noprompt )
*
* @return the value of the {@link #trustcacerts} field
*/
- public boolean isTrustcacerts()
- {
+ public boolean isTrustcacerts() {
return trustcacerts;
}
@@ -104,8 +97,7 @@ public boolean isTrustcacerts()
*
* @param trustcacerts value of the field {@link #trustcacerts} to set
*/
- public void setTrustcacerts( boolean trustcacerts )
- {
+ public void setTrustcacerts(boolean trustcacerts) {
this.trustcacerts = trustcacerts;
}
@@ -114,8 +106,7 @@ public void setTrustcacerts( boolean trustcacerts )
*
* @return the value of the {@code keypass} field.
*/
- public String getKeypass()
- {
+ public String getKeypass() {
return keypass;
}
@@ -124,8 +115,7 @@ public String getKeypass()
*
* @param keypass the new value of the field {@code keypass}.
*/
- public void setKeypass( String keypass )
- {
+ public void setKeypass(String keypass) {
this.keypass = keypass;
}
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolImportKeystoreRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolImportKeystoreRequest.java
index f6facc3..29f3896 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolImportKeystoreRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolImportKeystoreRequest.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolImportKeystoreRequest
- extends AbstractKeyToolRequest
-{
+public class KeyToolImportKeystoreRequest extends AbstractKeyToolRequest {
/**
* Source keystore name.
@@ -133,8 +131,7 @@ public class KeyToolImportKeystoreRequest
*
* @return the value of the {@link #srckeystore} field
*/
- public String getSrckeystore()
- {
+ public String getSrckeystore() {
return srckeystore;
}
@@ -143,8 +140,7 @@ public String getSrckeystore()
*
* @param srckeystore value of the field {@link #srckeystore} to set
*/
- public void setSrckeystore( String srckeystore )
- {
+ public void setSrckeystore(String srckeystore) {
this.srckeystore = srckeystore;
}
@@ -153,8 +149,7 @@ public void setSrckeystore( String srckeystore )
*
* @return the value of the {@link #destkeystore} field
*/
- public String getDestkeystore()
- {
+ public String getDestkeystore() {
return destkeystore;
}
@@ -163,8 +158,7 @@ public String getDestkeystore()
*
* @param destkeystore value of the field {@link #destkeystore} to set
*/
- public void setDestkeystore( String destkeystore )
- {
+ public void setDestkeystore(String destkeystore) {
this.destkeystore = destkeystore;
}
@@ -173,8 +167,7 @@ public void setDestkeystore( String destkeystore )
*
* @return the value of the {@link #srcstoretype} field
*/
- public String getSrcstoretype()
- {
+ public String getSrcstoretype() {
return srcstoretype;
}
@@ -183,8 +176,7 @@ public String getSrcstoretype()
*
* @param srcstoretype value of the field {@link #srcstoretype} to set
*/
- public void setSrcstoretype( String srcstoretype )
- {
+ public void setSrcstoretype(String srcstoretype) {
this.srcstoretype = srcstoretype;
}
@@ -193,8 +185,7 @@ public void setSrcstoretype( String srcstoretype )
*
* @return the value of the {@link #deststoretype} field
*/
- public String getDeststoretype()
- {
+ public String getDeststoretype() {
return deststoretype;
}
@@ -203,8 +194,7 @@ public String getDeststoretype()
*
* @param deststoretype value of the field {@link #deststoretype} to set
*/
- public void setDeststoretype( String deststoretype )
- {
+ public void setDeststoretype(String deststoretype) {
this.deststoretype = deststoretype;
}
@@ -213,8 +203,7 @@ public void setDeststoretype( String deststoretype )
*
* @return the value of the {@link #srcstorepass} field
*/
- public String getSrcstorepass()
- {
+ public String getSrcstorepass() {
return srcstorepass;
}
@@ -223,8 +212,7 @@ public String getSrcstorepass()
*
* @param srcstorepass value of the field {@link #srcstorepass} to set
*/
- public void setSrcstorepass( String srcstorepass )
- {
+ public void setSrcstorepass(String srcstorepass) {
this.srcstorepass = srcstorepass;
}
@@ -233,8 +221,7 @@ public void setSrcstorepass( String srcstorepass )
*
* @return the value of the {@link #deststorepass} field
*/
- public String getDeststorepass()
- {
+ public String getDeststorepass() {
return deststorepass;
}
@@ -243,8 +230,7 @@ public String getDeststorepass()
*
* @param deststorepass value of the field {@link #deststorepass} to set
*/
- public void setDeststorepass( String deststorepass )
- {
+ public void setDeststorepass(String deststorepass) {
this.deststorepass = deststorepass;
}
@@ -253,8 +239,7 @@ public void setDeststorepass( String deststorepass )
*
* @return the value of the {@link #srcprotected} field
*/
- public boolean isSrcprotected()
- {
+ public boolean isSrcprotected() {
return srcprotected;
}
@@ -263,8 +248,7 @@ public boolean isSrcprotected()
*
* @param srcprotected value of the field {@link #srcprotected} to set
*/
- public void setSrcprotected( boolean srcprotected )
- {
+ public void setSrcprotected(boolean srcprotected) {
this.srcprotected = srcprotected;
}
@@ -273,8 +257,7 @@ public void setSrcprotected( boolean srcprotected )
*
* @return the value of the {@link #srcprovidername} field
*/
- public String getSrcprovidername()
- {
+ public String getSrcprovidername() {
return srcprovidername;
}
@@ -283,8 +266,7 @@ public String getSrcprovidername()
*
* @param srcprovidername value of the field {@link #srcprovidername} to set
*/
- public void setSrcprovidername( String srcprovidername )
- {
+ public void setSrcprovidername(String srcprovidername) {
this.srcprovidername = srcprovidername;
}
@@ -293,8 +275,7 @@ public void setSrcprovidername( String srcprovidername )
*
* @return the value of the {@link #destprovidername} field
*/
- public String getDestprovidername()
- {
+ public String getDestprovidername() {
return destprovidername;
}
@@ -303,8 +284,7 @@ public String getDestprovidername()
*
* @param destprovidername value of the field {@link #destprovidername} to set
*/
- public void setDestprovidername( String destprovidername )
- {
+ public void setDestprovidername(String destprovidername) {
this.destprovidername = destprovidername;
}
@@ -313,8 +293,7 @@ public void setDestprovidername( String destprovidername )
*
* @return the value of the {@link #srcalias} field
*/
- public String getSrcalias()
- {
+ public String getSrcalias() {
return srcalias;
}
@@ -323,8 +302,7 @@ public String getSrcalias()
*
* @param srcalias value of the field {@link #srcalias} to set
*/
- public void setSrcalias( String srcalias )
- {
+ public void setSrcalias(String srcalias) {
this.srcalias = srcalias;
}
@@ -333,8 +311,7 @@ public void setSrcalias( String srcalias )
*
* @return the value of the {@link #destalias} field
*/
- public String getDestalias()
- {
+ public String getDestalias() {
return destalias;
}
@@ -343,8 +320,7 @@ public String getDestalias()
*
* @param destalias value of the field {@link #destalias} to set
*/
- public void setDestalias( String destalias )
- {
+ public void setDestalias(String destalias) {
this.destalias = destalias;
}
@@ -353,8 +329,7 @@ public void setDestalias( String destalias )
*
* @return the value of the {@link #srckeypass} field
*/
- public String getSrckeypass()
- {
+ public String getSrckeypass() {
return srckeypass;
}
@@ -363,8 +338,7 @@ public String getSrckeypass()
*
* @param srckeypass value of the field {@link #srckeypass} to set
*/
- public void setSrckeypass( String srckeypass )
- {
+ public void setSrckeypass(String srckeypass) {
this.srckeypass = srckeypass;
}
@@ -373,8 +347,7 @@ public void setSrckeypass( String srckeypass )
*
* @return the value of the {@link #destkeypass} field
*/
- public String getDestkeypass()
- {
+ public String getDestkeypass() {
return destkeypass;
}
@@ -383,8 +356,7 @@ public String getDestkeypass()
*
* @param destkeypass value of the field {@link #destkeypass} to set
*/
- public void setDestkeypass( String destkeypass )
- {
+ public void setDestkeypass(String destkeypass) {
this.destkeypass = destkeypass;
}
@@ -393,8 +365,7 @@ public void setDestkeypass( String destkeypass )
*
* @return the value of the {@link #noprompt} field
*/
- public boolean isNoprompt()
- {
+ public boolean isNoprompt() {
return noprompt;
}
@@ -403,19 +374,16 @@ public boolean isNoprompt()
*
* @param noprompt value of the field {@link #noprompt} to set
*/
- public void setNoprompt( boolean noprompt )
- {
+ public void setNoprompt(boolean noprompt) {
this.noprompt = noprompt;
}
-
/**
* Gets the value of the {@link #providerclass} field.
*
* @return the value of the {@link #providerclass} field
*/
- public String getProviderclass()
- {
+ public String getProviderclass() {
return providerclass;
}
@@ -424,8 +392,7 @@ public String getProviderclass()
*
* @param providerclass value of the field {@link #providerclass} to set
*/
- public void setProviderclass( String providerclass )
- {
+ public void setProviderclass(String providerclass) {
this.providerclass = providerclass;
}
@@ -434,8 +401,7 @@ public void setProviderclass( String providerclass )
*
* @return the value of the {@link #providerarg} field
*/
- public String getProviderarg()
- {
+ public String getProviderarg() {
return providerarg;
}
@@ -444,8 +410,7 @@ public String getProviderarg()
*
* @param providerarg value of the field {@link #providerarg} to set
*/
- public void setProviderarg( String providerarg )
- {
+ public void setProviderarg(String providerarg) {
this.providerarg = providerarg;
}
@@ -454,8 +419,7 @@ public void setProviderarg( String providerarg )
*
* @return the value of the {@link #providerpath} field
*/
- public String getProviderpath()
- {
+ public String getProviderpath() {
return providerpath;
}
@@ -464,9 +428,7 @@ public String getProviderpath()
*
* @param providerpath value of the field {@link #providerpath} to set
*/
- public void setProviderpath( String providerpath )
- {
+ public void setProviderpath(String providerpath) {
this.providerpath = providerpath;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolListRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolListRequest.java
index f56d0cf..c4c19c8 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolListRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolListRequest.java
@@ -22,9 +22,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolListRequest
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters
-{
+public class KeyToolListRequest extends AbstractKeyToolRequestWithKeyStoreAndAliasParameters {
/**
* Output in RFC style.
@@ -37,8 +35,7 @@ public class KeyToolListRequest
*
* @return the value of the {@link #rfc} field
*/
- public boolean isRfc()
- {
+ public boolean isRfc() {
return rfc;
}
@@ -47,9 +44,7 @@ public boolean isRfc()
*
* @param rfc value of the field {@link #rfc} to set
*/
- public void setRfc( boolean rfc )
- {
+ public void setRfc(boolean rfc) {
this.rfc = rfc;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCRLFileRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCRLFileRequest.java
index 72ff407..6f9f59b 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCRLFileRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCRLFileRequest.java
@@ -24,9 +24,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolPrintCRLFileRequest
- extends AbstractKeyToolRequest
-{
+public class KeyToolPrintCRLFileRequest extends AbstractKeyToolRequest {
/**
* Input file name.
@@ -39,8 +37,7 @@ public class KeyToolPrintCRLFileRequest
*
* @return the value of the {@link #file} field
*/
- public File getFile()
- {
+ public File getFile() {
return file;
}
@@ -49,9 +46,7 @@ public File getFile()
*
* @param file value of the field {@link #file} to set
*/
- public void setFile( File file )
- {
+ public void setFile(File file) {
this.file = file;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequest.java
index f4b9650..3b9b0e1 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequest.java
@@ -24,9 +24,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolPrintCertificateRequest
- extends AbstractKeyToolRequest
-{
+public class KeyToolPrintCertificateRequest extends AbstractKeyToolRequest {
/**
* Output in RFC style.
@@ -57,8 +55,7 @@ public class KeyToolPrintCertificateRequest
*
* @return the value of the {@link #rfc} field
*/
- public boolean isRfc()
- {
+ public boolean isRfc() {
return rfc;
}
@@ -67,8 +64,7 @@ public boolean isRfc()
*
* @param rfc value of the field {@link #rfc} to set
*/
- public void setRfc( boolean rfc )
- {
+ public void setRfc(boolean rfc) {
this.rfc = rfc;
}
@@ -77,8 +73,7 @@ public void setRfc( boolean rfc )
*
* @return the value of the {@link #file} field
*/
- public File getFile()
- {
+ public File getFile() {
return file;
}
@@ -87,8 +82,7 @@ public File getFile()
*
* @param file value of the field {@link #file} to set
*/
- public void setFile( File file )
- {
+ public void setFile(File file) {
this.file = file;
}
@@ -97,8 +91,7 @@ public void setFile( File file )
*
* @return the value of the {@link #sslserver} field
*/
- public String getSslserver()
- {
+ public String getSslserver() {
return sslserver;
}
@@ -107,8 +100,7 @@ public String getSslserver()
*
* @param sslserver value of the field {@link #sslserver} to set
*/
- public void setSslserver( String sslserver )
- {
+ public void setSslserver(String sslserver) {
this.sslserver = sslserver;
}
@@ -117,8 +109,7 @@ public void setSslserver( String sslserver )
*
* @return the value of the {@link #jarfile} field
*/
- public File getJarfile()
- {
+ public File getJarfile() {
return jarfile;
}
@@ -127,9 +118,7 @@ public File getJarfile()
*
* @param jarfile value of the field {@link #jarfile} to set
*/
- public void setJarfile( File jarfile )
- {
+ public void setJarfile(File jarfile) {
this.jarfile = jarfile;
}
-
}
diff --git a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestRequest.java b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestRequest.java
index 0a60a0e..2be6c08 100644
--- a/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestRequest.java
+++ b/keytool-api/src/main/java/org/codehaus/mojo/keytool/requests/KeyToolPrintCertificateRequestRequest.java
@@ -24,9 +24,7 @@
* @author tchemit
* @since 1.1
*/
-public class KeyToolPrintCertificateRequestRequest
- extends AbstractKeyToolRequest
-{
+public class KeyToolPrintCertificateRequestRequest extends AbstractKeyToolRequest {
/**
* Input file name.
@@ -39,8 +37,7 @@ public class KeyToolPrintCertificateRequestRequest
*
* @return the value of the {@link #file} field
*/
- public File getFile()
- {
+ public File getFile() {
return file;
}
@@ -49,9 +46,7 @@ public File getFile()
*
* @param file value of the field {@link #file} to set
*/
- public void setFile( File file )
- {
+ public void setFile(File file) {
this.file = file;
}
-
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolMojo.java
index 2387c9c..3017b1f 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolMojo.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
import java.text.MessageFormat;
import java.util.ResourceBundle;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
/**
* Abstract class that contains fields/methods common to KeyTool Mojo classes.
*
@@ -29,23 +29,21 @@
* @author $Author$
* @version $Revision$
*/
-public abstract class AbstractKeyToolMojo
- extends AbstractMojo
-{
+public abstract class AbstractKeyToolMojo extends AbstractMojo {
/**
* Set to {@code true} to disable the plugin.
*
* @since 1.1
*/
- @Parameter( defaultValue = "false" )
+ @Parameter(defaultValue = "false")
private boolean skip;
/**
* Enable verbose mode (in mojo and in keytool command).
* See options.
*/
- @Parameter( defaultValue = "false" )
+ @Parameter(defaultValue = "false")
private boolean verbose;
/**
@@ -53,8 +51,7 @@ public abstract class AbstractKeyToolMojo
*
* @return value of the {@link #skip} flag
*/
- public final boolean isSkip()
- {
+ public final boolean isSkip() {
return skip;
}
@@ -63,8 +60,7 @@ public final boolean isSkip()
*
* @param skip the skip flag value to set.
*/
- public final void setSkip( boolean skip )
- {
+ public final void setSkip(boolean skip) {
this.skip = skip;
}
@@ -73,8 +69,7 @@ public final void setSkip( boolean skip )
*
* @return value of the {@link #verbose} flag
*/
- public final boolean isVerbose()
- {
+ public final boolean isVerbose() {
return verbose;
}
@@ -83,8 +78,7 @@ public final boolean isVerbose()
*
* @param verbose the verbose flag value to set.
*/
- public final void setVerbose( boolean verbose )
- {
+ public final void setVerbose(boolean verbose) {
this.verbose = verbose;
}
@@ -95,14 +89,12 @@ public final void setVerbose( boolean verbose )
* @param args Arguments to format the message with or {@code null}.
* @return The message with key {@code key} from the resource bundle backing the implementation.
*/
- private String getMessage( final String key, final Object[] args )
- {
- if ( key == null )
- {
- throw new NullPointerException( "key" );
+ private String getMessage(final String key, final Object[] args) {
+ if (key == null) {
+ throw new NullPointerException("key");
}
- return new MessageFormat( ResourceBundle.getBundle( "keytool" ).getString( key ) ).format( args );
+ return new MessageFormat(ResourceBundle.getBundle("keytool").getString(key)).format(args);
}
/**
@@ -111,9 +103,8 @@ private String getMessage( final String key, final Object[] args )
* @param key The key of the message to return.
* @return The message with key {@code key} from the resource bundle backing the implementation.
*/
- protected String getMessage( final String key )
- {
- return getMessage( key, new Object[]{ } );
+ protected String getMessage(final String key) {
+ return getMessage(key, new Object[] {});
}
/**
@@ -123,9 +114,8 @@ protected String getMessage( final String key )
* @param arg argument of the sentence to translate
* @return The message with key {@code key} from the resource bundle backing the implementation.
*/
- protected String getMessage( final String key, final Object arg )
- {
- return getMessage( key, new Object[]{ arg } );
+ protected String getMessage(final String key, final Object arg) {
+ return getMessage(key, new Object[] {arg});
}
/**
@@ -136,8 +126,7 @@ protected String getMessage( final String key, final Object arg )
* @param arg2 second argument of the sentence to translate
* @return The message with key {@code key} from the resource bundle backing the implementation.
*/
- protected String getMessage( final String key, final Object arg1, final Object arg2 )
- {
- return getMessage( key, new Object[]{ arg1, arg2 } );
+ protected String getMessage(final String key, final Object arg1, final Object arg2) {
+ return getMessage(key, new Object[] {arg1, arg2});
}
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestMojo.java
index 076fe13..842b70b 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestMojo.java
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
@@ -26,8 +28,6 @@
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
-import java.io.File;
-
/**
* Abstract keytool mojo implementing the {@link org.codehaus.mojo.keytool.KeyToolRequest}.
*
@@ -35,9 +35,7 @@
* @author tchemit
* @since 1.2
*/
-public abstract class AbstractKeyToolRequestMojo
- extends AbstractKeyToolMojo
-{
+public abstract class AbstractKeyToolRequestMojo extends AbstractKeyToolMojo {
/**
* List of additional arguments to append to the keytool command line.
@@ -54,7 +52,7 @@ public abstract class AbstractKeyToolRequestMojo
/**
* Where to execute the keytool command.
*/
- @Parameter( defaultValue = "${basedir}", required = true, alias = "workingdir" )
+ @Parameter(defaultValue = "${basedir}", required = true, alias = "workingdir")
private File workingDirectory;
/**
@@ -62,7 +60,7 @@ public abstract class AbstractKeyToolRequestMojo
*
* @since 1.2
*/
- @Component( role = KeyTool.class )
+ @Component(role = KeyTool.class)
private KeyTool keyTool;
/**
@@ -79,7 +77,7 @@ public abstract class AbstractKeyToolRequestMojo
*
* @since 1.4
*/
- @Parameter( defaultValue = "${session}", readonly = true )
+ @Parameter(defaultValue = "${session}", readonly = true)
private MavenSession session;
/**
@@ -92,8 +90,7 @@ public abstract class AbstractKeyToolRequestMojo
*
* @param requestType type of keytool request used by the mojo
*/
- protected AbstractKeyToolRequestMojo( Class requestType )
- {
+ protected AbstractKeyToolRequestMojo(Class requestType) {
this.requestType = requestType;
}
@@ -102,38 +99,29 @@ protected AbstractKeyToolRequestMojo( Class requestType )
*
* @throws org.apache.maven.plugin.MojoExecutionException if any.
*/
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
- if ( isSkip() )
- {
- getLog().info( getMessage( "disabled" ) );
- }
- else
- {
+ if (isSkip()) {
+ getLog().info(getMessage("disabled"));
+ } else {
// add toolchain support if found
Toolchain toolchain = getToolchain();
- if ( toolchain != null )
- {
- getLog().info( "Toolchain in keytool-maven-plugin: " + toolchain );
+ if (toolchain != null) {
+ getLog().info("Toolchain in keytool-maven-plugin: " + toolchain);
keyTool.setToolchain(toolchain);
}
- //creates the keytool request
+ // creates the keytool request
R request = createKeytoolRequest();
- try
- {
- JavaToolResult result = keyTool.execute( request );
+ try {
+ JavaToolResult result = keyTool.execute(request);
- consumeResult( result );
- }
- catch ( JavaToolException e )
- {
- throw new MojoExecutionException( getMessage( "commandLineException", e.getMessage() ), e );
+ consumeResult(result);
+ } catch (JavaToolException e) {
+ throw new MojoExecutionException(getMessage("commandLineException", e.getMessage()), e);
}
}
}
@@ -144,23 +132,19 @@ public void execute()
* @return the created keytool request
* @see KeyToolRequest
*/
- protected R createKeytoolRequest()
- {
+ protected R createKeytoolRequest() {
R request;
- try
- {
+ try {
request = requestType.getConstructor().newInstance();
- }
- catch ( Exception e )
- {
+ } catch (Exception e) {
// just throw a runtime exception : this should never happen!
- throw new RuntimeException( "Failed to create keytool request ", e );
+ throw new RuntimeException("Failed to create keytool request ", e);
}
// add default parameters
- request.setVerbose( isVerbose() );
- request.setWorkingDirectory( this.workingDirectory );
- request.setArguments( this.arguments );
+ request.setVerbose(isVerbose());
+ request.setWorkingDirectory(this.workingDirectory);
+ request.setArguments(this.arguments);
return request;
}
@@ -171,11 +155,9 @@ protected R createKeytoolRequest()
* @param commandLine The {@code Commandline} to get a string representation of (can not be null).
* @return The string representation of {@code commandLine}.
*/
- protected String getCommandlineInfo( final Commandline commandLine )
- {
- if ( commandLine == null )
- {
- throw new NullPointerException( "commandLine" );
+ protected String getCommandlineInfo(final Commandline commandLine) {
+ if (commandLine == null) {
+ throw new NullPointerException("commandLine");
}
return commandLine.toString();
}
@@ -186,16 +168,13 @@ protected String getCommandlineInfo( final Commandline commandLine )
* @param result result of the command line action
* @throws org.apache.maven.plugin.MojoExecutionException if the result is not 0 (means something bad occurs)
*/
- protected final void consumeResult( JavaToolResult result )
- throws MojoExecutionException
- {
+ protected final void consumeResult(JavaToolResult result) throws MojoExecutionException {
Commandline commandLine = result.getCommandline();
int resultCode = result.getExitCode();
- if ( resultCode != 0 )
- {
- throw new MojoExecutionException( getMessage( "failure", getCommandlineInfo( commandLine ), resultCode ) );
+ if (resultCode != 0) {
+ throw new MojoExecutionException(getMessage("failure", getCommandlineInfo(commandLine), resultCode));
}
}
@@ -206,12 +185,10 @@ protected final void consumeResult( JavaToolResult result )
*
* @return Toolchain instance
*/
- private Toolchain getToolchain()
- {
+ private Toolchain getToolchain() {
Toolchain tc = null;
- if ( toolchainManager != null )
- {
- tc = toolchainManager.getToolchainFromBuildContext( "jdk", session );
+ if (toolchainManager != null) {
+ tc = toolchainManager.getToolchainFromBuildContext("jdk", session);
}
return tc;
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo.java
index 5bd2f8d..8f88b92 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo.java
@@ -25,9 +25,9 @@
* @author tchemit
* @since 1.2
*/
-public abstract class AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
- extends AbstractKeyToolRequestWithKeyStoreParametersMojo
-{
+public abstract class AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo<
+ R extends KeyToolRequestWithKeyStoreAndAliasParameters>
+ extends AbstractKeyToolRequestWithKeyStoreParametersMojo {
/**
* Password through protected mechanism.
* See options.
@@ -49,19 +49,17 @@ public abstract class AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo requestType )
- {
- super( requestType );
+ protected AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo(Class requestType) {
+ super(requestType);
}
/** {@inheritDoc} */
@Override
- protected R createKeytoolRequest()
- {
+ protected R createKeytoolRequest() {
R request = super.createKeytoolRequest();
- request.setPasswordProtected( this.passwordProtected );
- request.setAlias( this.alias );
+ request.setPasswordProtected(this.passwordProtected);
+ request.setAlias(this.alias);
return request;
}
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestWithKeyStoreParametersMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestWithKeyStoreParametersMojo.java
index 2e891d2..9702d33 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestWithKeyStoreParametersMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/AbstractKeyToolRequestWithKeyStoreParametersMojo.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import java.io.File;
+import java.net.MalformedURLException;
+
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.shared.utils.cli.Commandline;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.net.MalformedURLException;
-
/**
* Abstract mojo to execute a {@link org.codehaus.mojo.keytool.KeyToolRequestWithKeyStoreParameters} request.
*
@@ -31,8 +31,7 @@
* @since 1.2
*/
public abstract class AbstractKeyToolRequestWithKeyStoreParametersMojo
- extends AbstractKeyToolRequestMojo
-{
+ extends AbstractKeyToolRequestMojo {
/**
* Keystore location.
@@ -52,7 +51,7 @@ public abstract class AbstractKeyToolRequestWithKeyStoreParametersMojooptions.
*/
- @Parameter( alias = "storepass" )
+ @Parameter(alias = "storepass")
private String storepass;
/**
@@ -96,47 +95,43 @@ public abstract class AbstractKeyToolRequestWithKeyStoreParametersMojo requestType )
- {
- super( requestType );
+ public AbstractKeyToolRequestWithKeyStoreParametersMojo(Class requestType) {
+ super(requestType);
}
/** {@inheritDoc} */
@Override
- protected R createKeytoolRequest()
- {
+ protected R createKeytoolRequest() {
R request = super.createKeytoolRequest();
- if ( StringUtils.isNotEmpty( keystore ) )
- {
+ if (StringUtils.isNotEmpty(keystore)) {
- File file = getFile( keystore );
+ File file = getFile(keystore);
// make sure the parent directory of the keystore exists
boolean mkdirs = file.getParentFile().mkdirs();
- getLog().debug( "mdkirs: " + mkdirs + " " + file.getParentFile() );
+ getLog().debug("mdkirs: " + mkdirs + " " + file.getParentFile());
// force to not use this parameter
- request.setKeystore( file.getAbsolutePath() );
+ request.setKeystore(file.getAbsolutePath());
}
- request.setProviderarg( providerarg );
- request.setProviderclass( providerclass );
- request.setProvidername( providername );
- request.setProviderpath( providerpath );
- request.setStorepass( storepass );
- request.setStoretype( storetype );
+ request.setProviderarg(providerarg);
+ request.setProviderclass(providerclass);
+ request.setProvidername(providername);
+ request.setProviderpath(providerpath);
+ request.setStorepass(storepass);
+ request.setStoretype(storetype);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( final Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(final Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.storepass, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.storepass, "'*****'");
return commandLineInfo;
}
@@ -146,17 +141,14 @@ protected String getCommandlineInfo( final Commandline commandLine )
*
* @param file file location to check
*/
- protected final void createParentDirIfNecessary( final String file )
- {
- if ( file != null )
- {
- final File fileDir = new File( file ).getParentFile();
-
- if ( fileDir != null )
- {
+ protected final void createParentDirIfNecessary(final String file) {
+ if (file != null) {
+ final File fileDir = new File(file).getParentFile();
+
+ if (fileDir != null) {
// not a relative path
boolean mkdirs = fileDir.mkdirs();
- getLog().debug( "mdkirs: " + mkdirs + " " + fileDir );
+ getLog().debug("mdkirs: " + mkdirs + " " + fileDir);
}
}
}
@@ -167,16 +159,12 @@ protected final void createParentDirIfNecessary( final String file )
* @param path a {@link java.lang.String} object
* @return a {@link java.io.File} object
*/
- protected File getFile( String path )
+ protected File getFile(String path) {
- {
- try
- {
- return new File( new File( path ).toURL().getFile() );
- }
- catch ( MalformedURLException e )
- {
- throw new IllegalStateException( "Could not obtain directory " + path );
+ try {
+ return new File(new File(path).toURL().getFile());
+ } catch (MalformedURLException e) {
+ throw new IllegalStateException("Could not obtain directory " + path);
}
}
@@ -185,8 +173,7 @@ protected File getFile( String path )
*
* @return a {@link java.io.File} object
*/
- protected File getKeystoreFile()
- {
+ protected File getKeystoreFile() {
return getFile(keystore);
}
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeAliasMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeAliasMojo.java
index 75aa698..ce6f379 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeAliasMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeAliasMojo.java
@@ -31,10 +31,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "changeAlias", requiresProject = true, threadSafe = true )
+@Mojo(name = "changeAlias", requiresProject = true, threadSafe = true)
public class ChangeAliasMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Destination alias.
@@ -57,9 +56,8 @@ public class ChangeAliasMojo
/**
* Default contructor.
*/
- public ChangeAliasMojo()
- {
- super( KeyToolChangeAliasRequest.class );
+ public ChangeAliasMojo() {
+ super(KeyToolChangeAliasRequest.class);
}
/**
@@ -67,8 +65,7 @@ public ChangeAliasMojo()
*
* @return the value of the {@link #destalias} field
*/
- public String getDestalias()
- {
+ public String getDestalias() {
return destalias;
}
@@ -77,8 +74,7 @@ public String getDestalias()
*
* @param destalias value of the field {@link #destalias} to set
*/
- public void setDestalias( String destalias )
- {
+ public void setDestalias(String destalias) {
this.destalias = destalias;
}
@@ -87,8 +83,7 @@ public void setDestalias( String destalias )
*
* @return the value of the {@code keypass} field.
*/
- public String getKeypass()
- {
+ public String getKeypass() {
return keypass;
}
@@ -97,28 +92,25 @@ public String getKeypass()
*
* @param keypass the new value of the field {@code keypass}.
*/
- public void setKeypass( String keypass )
- {
+ public void setKeypass(String keypass) {
this.keypass = keypass;
}
/** {@inheritDoc} */
@Override
- protected KeyToolChangeAliasRequest createKeytoolRequest()
- {
+ protected KeyToolChangeAliasRequest createKeytoolRequest() {
KeyToolChangeAliasRequest request = super.createKeytoolRequest();
- request.setDestalias( this.destalias );
- request.setKeypass( this.keypass );
+ request.setDestalias(this.destalias);
+ request.setKeypass(this.keypass);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.keypass, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.keypass, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeKeyPasswordMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeKeyPasswordMojo.java
index 0632471..3d253c5 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeKeyPasswordMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeKeyPasswordMojo.java
@@ -30,10 +30,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "changeKeyPassword", requiresProject = true, threadSafe = true )
+@Mojo(name = "changeKeyPassword", requiresProject = true, threadSafe = true)
public class ChangeKeyPasswordMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* New password.
@@ -56,29 +55,26 @@ public class ChangeKeyPasswordMojo
/**
* Default contructor.
*/
- public ChangeKeyPasswordMojo()
- {
- super( KeyToolChangeKeyPasswordRequest.class );
+ public ChangeKeyPasswordMojo() {
+ super(KeyToolChangeKeyPasswordRequest.class);
}
/** {@inheritDoc} */
@Override
- protected KeyToolChangeKeyPasswordRequest createKeytoolRequest()
- {
+ protected KeyToolChangeKeyPasswordRequest createKeytoolRequest() {
KeyToolChangeKeyPasswordRequest request = super.createKeytoolRequest();
- request.setNewPassword( this.newPassword );
- request.setKeypass( this.keypass );
+ request.setNewPassword(this.newPassword);
+ request.setKeypass(this.keypass);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.keypass, "'*****'" );
- commandLineInfo = StringUtils.replace( commandLineInfo, this.newPassword, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.keypass, "'*****'");
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.newPassword, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeStorePasswordMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeStorePasswordMojo.java
index 206b6ea..ce3b212 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeStorePasswordMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ChangeStorePasswordMojo.java
@@ -30,10 +30,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "changeStorePassword", requiresProject = true, threadSafe = true )
+@Mojo(name = "changeStorePassword", requiresProject = true, threadSafe = true)
public class ChangeStorePasswordMojo
- extends AbstractKeyToolRequestWithKeyStoreParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreParametersMojo {
/**
* New password.
@@ -47,27 +46,24 @@ public class ChangeStorePasswordMojo
/**
* Default contructor.
*/
- public ChangeStorePasswordMojo()
- {
- super( KeyToolChangeStorePasswordRequest.class );
+ public ChangeStorePasswordMojo() {
+ super(KeyToolChangeStorePasswordRequest.class);
}
/** {@inheritDoc} */
@Override
- protected KeyToolChangeStorePasswordRequest createKeytoolRequest()
- {
+ protected KeyToolChangeStorePasswordRequest createKeytoolRequest() {
KeyToolChangeStorePasswordRequest request = super.createKeytoolRequest();
- request.setNewPassword( this.newPassword );
+ request.setNewPassword(this.newPassword);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.newPassword, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.newPassword, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/CleanKeyMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/CleanKeyMojo.java
index fe6219d..337d4ed 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/CleanKeyMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/CleanKeyMojo.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-
/**
* A Mojo that deletes a generated keystore file.
*
@@ -29,10 +29,8 @@
* @author $Author$
* @version $Revision$
*/
-@Mojo( name = "clean", defaultPhase = LifecyclePhase.CLEAN, threadSafe = true )
-public class CleanKeyMojo
- extends AbstractKeyToolMojo
-{
+@Mojo(name = "clean", defaultPhase = LifecyclePhase.CLEAN, threadSafe = true)
+public class CleanKeyMojo extends AbstractKeyToolMojo {
/**
* See options.
@@ -45,8 +43,7 @@ public class CleanKeyMojo
*
* @return Returns the keystore.
*/
- public final String getKeystore()
- {
+ public final String getKeystore() {
return this.keystore;
}
@@ -55,30 +52,22 @@ public final String getKeystore()
*
* @param keystore The keystore to set.
*/
- public final void setKeystore( String keystore )
- {
+ public final void setKeystore(String keystore) {
this.keystore = keystore;
}
/**
* {@inheritDoc}
*/
- public void execute()
- {
- if ( isSkip() )
- {
- getLog().info( getMessage( "disabled", null ) );
- }
- else
- {
- File keystoreFile = new File( this.getKeystore() );
- if ( keystoreFile.delete() )
- {
- getLog().info( "Keystore file '" + keystoreFile + "' deleted successfully." );
- }
- else
- {
- getLog().warn( "Keystore file '" + keystoreFile + "' doesn't exist." );
+ public void execute() {
+ if (isSkip()) {
+ getLog().info(getMessage("disabled", null));
+ } else {
+ File keystoreFile = new File(this.getKeystore());
+ if (keystoreFile.delete()) {
+ getLog().info("Keystore file '" + keystoreFile + "' deleted successfully.");
+ } else {
+ getLog().warn("Keystore file '" + keystoreFile + "' doesn't exist.");
}
}
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/DeleteAliasMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/DeleteAliasMojo.java
index 0a65ea0..b5e38cb 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/DeleteAliasMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/DeleteAliasMojo.java
@@ -27,17 +27,13 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "deleteAlias", requiresProject = true, threadSafe = true )
-public class DeleteAliasMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+@Mojo(name = "deleteAlias", requiresProject = true, threadSafe = true)
+public class DeleteAliasMojo extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Default contructor.
*/
- public DeleteAliasMojo()
- {
- super( KeyToolDeleteRequest.class );
+ public DeleteAliasMojo() {
+ super(KeyToolDeleteRequest.class);
}
-
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ExportCertificateMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ExportCertificateMojo.java
index 13596f1..8a3c743 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ExportCertificateMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ExportCertificateMojo.java
@@ -29,10 +29,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "exportCertificate", requiresProject = true, threadSafe = true )
+@Mojo(name = "exportCertificate", requiresProject = true, threadSafe = true)
public class ExportCertificateMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Output in RFC style.
@@ -55,9 +54,8 @@ public class ExportCertificateMojo
/**
* Default contructor.
*/
- public ExportCertificateMojo()
- {
- super( KeyToolExportCertificateRequest.class );
+ public ExportCertificateMojo() {
+ super(KeyToolExportCertificateRequest.class);
}
/** {@inheritDoc} */
@@ -69,12 +67,11 @@ public void execute() throws MojoExecutionException {
/** {@inheritDoc} */
@Override
- protected KeyToolExportCertificateRequest createKeytoolRequest()
- {
+ protected KeyToolExportCertificateRequest createKeytoolRequest() {
KeyToolExportCertificateRequest request = super.createKeytoolRequest();
- request.setFile( this.file );
- request.setRfc( this.rfc );
+ request.setFile(this.file);
+ request.setRfc(this.rfc);
return request;
}
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateCertificateMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateCertificateMojo.java
index cd2c325..42c74dd 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateCertificateMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateCertificateMojo.java
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -23,9 +26,6 @@
import org.codehaus.mojo.keytool.requests.KeyToolGenerateCertificateRequest;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.List;
-
/**
* To generate certificate from a certificate request from a keystore.
* Implemented as a wrapper around the SDK {@code keytool -gencert} command.
@@ -35,10 +35,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "generateCertificate", requiresProject = true, threadSafe = true )
+@Mojo(name = "generateCertificate", requiresProject = true, threadSafe = true)
public class GenerateCertificateMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Key password.
* See options.
@@ -135,9 +134,8 @@ public class GenerateCertificateMojo
/**
* Default contructor.
*/
- public GenerateCertificateMojo()
- {
- super( KeyToolGenerateCertificateRequest.class );
+ public GenerateCertificateMojo() {
+ super(KeyToolGenerateCertificateRequest.class);
}
/** {@inheritDoc} */
@@ -149,33 +147,31 @@ public void execute() throws MojoExecutionException {
/** {@inheritDoc} */
@Override
- protected KeyToolGenerateCertificateRequest createKeytoolRequest()
- {
+ protected KeyToolGenerateCertificateRequest createKeytoolRequest() {
KeyToolGenerateCertificateRequest request = super.createKeytoolRequest();
- request.setKeypass( this.keypass );
- request.setRfc( this.rfc );
- request.setInfile( this.infile );
- request.setOutfile( this.outfile );
- request.setSigalg( this.sigalg );
- request.setDname( this.dname );
- request.setStartdate( this.startdate );
+ request.setKeypass(this.keypass);
+ request.setRfc(this.rfc);
+ request.setInfile(this.infile);
+ request.setOutfile(this.outfile);
+ request.setSigalg(this.sigalg);
+ request.setDname(this.dname);
+ request.setStartdate(this.startdate);
if (this.exts != null && !this.exts.isEmpty()) {
request.setExts(exts);
} else {
request.setExt(ext);
}
- request.setValidity( this.validity );
+ request.setValidity(this.validity);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.keypass, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.keypass, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateCertificateRequestMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateCertificateRequestMojo.java
index e45ab08..de8f149 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateCertificateRequestMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateCertificateRequestMojo.java
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -23,9 +26,6 @@
import org.codehaus.mojo.keytool.requests.KeyToolGenerateCertificateRequestRequest;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.List;
-
/**
* To generate certificate request.
* Implemented as a wrapper around the SDK {@code keytool -certreq} command.
@@ -34,10 +34,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "generateCertificateRequest", requiresProject = true, threadSafe = true )
+@Mojo(name = "generateCertificateRequest", requiresProject = true, threadSafe = true)
public class GenerateCertificateRequestMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Key password.
* See options.
@@ -98,9 +97,8 @@ public class GenerateCertificateRequestMojo
/**
* Default contructor.
*/
- public GenerateCertificateRequestMojo()
- {
- super( KeyToolGenerateCertificateRequestRequest.class );
+ public GenerateCertificateRequestMojo() {
+ super(KeyToolGenerateCertificateRequestRequest.class);
}
/** {@inheritDoc} */
@@ -112,29 +110,27 @@ public void execute() throws MojoExecutionException {
/** {@inheritDoc} */
@Override
- protected KeyToolGenerateCertificateRequestRequest createKeytoolRequest()
- {
+ protected KeyToolGenerateCertificateRequestRequest createKeytoolRequest() {
KeyToolGenerateCertificateRequestRequest request = super.createKeytoolRequest();
- request.setSigalg( this.sigalg );
+ request.setSigalg(this.sigalg);
if (this.exts != null && !this.exts.isEmpty()) {
request.setExts(exts);
} else {
request.setExt(ext);
}
- request.setDname( this.dname );
- request.setFile( this.file );
- request.setKeypass( this.keypass );
+ request.setDname(this.dname);
+ request.setFile(this.file);
+ request.setKeypass(this.keypass);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.keypass, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.keypass, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateKeyPairMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateKeyPairMojo.java
index 10ee0ef..a065e30 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateKeyPairMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateKeyPairMojo.java
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -23,9 +26,6 @@
import org.codehaus.mojo.keytool.requests.KeyToolGenerateKeyPairRequest;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.List;
-
/**
* To generate a key pair into a keystore.
* Implemented as a wrapper around the SDK {@code keytool -genkey} (jdk 1.5) {@code keytool -genkeypair} (jdk 1.6)
@@ -35,10 +35,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "generateKeyPair", requiresProject = true, threadSafe = true )
+@Mojo(name = "generateKeyPair", requiresProject = true, threadSafe = true)
public class GenerateKeyPairMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Key algorithm name.
@@ -134,62 +133,54 @@ public class GenerateKeyPairMojo
/**
* Default contructor.
*/
- public GenerateKeyPairMojo()
- {
- super( KeyToolGenerateKeyPairRequest.class );
+ public GenerateKeyPairMojo() {
+ super(KeyToolGenerateKeyPairRequest.class);
}
/** {@inheritDoc} */
@Override
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
- if ( skipIfExist )
- {
+ if (skipIfExist) {
// check if keystore already exist
File keystoreFile = getKeystoreFile();
boolean keystoreFileExists = keystoreFile.exists();
- if ( keystoreFileExists )
- {
- getLog().info( "Skip execution, keystore already exists at " + keystoreFile );
- setSkip( true );
+ if (keystoreFileExists) {
+ getLog().info("Skip execution, keystore already exists at " + keystoreFile);
+ setSkip(true);
}
-
}
super.execute();
}
/** {@inheritDoc} */
@Override
- protected KeyToolGenerateKeyPairRequest createKeytoolRequest()
- {
+ protected KeyToolGenerateKeyPairRequest createKeytoolRequest() {
KeyToolGenerateKeyPairRequest request = super.createKeytoolRequest();
- request.setKeyalg( this.keyalg );
- request.setKeysize( this.keysize );
- request.setKeypass( this.keypass );
- request.setSigalg( this.sigalg );
- request.setDname( this.dname );
- request.setStartdate( this.startdate );
+ request.setKeyalg(this.keyalg);
+ request.setKeysize(this.keysize);
+ request.setKeypass(this.keypass);
+ request.setSigalg(this.sigalg);
+ request.setDname(this.dname);
+ request.setStartdate(this.startdate);
if (this.exts != null && !this.exts.isEmpty()) {
request.setExts(exts);
} else {
request.setExt(ext);
}
- request.setValidity( this.validity );
+ request.setValidity(this.validity);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.keypass, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.keypass, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateSecretKeyMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateSecretKeyMojo.java
index 9e7ab91..f8c90f9 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateSecretKeyMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/GenerateSecretKeyMojo.java
@@ -29,10 +29,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "generateSecretKey", requiresProject = true, threadSafe = true )
+@Mojo(name = "generateSecretKey", requiresProject = true, threadSafe = true)
public class GenerateSecretKeyMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Key algorithm name.
@@ -64,30 +63,27 @@ public class GenerateSecretKeyMojo
/**
* Default contructor.
*/
- public GenerateSecretKeyMojo()
- {
- super( KeyToolGenerateSecretKeyRequest.class );
+ public GenerateSecretKeyMojo() {
+ super(KeyToolGenerateSecretKeyRequest.class);
}
/** {@inheritDoc} */
@Override
- protected KeyToolGenerateSecretKeyRequest createKeytoolRequest()
- {
+ protected KeyToolGenerateSecretKeyRequest createKeytoolRequest() {
KeyToolGenerateSecretKeyRequest request = super.createKeytoolRequest();
- request.setKeyalg( this.keyalg );
- request.setKeysize( this.keysize );
- request.setKeypass( this.keypass );
+ request.setKeyalg(this.keyalg);
+ request.setKeysize(this.keysize);
+ request.setKeypass(this.keypass);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.keypass, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.keypass, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ImportCertificateMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ImportCertificateMojo.java
index 0790104..6883f0b 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ImportCertificateMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ImportCertificateMojo.java
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -23,8 +25,6 @@
import org.codehaus.mojo.keytool.requests.KeyToolImportCertificateRequest;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-
/**
* To import a certificate into a keystore.
* Implemented as a wrapper around the SDK {@code keytool -import} (jdk 1.5) or {@code keytool -importcert} (jdk 1.6)
@@ -35,10 +35,9 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "importCertificate", requiresProject = true, threadSafe = true )
+@Mojo(name = "importCertificate", requiresProject = true, threadSafe = true)
public class ImportCertificateMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+ extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Key password.
@@ -87,54 +86,46 @@ public class ImportCertificateMojo
/**
* Default contructor.
*/
- public ImportCertificateMojo()
- {
- super( KeyToolImportCertificateRequest.class );
+ public ImportCertificateMojo() {
+ super(KeyToolImportCertificateRequest.class);
}
/** {@inheritDoc} */
@Override
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
- if ( skipIfExist )
- {
+ if (skipIfExist) {
// check if keystore already exist
File keystoreFile = getKeystoreFile();
boolean keystoreFileExists = keystoreFile.exists();
- if ( keystoreFileExists )
- {
- getLog().info( "Skip execution, keystore already exists at " + keystoreFile );
- setSkip( true );
+ if (keystoreFileExists) {
+ getLog().info("Skip execution, keystore already exists at " + keystoreFile);
+ setSkip(true);
}
-
}
super.execute();
}
/** {@inheritDoc} */
@Override
- protected KeyToolImportCertificateRequest createKeytoolRequest()
- {
+ protected KeyToolImportCertificateRequest createKeytoolRequest() {
KeyToolImportCertificateRequest request = super.createKeytoolRequest();
- request.setKeypass( this.keypass );
- request.setFile( this.file );
- request.setNoprompt( this.noprompt );
- request.setTrustcacerts( this.trustcacerts );
+ request.setKeypass(this.keypass);
+ request.setFile(this.file);
+ request.setNoprompt(this.noprompt);
+ request.setTrustcacerts(this.trustcacerts);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
- commandLineInfo = StringUtils.replace( commandLineInfo, this.keypass, "'*****'" );
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.keypass, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ImportKeystoreMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ImportKeystoreMojo.java
index f707930..5ed1881 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ImportKeystoreMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ImportKeystoreMojo.java
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -23,8 +25,6 @@
import org.codehaus.mojo.keytool.requests.KeyToolImportKeystoreRequest;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-
/**
* To import all entries of a keystore to another keystore.
* Implemented as a wrapper around the SDK {@code keytool -importkeystore} command.
@@ -34,10 +34,8 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "importKeystore", requiresProject = true, threadSafe = true )
-public class ImportKeystoreMojo
- extends AbstractKeyToolRequestMojo
-{
+@Mojo(name = "importKeystore", requiresProject = true, threadSafe = true)
+public class ImportKeystoreMojo extends AbstractKeyToolRequestMojo {
/**
* Source keystore name.
@@ -203,71 +201,62 @@ public class ImportKeystoreMojo
/**
* Default contructor.
*/
- public ImportKeystoreMojo()
- {
- super( KeyToolImportKeystoreRequest.class );
+ public ImportKeystoreMojo() {
+ super(KeyToolImportKeystoreRequest.class);
}
/** {@inheritDoc} */
@Override
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
- if ( skipIfExist )
- {
+ if (skipIfExist) {
// check if keystore already exist
- File destinationKeystoreFile = new File( destkeystore );
+ File destinationKeystoreFile = new File(destkeystore);
boolean keystoreFileExists = destinationKeystoreFile.exists();
- if ( keystoreFileExists )
- {
- getLog().info( "Skip execution, keystore already exists at " + destinationKeystoreFile );
- setSkip( true );
+ if (keystoreFileExists) {
+ getLog().info("Skip execution, keystore already exists at " + destinationKeystoreFile);
+ setSkip(true);
}
-
}
super.execute();
}
-
/** {@inheritDoc} */
@Override
- protected KeyToolImportKeystoreRequest createKeytoolRequest()
- {
+ protected KeyToolImportKeystoreRequest createKeytoolRequest() {
KeyToolImportKeystoreRequest request = super.createKeytoolRequest();
- request.setSrckeystore( this.srckeystore );
- request.setDestkeystore( this.destkeystore );
- request.setSrcstoretype( this.srcstoretype );
- request.setDeststoretype( this.deststoretype );
- request.setSrcstorepass( this.srcstorepass );
- request.setDeststorepass( this.deststorepass );
- request.setSrcprotected( this.srcprotected );
- request.setSrcprovidername( this.srcprovidername );
- request.setDestprovidername( this.destprovidername );
- request.setSrcalias( this.srcalias );
- request.setDestalias( this.destalias );
- request.setSrckeypass( this.srckeypass );
- request.setDestkeypass( this.destkeypass );
- request.setNoprompt( this.noprompt );
- request.setProviderclass( this.providerclass );
- request.setProviderarg( this.providerarg );
- request.setProviderpath( this.providerpath );
+ request.setSrckeystore(this.srckeystore);
+ request.setDestkeystore(this.destkeystore);
+ request.setSrcstoretype(this.srcstoretype);
+ request.setDeststoretype(this.deststoretype);
+ request.setSrcstorepass(this.srcstorepass);
+ request.setDeststorepass(this.deststorepass);
+ request.setSrcprotected(this.srcprotected);
+ request.setSrcprovidername(this.srcprovidername);
+ request.setDestprovidername(this.destprovidername);
+ request.setSrcalias(this.srcalias);
+ request.setDestalias(this.destalias);
+ request.setSrckeypass(this.srckeypass);
+ request.setDestkeypass(this.destkeypass);
+ request.setNoprompt(this.noprompt);
+ request.setProviderclass(this.providerclass);
+ request.setProviderarg(this.providerarg);
+ request.setProviderpath(this.providerpath);
return request;
}
/** {@inheritDoc} */
@Override
- protected String getCommandlineInfo( Commandline commandLine )
- {
- String commandLineInfo = super.getCommandlineInfo( commandLine );
-
- commandLineInfo = StringUtils.replace( commandLineInfo, this.srckeypass, "'*****'" );
- commandLineInfo = StringUtils.replace( commandLineInfo, this.destkeypass, "'*****'" );
- commandLineInfo = StringUtils.replace( commandLineInfo, this.srcstorepass, "'*****'" );
- commandLineInfo = StringUtils.replace( commandLineInfo, this.deststorepass, "'*****'" );
+ protected String getCommandlineInfo(Commandline commandLine) {
+ String commandLineInfo = super.getCommandlineInfo(commandLine);
+
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.srckeypass, "'*****'");
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.destkeypass, "'*****'");
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.srcstorepass, "'*****'");
+ commandLineInfo = StringUtils.replace(commandLineInfo, this.deststorepass, "'*****'");
return commandLineInfo;
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ListMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ListMojo.java
index 8623e75..1aa6a49 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ListMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/ListMojo.java
@@ -28,10 +28,8 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "list", requiresProject = true, threadSafe = true )
-public class ListMojo
- extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo
-{
+@Mojo(name = "list", requiresProject = true, threadSafe = true)
+public class ListMojo extends AbstractKeyToolRequestWithKeyStoreAndAliasParametersMojo {
/**
* Output in RFC style.
* See options.
@@ -44,19 +42,16 @@ public class ListMojo
/**
* Default contructor.
*/
- public ListMojo()
- {
- super( KeyToolListRequest.class );
+ public ListMojo() {
+ super(KeyToolListRequest.class);
}
/** {@inheritDoc} */
@Override
- protected KeyToolListRequest createKeytoolRequest()
- {
+ protected KeyToolListRequest createKeytoolRequest() {
KeyToolListRequest request = super.createKeytoolRequest();
- request.setRfc( this.rfc );
+ request.setRfc(this.rfc);
return request;
}
-
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCRLFileMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCRLFileMojo.java
index fcd73db..8233cda 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCRLFileMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCRLFileMojo.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.mojo.keytool.requests.KeyToolPrintCRLFileRequest;
-import java.io.File;
-
/**
* To print the content of a CRL file.
* Implemented as a wrapper around the SDK {@code keytool -printcrl} command.
@@ -31,10 +31,8 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "printCRLFile", requiresProject = true, threadSafe = true )
-public class PrintCRLFileMojo
- extends AbstractKeyToolRequestMojo
-{
+@Mojo(name = "printCRLFile", requiresProject = true, threadSafe = true)
+public class PrintCRLFileMojo extends AbstractKeyToolRequestMojo {
/**
* Input file name.
@@ -48,20 +46,17 @@ public class PrintCRLFileMojo
/**
* Default contructor.
*/
- public PrintCRLFileMojo()
- {
- super( KeyToolPrintCRLFileRequest.class );
+ public PrintCRLFileMojo() {
+ super(KeyToolPrintCRLFileRequest.class);
}
/** {@inheritDoc} */
@Override
- protected KeyToolPrintCRLFileRequest createKeytoolRequest()
- {
+ protected KeyToolPrintCRLFileRequest createKeytoolRequest() {
KeyToolPrintCRLFileRequest request = super.createKeytoolRequest();
- request.setFile( this.file );
+ request.setFile(this.file);
return request;
}
-
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCertificateMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCertificateMojo.java
index 3a0e588..3383f56 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCertificateMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCertificateMojo.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.mojo.keytool.requests.KeyToolPrintCertificateRequest;
-import java.io.File;
-
/**
* To print the content of a certificate.
* Implemented as a wrapper around the SDK {@code keytool -printcert} command.
@@ -30,10 +30,8 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "printCertificate", requiresProject = true, threadSafe = true )
-public class PrintCertificateMojo
- extends AbstractKeyToolRequestMojo
-{
+@Mojo(name = "printCertificate", requiresProject = true, threadSafe = true)
+public class PrintCertificateMojo extends AbstractKeyToolRequestMojo {
/**
* Output in RFC style.
@@ -74,22 +72,19 @@ public class PrintCertificateMojo
/**
* Default contructor.
*/
- public PrintCertificateMojo()
- {
- super( KeyToolPrintCertificateRequest.class );
+ public PrintCertificateMojo() {
+ super(KeyToolPrintCertificateRequest.class);
}
/** {@inheritDoc} */
@Override
- protected KeyToolPrintCertificateRequest createKeytoolRequest()
- {
+ protected KeyToolPrintCertificateRequest createKeytoolRequest() {
KeyToolPrintCertificateRequest request = super.createKeytoolRequest();
- request.setRfc( this.rfc );
- request.setFile( this.file );
- request.setSslserver( this.sslserver );
- request.setJarfile( this.jarfile );
+ request.setRfc(this.rfc);
+ request.setFile(this.file);
+ request.setSslserver(this.sslserver);
+ request.setJarfile(this.jarfile);
return request;
}
-
}
diff --git a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCertificateRequestMojo.java b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCertificateRequestMojo.java
index 4ddbf8b..a85437d 100644
--- a/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCertificateRequestMojo.java
+++ b/keytool-maven-plugin/src/main/java/org/codehaus/mojo/keytool/PrintCertificateRequestMojo.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.mojo.keytool.requests.KeyToolPrintCertificateRequestRequest;
-import java.io.File;
-
/**
* To print the content of a certificate request.
* Implemented as a wrapper around the SDK {@code keytool -printcertreq} command.
@@ -31,10 +31,8 @@
* @author tchemit
* @since 1.2
*/
-@Mojo( name = "printCertificateRequest", requiresProject = true, threadSafe = true )
-public class PrintCertificateRequestMojo
- extends AbstractKeyToolRequestMojo
-{
+@Mojo(name = "printCertificateRequest", requiresProject = true, threadSafe = true)
+public class PrintCertificateRequestMojo extends AbstractKeyToolRequestMojo {
/**
* Input file name.
@@ -48,19 +46,16 @@ public class PrintCertificateRequestMojo
/**
* Default contructor.
*/
- public PrintCertificateRequestMojo()
- {
- super( KeyToolPrintCertificateRequestRequest.class );
+ public PrintCertificateRequestMojo() {
+ super(KeyToolPrintCertificateRequestRequest.class);
}
/** {@inheritDoc} */
@Override
- protected KeyToolPrintCertificateRequestRequest createKeytoolRequest()
- {
+ protected KeyToolPrintCertificateRequestRequest createKeytoolRequest() {
KeyToolPrintCertificateRequestRequest request = super.createKeytoolRequest();
- request.setFile( this.file );
+ request.setFile(this.file);
return request;
}
-
}
diff --git a/keytool-maven-plugin/src/test/java/org/codehaus/mojo/keytool/CleanKeyMojoTest.java b/keytool-maven-plugin/src/test/java/org/codehaus/mojo/keytool/CleanKeyMojoTest.java
index c7e5a89..171e77f 100644
--- a/keytool-maven-plugin/src/test/java/org/codehaus/mojo/keytool/CleanKeyMojoTest.java
+++ b/keytool-maven-plugin/src/test/java/org/codehaus/mojo/keytool/CleanKeyMojoTest.java
@@ -16,13 +16,11 @@
* limitations under the License.
*/
-import junit.framework.TestCase;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-
import java.io.File;
import java.io.IOException;
+import junit.framework.TestCase;
+
/**
* Unit Test class that test the removal of an existing and non existing
* keystore file.
@@ -31,9 +29,7 @@
* @author $Author$
* @version $Revision$
*/
-public class CleanKeyMojoTest
- extends TestCase
-{
+public class CleanKeyMojoTest extends TestCase {
private static final String EXISTING_TEST_KEYSTORE = ".keystore";
@@ -41,14 +37,11 @@ public class CleanKeyMojoTest
private CleanKeyMojo mojo;
- protected void setUp()
- {
+ protected void setUp() {
mojo = new CleanKeyMojo();
-
}
- public void tearDown()
- {
+ public void tearDown() {
mojo = null;
}
@@ -57,26 +50,21 @@ public void tearDown()
*
* @throws IOException
*/
- public void testExistingRemoveKeystore()
- throws IOException
- {
+ public void testExistingRemoveKeystore() throws IOException {
String tempKeystore =
- System.getProperty( "java.io.tmpdir" ) + File.separator + CleanKeyMojoTest.EXISTING_TEST_KEYSTORE;
- File tempKeystoreFile = new File( tempKeystore );
+ System.getProperty("java.io.tmpdir") + File.separator + CleanKeyMojoTest.EXISTING_TEST_KEYSTORE;
+ File tempKeystoreFile = new File(tempKeystore);
tempKeystoreFile.createNewFile();
- mojo.setKeystore( tempKeystore );
+ mojo.setKeystore(tempKeystore);
mojo.execute();
-
}
/**
* Remove the temp keystore file created in the setup. existent
*
*/
- public void testRemoveNonExistentKeystore()
- {
- mojo.setKeystore( CleanKeyMojoTest.NON_EXISTING_TEST_KEYSTORE );
+ public void testRemoveNonExistentKeystore() {
+ mojo.setKeystore(CleanKeyMojoTest.NON_EXISTING_TEST_KEYSTORE);
mojo.execute();
}
-
}