Add the simple-editor email, brand style and file endpoints

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.mailerlite</groupId>
 	<artifactId>mailerlite-java</artifactId>
-	<version>0.0.4</version>
+	<version>0.1.0</version>
 	<name>MailerLite Java SDK</name>
 	<description>An SDK for MailerLite API</description>
 	<url>https://github.com/mailerlite/mailerlite-java</url>

src/main/java/com/mailerlite/sdk/MailerLite.java

@@ -8,8 +8,11 @@
 package com.mailerlite.sdk;
 
 import com.mailerlite.sdk.automations.Automations;
+import com.mailerlite.sdk.brandstyles.BrandStyles;
 import com.mailerlite.sdk.campaigns.Campaigns;
+import com.mailerlite.sdk.emails.Emails;
 import com.mailerlite.sdk.fields.Fields;
+import com.mailerlite.sdk.files.MediaFiles;
 import com.mailerlite.sdk.forms.Forms;
 import com.mailerlite.sdk.groups.Groups;
 import com.mailerlite.sdk.segments.Segments;
@@ -49,6 +52,15 @@ public class MailerLite
 	/** The forms. */
 	protected Forms forms;
 
+	/** The emails. */
+	protected Emails emails;
+
+	/** The brand styles. */
+	protected BrandStyles brandStyles;
+
+	/** The files of the media library. */
+	protected MediaFiles files;
+
 	/**
 	 * Campaigns.
 	 *
@@ -173,6 +185,51 @@ public Forms forms()
 	}
 
 
+	/**
+	 * Emails built with the simple editor.
+	 *
+	 * @return the emails
+	 */
+	public Emails emails()
+	{
+		if (emails == null) {
+			emails = new Emails(this);
+		}
+
+		return emails;
+	}
+
+
+	/**
+	 * Brand styles.
+	 *
+	 * @return the brand styles
+	 */
+	public BrandStyles brandStyles()
+	{
+		if (brandStyles == null) {
+			brandStyles = new BrandStyles(this);
+		}
+
+		return brandStyles;
+	}
+
+
+	/**
+	 * Files of the media library.
+	 *
+	 * @return the files
+	 */
+	public MediaFiles files()
+	{
+		if (files == null) {
+			files = new MediaFiles(this);
+		}
+
+		return files;
+	}
+
+
 	/**
 	 * Sets the MailerLite API token.
 	 *

src/main/java/com/mailerlite/sdk/MailerLiteApi.java

@@ -14,6 +14,7 @@
 import java.net.http.HttpResponse;
 import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse.BodyHandlers;
+import java.util.Map;
 import java.util.NoSuchElementException;
 
 import com.google.gson.Gson;
@@ -100,9 +101,7 @@ public <T extends MailerLiteResponse> T getRequest(String endpoint, Class<T> res
 
         } catch (IOException | InterruptedException e) {
 
-        	MailerLiteException ex = (MailerLiteException) e;
-
-            throw ex;
+        	throw this.networkError(e);
         }
 
         if (responseClass == MailerLiteStringResponse.class) {
@@ -161,9 +160,7 @@ public <T extends MailerLiteResponse> T postRequest(String endpoint, String requ
 
         } catch (IOException | InterruptedException e) {
 
-        	MailerLiteException ex = (MailerLiteException) e;
-
-            throw ex;
+        	throw this.networkError(e);
         }
 
         if (responseClass == MailerLiteStringResponse.class) {
@@ -218,9 +215,7 @@ public <T extends MailerLiteResponse> T deleteRequest(String endpoint, Class<T>
 
         } catch (IOException | InterruptedException e) {
 
-        	MailerLiteException ex = (MailerLiteException) e;
-
-            throw ex;
+        	throw this.networkError(e);
         }
 
         return this.handleApiResponse(responseObject, responseClass, customDeserializer);
@@ -274,9 +269,7 @@ public <T extends MailerLiteResponse> T putRequest(String endpoint, String reque
 
         } catch (IOException | InterruptedException e) {
 
-        	MailerLiteException ex = (MailerLiteException) e;
-
-            throw ex;
+        	throw this.networkError(e);
         }
 
         if (responseClass == MailerLiteStringResponse.class) {
@@ -291,6 +284,79 @@ public <T extends MailerLiteResponse> T putRequest(String endpoint, String reque
     }
 
 
+    /**
+     * Sends a request with any HTTP method, for example PATCH, to the given endpoint of the MailerLite API.
+     * <p>
+     * The request has the headers {@code Content-Type: application/json} and {@code Accept: application/json},
+     * and then the extra headers.
+     * <p>
+     * If the body is null, GET and DELETE requests have no body, and the other requests have an empty body.
+     * The SDK never sends the JSON {@code null}.
+     *
+     * @param <T> the generic type
+     * @param method the HTTP method, for example "PATCH"
+     * @param endpoint the MailerLite API endpoint, with the query string
+     * @param body the JSON body, or null for no body
+     * @param headers the extra headers, or null
+     * @param responseClass the class of the response object
+     * @return T
+     * @throws MailerLiteException if the API returns an error or the request fails
+     */
+    public <T extends MailerLiteResponse> T sendRequest(String method, String endpoint, String body, Map<String, String> headers, Class<T> responseClass) throws MailerLiteException
+    {
+    	HttpRequest.Builder builder = HttpRequest.newBuilder(URI.create(this.endpointBase.concat(endpoint)))
+    			.header("Content-Type", "application/json")
+    			.header("Accept", "application/json")
+    			.header("Authorization", "Bearer ".concat(this.apiToken));
+
+    	if (headers != null) {
+
+    		for (Map.Entry<String, String> header : headers.entrySet()) {
+
+    			builder.header(header.getKey(), header.getValue());
+    		}
+    	}
+
+    	if (body != null) {
+
+    		builder.method(method, BodyPublishers.ofString(body));
+    	} else if ("GET".equals(method)) {
+
+    		builder.GET();
+    	} else if ("DELETE".equals(method)) {
+
+    		builder.DELETE();
+    	} else {
+
+    		builder.method(method, BodyPublishers.noBody());
+    	}
+
+    	HttpResponse<String> responseObject = null;
+
+    	try {
+
+    		responseObject = this.client.send(builder.build(), BodyHandlers.ofString());
+    	} catch (IOException | InterruptedException e) {
+
+    		throw this.networkError(e);
+    	}
+
+    	return this.handleApiResponse(responseObject, responseClass, null);
+    }
+
+
+    /** Uses e.toString() as the message, because e.getMessage() can be null. */
+    private MailerLiteException networkError(Exception e)
+    {
+    	if (e instanceof InterruptedException) {
+
+    		Thread.currentThread().interrupt();
+    	}
+
+    	return new MailerLiteException(e.toString(), e);
+    }
+
+
     /**
      * Handles the response from the MailerLite API. It deserializes the JSON response into an object with the given type
      *
@@ -340,9 +406,19 @@ private <T extends MailerLiteResponse> T handleApiResponse(HttpResponse<String>
 
             	JsonResponseError error = gson.fromJson(stringResponse, JsonResponseError.class);
 
-	            responseError = new MailerLiteException(error.message);
-
+	            String message = error.message;
+
+	            if (error.code != null && !error.code.isEmpty()) {
+
+	            	message = error.code.concat(": ").concat(String.valueOf(error.message));
+	            }
+
+	            responseError = new MailerLiteException(message);
+
+	            responseError.message = error.message == null ? "" : error.message;
 	            responseError.errors = error.errors;
+	            responseError.errorCode = error.code;
+	            responseError.etag = error.etag;
             } catch (Exception ex) {
 
             	responseError = new MailerLiteException("Error parsing API response");
@@ -366,11 +442,9 @@ private <T extends MailerLiteResponse> T handleApiResponse(HttpResponse<String>
             try {
 
                 response = responseClass.getDeclaredConstructor().newInstance();
-            } catch (Exception e) {
-
-                MailerLiteException ex = (MailerLiteException) e;
+            } catch (ReflectiveOperationException e) {
 
-                throw ex;
+                throw new MailerLiteException(e.getMessage(), e);
             }
         }
 

src/main/java/com/mailerlite/sdk/MailerLiteResponse.java

@@ -44,4 +44,34 @@ public Boolean successful()
 	{
 		return responseStatusCode >= 200 && responseStatusCode < 300;
 	}
+
+	/**
+	 * Tells if the API returned the stored response of an earlier request with the same idempotency key.
+	 * <p>
+	 * The SDK finds the header Idempotent-Replayed without case, and compares its value with "true" without case.
+	 *
+	 * @return true if the response is a replay
+	 */
+	public boolean isIdempotentReplay()
+	{
+		if (headers == null) {
+			return false;
+		}
+
+		for (Map.Entry<String, List<String>> header : headers.entrySet()) {
+
+			if (!"Idempotent-Replayed".equalsIgnoreCase(header.getKey()) || header.getValue() == null) {
+				continue;
+			}
+
+			for (String value : header.getValue()) {
+
+				if (value != null && "true".equalsIgnoreCase(value.trim())) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
 }

src/main/java/com/mailerlite/sdk/RequestOptions.java

@@ -0,0 +1,55 @@
+/*************************************************
+ * MailerLite Java SDK
+ * https://github.com/mailerlite/mailerlite-java
+ *
+ * @author MailerLite <support@mailerlite.com>
+ * https://mailerlite.com
+ **************************************************/
+package com.mailerlite.sdk;
+
+/**
+ * Options for one request, for example an idempotency key.
+ * <p>
+ * The email writes, {@code Emails.createTemplate} and {@code Emails.createVersion} accept the options as the last
+ * argument.
+ */
+public final class RequestOptions {
+
+	private final String idempotencyKey;
+
+	private RequestOptions(String idempotencyKey)
+	{
+		this.idempotencyKey = idempotencyKey;
+	}
+
+	/**
+	 * Makes options that send the key in the Idempotency-Key header.
+	 * <p>
+	 * Use a new key for each write, and the same key when you send that write again. If the first request was a
+	 * success, the API returns the stored response and does not do the write two times. Then
+	 * {@link MailerLiteResponse#isIdempotentReplay()} is true. The API keeps a key for 24 hours.
+	 * <p>
+	 * The SDK sends the key as you give it, and the API checks it. A null or empty key sends no header.
+	 * <p>
+	 * The SDK rejects a key with a character that is not printable ASCII (0x20 to 0x7E), because the Java HTTP client
+	 * would send each character that is not ASCII as "?". Then the write method throws
+	 * {@link com.mailerlite.sdk.exceptions.InvalidIdempotencyKeyException} and sends no request.
+	 *
+	 * @param key the idempotency key, or null for no key
+	 * @return the options
+	 */
+	public static RequestOptions idempotencyKey(String key)
+	{
+		return new RequestOptions(key);
+	}
+
+	/**
+	 * Gets the idempotency key.
+	 *
+	 * @return the idempotency key, or null
+	 */
+	public String getIdempotencyKey()
+	{
+		return idempotencyKey;
+	}
+}