chore: update gradle plugin, some code style changes (#7)

Author: powercasgamer

README.md

@@ -34,21 +34,21 @@ repositories {
 }
 
 dependencies {
-    compileOnly("net.deltapvp:http4j:1.5.0-SNAPSHOT")
+    compileOnly("net.deltapvp:http4j:1.5.1-SNAPSHOT")
 }
 ```
 
 ```xml
 <dependency>
     <groupId>net.deltapvp</groupId>
     <artifactId>http4j</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
 </dependency>
 ```
 
 ### Code
 
-**JavaDocs:** [https://javadoc.io/doc/net.deltapvp/http4j](https://javadoc.io/doc/net.deltapvp/http4j)
+**JavaDocs:** [https://reposilite.deltapvp.net/javadoc/snapshots/net/deltapvp/http4j/1.5.1-SNAPSHOT](https://reposilite.deltapvp.net/javadoc/snapshots/net/deltapvp/http4j/1.5.1-SNAPSHOT)
 
 All requests are done using an instance of `com.intellectualsites.http.HttpClient`:
 

build.gradle

@@ -13,13 +13,6 @@ repositories {
     maven {
         url("https://repo.deltapvp.net/")
     }
-    maven {
-        url("https://maven.reposilite.com/snapshots")
-    }
-    maven {
-        url("https://repository.apache.org/snapshots")
-    }
-    mavenLocal()
 }
 
 dependencies {
@@ -38,18 +31,6 @@ test {
     useJUnitPlatform()
 }
 
-//javadoc {
-//    title = project.name + " " + project.version
-//    options.addStringOption("Xdoclint:none", "-quiet")
-//    options.tags(
-//            "apiNote:a:API Note:",
-//            "implSpec:a:Implementation Requirements:",
-//            "implNote:a:Implementation Note:"
-//    )
-//    options.links("https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/")
-//    options.links("https://www.javadoc.io/doc/com.google.code.gson/gson/2.9.1/")
-//}
-
 indra {
     javaVersions {
         minimumToolchain(8)
@@ -67,7 +48,8 @@ indra {
             developers {
                 developer {
                     id = "powercas_gamer"
-                    timezone = "America/Chicago"
+                    name = "Cas"
+                    timezone = "Europe/Amsterdam"
                 }
                 developer {
                     id = "Citymonstret"

gradle.properties

@@ -21,7 +21,7 @@ kapt.use.worker.api=true
 kapt.incremental.apt=true
 titan.major = 1
 titan.minor = 5
-titan.patch = 0
+titan.patch = 1
 titan.build = 0
 titan.include-build = false
 titan.status = -SNAPSHOT

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 indra = "3.0.1"
 annotations = "23.0.0"
 gson = "2.10"
-titan = "1.0.65-SNAPSHOT"
+titan = "1.0.85-SNAPSHOT"
 
 [libraries]
 annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }

settings.gradle.kts

@@ -2,9 +2,7 @@ pluginManagement {
     repositories {
         mavenCentral()
         gradlePluginPortal()
-        maven("https://repo.stellardrift.ca/repository/snapshots/")
         maven("https://repo.deltapvp.net/")
-        mavenLocal()
     }
 }
 

src/main/java/com/intellectualsites/http/ContentType.java

@@ -54,7 +54,7 @@ private ContentType(@NotNull final String type) {
      * @param type MIME type
      * @return MIME type instance
      */
-    @NotNull public static ContentType of(@NotNull final String type) {
+    public static @NotNull ContentType of(@NotNull final String type) {
         return internalMap.computeIfAbsent(Objects.requireNonNull(type,
                 "Type may not be null").toLowerCase(), ContentType::new);
     }
@@ -74,11 +74,11 @@ public boolean equals(@Nullable final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (o == null || this.getClass() != o.getClass()) {
             return false;
         }
         final ContentType mimeType = (ContentType) o;
-        return Objects.equals(type, mimeType.type);
+        return Objects.equals(this.type, mimeType.type);
     }
 
 }

src/main/java/com/intellectualsites/http/EntityMapper.java

@@ -50,7 +50,7 @@ private static <T> T castUnsafe(@NotNull final Object o) {
      *
      * @return Created instance
      */
-    @NotNull public static EntityMapper newInstance() {
+    public static @NotNull EntityMapper newInstance() {
         final EntityMapper mapper = new EntityMapper();
         mapper.registerDeserializer(String.class, new StringDeserializer());
         mapper.registerSerializer(String.class, new StringSerializer());
@@ -65,8 +65,8 @@ private static <T> T castUnsafe(@NotNull final Object o) {
      * @param <T>        Type to map
      * @return Mapper instance
      */
-    @NotNull public <T> EntityMapper registerSerializer(@NotNull final Class<T> clazz,
-                                               @NotNull final EntitySerializer<T> serializer) {
+    public @NotNull <T> EntityMapper registerSerializer(@NotNull final Class<T> clazz,
+                                                        @NotNull final EntitySerializer<T> serializer) {
         Objects.requireNonNull(clazz, "Class may not be null");
         Objects.requireNonNull(serializer, "Serializer may not be null");
         this.serializers.put(clazz, serializer);
@@ -81,7 +81,7 @@ private static <T> T castUnsafe(@NotNull final Object o) {
      * @param <T>          Type of the objects produces by the deserializer
      * @return Mapper instance
      */
-    @NotNull public <T> EntityMapper registerDeserializer(@NotNull final Class<T> clazz,
+    public @NotNull <T> EntityMapper registerDeserializer(@NotNull final Class<T> clazz,
                                                  @NotNull final EntityDeserializer<T> deserializer) {
         Objects.requireNonNull(clazz, "Type may not be null");
         Objects.requireNonNull(deserializer, "Deserializer may not be null");
@@ -145,7 +145,6 @@ public interface EntitySerializer<T> {
 
     }
 
-
     /**
      * Deserializer for HTTP response bodies
      *
@@ -166,11 +165,10 @@ public interface EntityDeserializer<T> {
 
     }
 
-
     private static final class StringDeserializer implements EntityDeserializer<String> {
 
-        @NotNull @Override
-        public String deserialize(@Nullable final ContentType contentType,
+        @Override
+        public @NotNull String deserialize(@Nullable final ContentType contentType,
                                   final byte @NotNull [] input) {
             final Charset charset;
             if (contentType != null && contentType.toString().toLowerCase().contains("utf-8")) {
@@ -200,5 +198,4 @@ public ContentType getContentType() {
         }
 
     }
-
 }

src/main/java/com/intellectualsites/http/Headers.java

@@ -89,7 +89,7 @@ void addHeader(@NotNull String key, @NotNull final String value) {
      * @return Header value, or {@code ""}
      */
     @NotNull String getHeader(@NotNull final String key) {
-        return Objects.requireNonNull(getOrDefault(key, ""));
+        return Objects.requireNonNull(this.getOrDefault(key, ""));
     }
 
     /**