restructured files

ibalosh · ibalosh · commit b29008b7e9af · 2022-12-15T15:36:38.000+01:00
diff --git a/src/main/java/com/postmarkapp/postmark/client/HttpClientErrorHandler.java b/src/main/java/com/postmarkapp/postmark/client/HttpClientErrorHandler.java
@@ -1,6 +1,6 @@
 package com.postmarkapp.postmark.client;
 
-import com.postmarkapp.postmark.client.data.DataHandler;
+import com.postmarkapp.postmark.client.data.parser.DataHandler;
 import com.postmarkapp.postmark.client.data.model.PostmarkError;
 import com.postmarkapp.postmark.client.exception.*;
 
diff --git a/src/main/java/com/postmarkapp/postmark/client/HttpClientHandler.java b/src/main/java/com/postmarkapp/postmark/client/HttpClientHandler.java
@@ -1,6 +1,6 @@
 package com.postmarkapp.postmark.client;
 
-import com.postmarkapp.postmark.client.data.DataHandler;
+import com.postmarkapp.postmark.client.data.parser.DataHandler;
 import com.postmarkapp.postmark.client.exception.*;
 
 import javax.ws.rs.core.MultivaluedMap;
diff --git a/src/main/java/com/postmarkapp/postmark/client/data/model/FileDetails.java b/src/main/java/com/postmarkapp/postmark/client/data/model/FileDetails.java
@@ -1,4 +1,4 @@
-package com.postmarkapp.postmark.client.data;
+package com.postmarkapp.postmark.client.data.model;
 
 import org.apache.tika.Tika;
 import java.io.File;
diff --git a/src/main/java/com/postmarkapp/postmark/client/data/model/message/BaseMessage.java b/src/main/java/com/postmarkapp/postmark/client/data/model/message/BaseMessage.java
@@ -1,6 +1,6 @@
 package com.postmarkapp.postmark.client.data.model.message;
 
-import com.postmarkapp.postmark.client.data.FileDetails;
+import com.postmarkapp.postmark.client.data.model.FileDetails;
 import java.io.IOException;
 import java.util.*;
 
diff --git a/src/main/java/com/postmarkapp/postmark/client/data/model/messages/InboundMessage.java b/src/main/java/com/postmarkapp/postmark/client/data/model/messages/InboundMessage.java
@@ -1,6 +1,6 @@
 package com.postmarkapp.postmark.client.data.model.messages;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.postmarkapp.postmark.client.jackson.CustomDateDeserializer;
+import com.postmarkapp.postmark.client.data.parser.jackson.CustomDateDeserializer;
 
 import java.util.List;
 import java.util.Date;
diff --git a/src/main/java/com/postmarkapp/postmark/client/data/model/templates/BaseTemplatedMessage.java b/src/main/java/com/postmarkapp/postmark/client/data/model/templates/BaseTemplatedMessage.java
@@ -1,6 +1,6 @@
 package com.postmarkapp.postmark.client.data.model.templates;
 
-import com.postmarkapp.postmark.client.data.FileDetails;
+import com.postmarkapp.postmark.client.data.model.FileDetails;
 import com.postmarkapp.postmark.client.data.model.message.Header;
 
 import java.io.IOException;
diff --git a/src/main/java/com/postmarkapp/postmark/client/data/parser/DataHandler.java b/src/main/java/com/postmarkapp/postmark/client/data/parser/DataHandler.java
@@ -1,4 +1,4 @@
-package com.postmarkapp.postmark.client.data;
+package com.postmarkapp.postmark.client.data.parser;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -7,8 +7,8 @@
 import java.io.IOException;
 
 /**
- * This class represents data handler between API client and HTTP client.
- * It makes sure that proper mechanism is used to convert data for HTTP requests and for HTTP responses.
+ * Data serializer/deserializer between API client and HTTP client.
+ * It makes sure that proper mechanism is used to convert data to and from data format for HTTP requests and for HTTP responses.
  */
 public class DataHandler {
 
diff --git a/src/main/java/com/postmarkapp/postmark/client/data/parser/jackson/CustomDateDeserializer.java b/src/main/java/com/postmarkapp/postmark/client/data/parser/jackson/CustomDateDeserializer.java
@@ -1,4 +1,4 @@
-package com.postmarkapp.postmark.client.jackson;
+package com.postmarkapp.postmark.client.data.parser.jackson;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/src/main/java/com/postmarkapp/postmark/client/exception/InvalidAPIKeyException.java b/src/main/java/com/postmarkapp/postmark/client/exception/InvalidAPIKeyException.java
@@ -1,6 +1,5 @@
 package com.postmarkapp.postmark.client.exception;
 
-import com.postmarkapp.postmark.Postmark;
 import com.postmarkapp.postmark.client.data.model.PostmarkError;
 
 /**
diff --git a/src/test/java/integration/BounceTest.java b/src/test/java/integration/BounceTest.java
@@ -1,14 +1,12 @@
 package integration;
 
 import base.BaseTest;
-import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.postmarkapp.postmark.client.ApiClient;
 import com.postmarkapp.postmark.client.Parameters;
 import com.postmarkapp.postmark.client.data.model.bounces.Bounce;
 import com.postmarkapp.postmark.client.data.model.bounces.BounceDump;
 import com.postmarkapp.postmark.client.data.model.bounces.Bounces;
 import com.postmarkapp.postmark.client.data.model.bounces.DeliveryStats;
-import com.postmarkapp.postmark.client.data.model.message.BaseMessageResponse;
 import com.postmarkapp.postmark.client.exception.InvalidMessageException;
 import com.postmarkapp.postmark.client.exception.PostmarkException;
 
diff --git a/src/test/java/unit/client/data/DataHandlerTest.java b/src/test/java/unit/client/data/DataHandlerTest.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
-import com.postmarkapp.postmark.client.data.DataHandler;
+import com.postmarkapp.postmark.client.data.parser.DataHandler;
 import com.postmarkapp.postmark.client.data.model.message.BaseMessageResponse;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/unit/data/BounceTest.java b/src/test/java/unit/data/BounceTest.java
@@ -1,7 +1,7 @@
 package unit.data;
 
 import base.BaseTest;
-import com.postmarkapp.postmark.client.data.DataHandler;
+import com.postmarkapp.postmark.client.data.parser.DataHandler;
 import com.postmarkapp.postmark.client.data.model.bounces.Bounce;
 import com.postmarkapp.postmark.client.data.model.bounces.Bounces;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/unit/data/MessageTest.java b/src/test/java/unit/data/MessageTest.java
@@ -2,7 +2,7 @@
 
 
 import base.BaseTest;
-import com.postmarkapp.postmark.client.data.DataHandler;
+import com.postmarkapp.postmark.client.data.parser.DataHandler;
 import com.postmarkapp.postmark.client.data.model.message.Message;
 import org.junit.jupiter.api.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.postmarkapp.postmark.client.data;`
	`1`	`+package com.postmarkapp.postmark.client.data.model;`
`2`	`2`
`3`	`3`	`import org.apache.tika.Tika;`
`4`	`4`	`import java.io.File;`