Merge pull request #30 from yandex-qatools/sign_default_constr

return back default sign
jenkinsci · Jun 3, 2016 · 2c09e7e · 2c09e7e
2 parents ee8bb71 + b24df9f
commit 2c09e7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/juseppe-core/src/main/java/ru/lanwen/jenkins/juseppe/gen/Signer.java b/juseppe-core/src/main/java/ru/lanwen/jenkins/juseppe/gen/Signer.java
@@ -42,6 +42,12 @@
  */
 public class Signer {
 
+    public Signer() {
+        this.privateKey = new File(populated().getKeyPath());
+        this.certificates = new ArrayList<>(Collections.singletonList(new File(populated().getCertPath())));
+        this.rootCA = new ArrayList<>(Collections.singletonList(new File(populated().getCertPath())));
+    }
+
     public Signer(String privateKeyPath, List<String> certificatePaths, List<String> rootCAPaths) {
         this.privateKey = new File(privateKeyPath);
         this.certificates = new ArrayList<>(certificatePaths.stream().map(File::new).collect(Collectors.toList()));

diff --git a/juseppe-core/src/test/java/ru/lanwen/jenkins/juseppe/gen/SignerTest.java b/juseppe-core/src/test/java/ru/lanwen/jenkins/juseppe/gen/SignerTest.java
@@ -48,11 +48,7 @@ public void shouldSignWithSelfSignedCert() throws Exception {
         System.setProperty(JuseppeEnvVars.JuseppeEnvEnum.JUSEPPE_PRIVATE_KEY_PATH.mapping(), key.getAbsolutePath());
         System.setProperty(JuseppeEnvVars.JuseppeEnvEnum.JUSEPPE_CERT_PATH.mapping(), cert.getAbsolutePath());
 
-        Signature sign = new Signer(
-                populated().getKeyPath(),
-                singletonList(populated().getCertPath()),
-                singletonList(populated().getCertPath())
-        ).sign(new UpdateSite());
+        Signature sign = new Signer().sign(new UpdateSite());
 
         assertThat("sign", sign.getCorrectSignature(), notNullValue());
         assertThat("digest", sign.getCorrectDigest(), notNullValue());