support for allure.properties file (via allure-framework#57)

Artem Eroshenko · baev · commit 7557c22517a1 · 2017-05-19T11:41:54.000+03:00
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
@@ -13,6 +13,7 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.model.WithAttachments;
+import io.qameta.allure.util.PropertiesUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,6 +22,7 @@
 import java.nio.file.Paths;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Properties;
 import java.util.UUID;
 import java.util.function.Consumer;
 
@@ -263,7 +265,8 @@ private boolean isEmpty(final String s) {
     }
 
     private static FileSystemResultsWriter getDefaultWriter() {
-        final String path = System.getProperty("allure.results.directory", "allure-results");
+        final Properties properties = PropertiesUtils.loadAllureProperties();
+        final String path = properties.getProperty("allure.results.directory", "allure-results");
         return new FileSystemResultsWriter(Paths.get(path));
     }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
@@ -0,0 +1,36 @@
+package io.qameta.allure.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+import java.util.Properties;
+
+/**
+ * The collection of properties utils methods.
+ */
+public final class PropertiesUtils {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PropertiesUtils.class);
+
+    private static final String ALLURE_PROPERTIES_FILE = "allure.properties";
+
+    private PropertiesUtils() {
+    }
+
+    public static Properties loadAllureProperties() {
+        final Properties properties = new Properties();
+        if (Objects.nonNull(ClassLoader.getSystemResource(ALLURE_PROPERTIES_FILE))) {
+            try (InputStream stream = ClassLoader.getSystemResourceAsStream(ALLURE_PROPERTIES_FILE)) {
+                properties.load(stream);
+            } catch (IOException e) {
+                LOGGER.error("Error while reading allure.properties file from classpath: %s", e.getMessage());
+            }
+        }
+        properties.putAll(System.getProperties());
+        return properties;
+    }
+
+}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Properties;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -154,7 +155,8 @@ public static String getLinkTypePatternPropertyName(final String type) {
     }
 
     private static String getLinkUrl(final String name, final String type) {
-        final String pattern = System.getProperty(getLinkTypePatternPropertyName(type));
+        final Properties properties = PropertiesUtils.loadAllureProperties();
+        final String pattern = properties.getProperty(getLinkTypePatternPropertyName(type));
         if (Objects.isNull(pattern)) {
             return null;
         }
@@ -221,5 +223,6 @@ public static String generateMethodSignatureHash(final String methodName, final
         final String signature = methodName + parameterTypes.stream().collect(Collectors.joining(" "));
         return Base64.getUrlEncoder().encodeToString(hasher.digest(signature.getBytes(StandardCharsets.UTF_8)));
     }
+
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`import java.util.List;`
`33`	`33`	`import java.util.Objects;`
`34`	`34`	`import java.util.Optional;`
	`35`	`+import java.util.Properties;`
`35`	`36`	`import java.util.stream.Collectors;`
`36`	`37`	`import java.util.stream.Stream;`
`37`	`38`
`@@ -154,7 +155,8 @@ public static String getLinkTypePatternPropertyName(final String type) {`
`154`	`155`	`}`
`155`	`156`
`156`	`157`	`private static String getLinkUrl(final String name, final String type) {`
`157`		`- final String pattern = System.getProperty(getLinkTypePatternPropertyName(type));`
	`158`	`+ final Properties properties = PropertiesUtils.loadAllureProperties();`
	`159`	`+ final String pattern = properties.getProperty(getLinkTypePatternPropertyName(type));`
`158`	`160`	`if (Objects.isNull(pattern)) {`
`159`	`161`	`return null;`
`160`	`162`	`}`
`@@ -221,5 +223,6 @@ public static String generateMethodSignatureHash(final String methodName, final`
`221`	`223`	`final String signature = methodName + parameterTypes.stream().collect(Collectors.joining(" "));`
`222`	`224`	`return Base64.getUrlEncoder().encodeToString(hasher.digest(signature.getBytes(StandardCharsets.UTF_8)));`
`223`	`225`	`}`
	`226`	`+`
`224`	`227`	`}`
`225`	`228`