Explicit error message when no storetype is specified and the keystor…

…e file doesn't exist

jsign-core/src/main/java/net/jsign/KeyStoreBuilder.java

@@ -136,7 +136,11 @@ KeyStoreType storetype() {
  storetype = NONE;
  } else {
  // the keystore type wasn't specified, let's try to guess it
- storetype = KeyStoreType.of(createFile(keystore));
+ File file = createFile(keystore);
+ if (!file.isFile()) {
+ throw new IllegalArgumentException("Keystore file '" + keystore + "' not found");
+ }
+ storetype = KeyStoreType.of(file);
  if (storetype == null) {
  throw new IllegalArgumentException("Keystore type of '" + keystore + "' not recognized");
  }

jsign-core/src/test/java/net/jsign/KeyStoreBuilderTest.java

@@ -415,6 +415,34 @@ public void testBuildPKCS12() throws Exception {
  assertNotNull("keystore", keystore);
  }
 
+ @Test
+ public void testBuildWithoutStoreType() throws Exception {
+ KeyStoreBuilder builder = new KeyStoreBuilder();
+
+ try {
+ builder.build();
+ fail("Exception not thrown");
+ } catch (IllegalArgumentException e) {
+ assertEquals("message", "Either keystore, or keyfile and certfile, or storetype parameters must be set", e.getMessage());
+ }
+
+ builder.keystore("target/test-classes/keystores/keystore.error");
+
+ try {
+ builder.build();
+ fail("Exception not thrown");
+ } catch (IllegalArgumentException e) {
+ assertEquals("message", "Keystore file 'target/test-classes/keystores/keystore.error' not found", e.getMessage());
+ }
+
+ builder.keystore("target/test-classes/keystores/keystore.p12");
+
+ assertEquals("storetype", PKCS12, builder.storetype());
+
+ KeyStore keystore = builder.build();
+ assertNotNull("keystore", keystore);
+ }
+
  @Test
  public void testBuildPKCS11() throws Exception {
  KeyStoreBuilder builder = new KeyStoreBuilder().storetype(PKCS11);