fix readme and templates for allure-okhttp (via allure-framework#159)

rusg77 · baev · commit 90b21e719963 · 2018-01-10T14:52:50.000+03:00
diff --git a/README.md b/README.md
@@ -77,25 +77,28 @@ You can specify custom templateName:
 .filter(new AllureRestAssured().withTemplate("/templates/custom_template.ftl"))
 ```
 
-## Retrofit
+## OkHttp
 
-Interceptor for retrofit http client, that generates attachment for allure.
+Interceptor for OkHttp client, that generates attachment for allure.
 
 ```xml
 <dependency>
    <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-retrofit</artifactId>
+   <artifactId>allure-okhttp3</artifactId>
    <version>$LATEST_VERSION</version>
 </dependency>
 ```
 
 Usage example:
 ```
-.addInterceptor(new AllureLoggingInterceptor())
+.addInterceptor(new AllureOkHttp3())
 ```
-You can specify custom templateName:
+You can specify custom templates, which should be placed in src/main/resources/tpl folder:
 ```
-.addInterceptor(new AllureLoggingInterceptor().withTemplate("/templates/custom_template.ftl"))
+.addInterceptor(new AllureOkHttp3()
+                .withRequestTemplate("custom-http-request.ftl")
+                .withResponseTemplate("custom-http-response.ftl"))
+
 ```
 
 
diff --git a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
@@ -21,10 +21,22 @@
 import java.util.Objects;
 
 /**
- * Allure interceptor logger for Retrofit.
+ * Allure interceptor logger for OkHttp.
  */
 public class AllureOkHttp3 implements Interceptor {
 
+    private String requestTemplatePath = "http-request.ftl";
+    private String responseTemplatePath = "http-response.ftl";
+
+    public AllureOkHttp3 withRequestTemplate(final String templatePath) {
+        this.requestTemplatePath = templatePath;
+        return this;
+    }
+
+    public AllureOkHttp3 withResponseTemplate(final String templatePath) {
+        this.responseTemplatePath = templatePath;
+        return this;
+    }
 
     @Override
     public Response intercept(final Chain chain) throws IOException {
@@ -40,7 +52,7 @@ public Response intercept(final Chain chain) throws IOException {
             requestAttachmentBuilder.withBody(readRequestBody(requestBody));
         }
         final HttpRequestAttachment requestAttachment = requestAttachmentBuilder.build();
-        processor.addAttachment(requestAttachment, new FreemarkerAttachmentRenderer("http-request.ftl"));
+        processor.addAttachment(requestAttachment, new FreemarkerAttachmentRenderer(requestTemplatePath));
 
         final Response response = chain.proceed(request);
         final HttpResponseAttachment.Builder responseAttachmentBuilder = HttpResponseAttachment.Builder
@@ -57,7 +69,7 @@ public Response intercept(final Chain chain) throws IOException {
         }
 
         final HttpResponseAttachment responseAttachment = responseAttachmentBuilder.build();
-        processor.addAttachment(responseAttachment, new FreemarkerAttachmentRenderer("http-response.ftl"));
+        processor.addAttachment(responseAttachment, new FreemarkerAttachmentRenderer(responseTemplatePath));
 
         return responseBuilder.build();
     }
