Reformat and clean up code

RomanQed · RomanQed · commit 7f03511660b8 · 2024-03-10T00:23:16.000+03:00
Small improvements
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,6 +12,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Create '...'
 2. Invoke '....'
 3. Send a request to '....'
@@ -24,9 +25,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add stack traces to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS
- - JRE/JDK build&version
- - Version
+
+- OS
+- JRE/JDK build&version
+- Version
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -8,7 +8,8 @@ assignees: RomanQed
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I always have to fix/spend extra time/write extra code when [...]
+A clear and concise description of what the problem is. Ex. I always have to fix/spend extra time/write extra code
+when [...]
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within
diff --git a/README.md b/README.md
@@ -1,17 +1,18 @@
 # sun-http-server [![maven-central](https://img.shields.io/maven-central/v/io.github.amayaframework/http-server?color=blue)](https://repo1.maven.org/maven2/io/github/amayaframework/http-server/)
 
-A repackaged and refactored sun http server, created in the original form by Oracle and formerly embedded in the jdk. 
+A repackaged and refactored sun http server, created in the original form by Oracle and formerly embedded in the jdk.
 Distributed under the GNU v2 license.
 
-This server, built on non-blocking sockets, is a really good lightweight solution that has everything you need 
-for full use in various projects. Up to this point, it was ignored by most of the community due to its location 
+This server, built on non-blocking sockets, is a really good lightweight solution that has everything you need
+for full use in various projects. Up to this point, it was ignored by most of the community due to its location
 in sun packages. Now this restriction has been removed.
 
 ## Getting Started
 
 To install it, you will need:
-* any build of the JDK no older than version 8
-* some implementation of slf4j
+
+* Java 8+
+* SLF4J implementation (optional)
 * Maven/Gradle
 
 ## Installing
@@ -25,6 +26,7 @@ dependencies {
 ```
 
 ### Maven dependency
+
 ```
 <dependency>
     <groupId>io.github.amayaframework</groupId>
@@ -36,7 +38,7 @@ dependencies {
 ## Usage example
 
 The code below will start the server associated with the address localhost:8000.
-There will be one handler on the server responding to a route starting with /hello. 
+There will be one handler on the server responding to a route starting with /hello.
 The response will contain code 200 and an empty body.
 He will respond to all other requests with the code 404.
 
@@ -59,16 +61,18 @@ public class Server {
 * [slf4j](https://www.slf4j.org) - Logging facade
 
 ## Authors
-* **Oracle Corporation** - *Main work* - [Oracle](https://www.oracle.com)
-* **RomanQed** - *Repackaging and refactoring* - [RomanQed](https://github.com/RomanQed)
 
-See also the list of [contributors](https://github.com/AmayaFramework/sun-http-server/contributors) who participated in this project.
+* [Oracle Corporation](https://www.oracle.com) - *Main work*
+* [RomanQed](https://github.com/RomanQed) - *Repackaging and refactoring*
+
+See also the list of [contributors](https://github.com/AmayaFramework/sun-http-server/contributors) who participated in
+this project.
 
 ## License
 
 This project is licensed under the GNU GENERAL PUBLIC LICENSE Version 2 - see the [LICENSE](LICENSE) file for details
 
-Also, according to the requirements, the original inserts of Oracle 
+Also, according to the requirements, the original inserts of Oracle
 license headers are preserved in the original source files.
 
 ## Acknowledgments
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 plugins {
     id 'java-library'
     id 'maven-publish'
@@ -22,12 +24,33 @@ repositories {
 
 dependencies {
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.35'
-    api group: 'io.github.amayaframework', name: 'http-utils', version: '1.0.0'
+    api group: 'io.github.amayaframework', name: 'http-utils', version: '1.1.1'
 }
 
 jar {
-    from sourceSets.main.output
-    from sourceSets.main.allJava
+    manifest {
+        var date = new Date()
+        var javaVersion = System.getProperty("java.version")
+        var vmVendor = System.getProperty("java.vm.vendor")
+        var vmVersion = System.getProperty("java.vm.version")
+
+        attributes(
+                'Created-By': String.format("%s (%s %s)", javaVersion, vmVendor, vmVersion),
+                'Gradle-Version': "Gradle $gradle.gradleVersion",
+                'Build-Date': new SimpleDateFormat("yyyy-MM-dd").format(date),
+                'Build-Time': new SimpleDateFormat("HH:mm:ss.SSSZ").format(date),
+                'Built-By': 'Roman Bakaldin',
+                'Bundle-Name': 'Sun Http Server',
+                'Bundle-Version': archiveVersion,
+                'Bundle-SymbolicName': archivesBaseName,
+                'Implementation-Title': archivesBaseName,
+                'Implementation-Vendor': 'github.com/amayaframework',
+                'Implementation-Version': archiveVersion,
+                'Specification-Title': archivesBaseName,
+                'Specification-Vendor': 'github.com/amayaframework',
+                'Specification-Version': archiveVersion
+        )
+    }
 }
 
 signing {
diff --git a/src/main/java/io/github/amayaframework/server/Servers.java b/src/main/java/io/github/amayaframework/server/Servers.java
@@ -9,7 +9,11 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-public class Servers {
+public final class Servers {
+
+    private Servers() {
+    }
+
     /**
      * Create a <code>HttpsServer</code> instance which will bind to the
      * specified {@link java.net.InetSocketAddress} (IP address and port number)
diff --git a/src/main/java/io/github/amayaframework/server/utils/Formats.java b/src/main/java/io/github/amayaframework/server/utils/Formats.java
@@ -6,7 +6,7 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-public class Formats {
+public final class Formats {
     private static final String PATTERN = "EEE, dd MMM yyyy HH:mm:ss zzz";
     private static final TimeZone GMT_TZ = TimeZone.getTimeZone("GMT");
     private static final ThreadLocal<DateFormat> DATE_FORMAT;
@@ -19,6 +19,9 @@ public class Formats {
         });
     }
 
+    private Formats() {
+    }
+
     public static String formatDate(Date date) {
         return DATE_FORMAT.get().format(date);
     }
diff --git a/src/main/java/io/github/amayaframework/server/utils/ServerConfig.java b/src/main/java/io/github/amayaframework/server/utils/ServerConfig.java
@@ -25,20 +25,17 @@
 
 package io.github.amayaframework.server.utils;
 
-public class ServerConfig {
+public final class ServerConfig {
 
     private static final int DEFAULT_CLOCK_TICK = 10000; // 10 sec.
-
     /* These values must be a reasonable multiple of clockTick */
     private static final long DEFAULT_IDLE_INTERVAL = 30; // 5 min
     private static final int DEFAULT_MAX_IDLE_CONNECTIONS = 200;
-
     private static final long DEFAULT_MAX_REQ_TIME = -1; // default: forever
     private static final long DEFAULT_MAX_RSP_TIME = -1; // default: forever
     private static final long DEFAULT_TIMER_MILLIS = 1000;
     private static final int DEFAULT_MAX_REQ_HEADERS = 200;
     private static final long DEFAULT_DRAIN_AMOUNT = 64 * 1024;
-
     private static int clockTick = DEFAULT_CLOCK_TICK;
     private static long idleInterval = DEFAULT_IDLE_INTERVAL;
     // The maximum number of bytes to drain from an input stream
@@ -54,6 +51,9 @@ public class ServerConfig {
     // the value of the TCP_NO_DELAY socket-level option
     private static boolean noDelay = false;
 
+    private ServerConfig() {
+    }
+
     public static int getClockTick() {
         return clockTick;
     }
