From fcaba6a08bc9dcfc0f7d367b98157ac4e94c1566 Mon Sep 17 00:00:00 2001
From: Pavel Belyaev <pavelbbb@internet.ru>
Date: Wed, 15 Mar 2023 22:55:31 +0500
Subject: [PATCH] v0.00002

---
 .gitignore                                    |  4 ++++
 pom.xml                                       | 16 +++++++++++++++
 readme.md                                     | 13 +++++++-----
 src/main/java/org/pavlik/helpers/Main.java    | 11 ++++++++--
 .../java/org/pavlik/helpers/RestHelper.java   | 20 ++++++++++++++++---
 5 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 pom.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8886db2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.p12
+*.jks
+.idea
+/target
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..40f2cc1
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.example</groupId>
+    <artifactId>rest</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 6e931fc..3c5204c 100644
--- a/readme.md
+++ b/readme.md
@@ -21,6 +21,7 @@ import java.util.HashMap;
 
 public class Main {
     public static void main(String[] args) {
+        //инициализация экземпляра
         RestHelper Rest = new RestHelper(
                 "client-keystore3.jks", //путь до клиентского хранилища
                 "JKS", //тип клиентского хранилища
@@ -34,8 +35,10 @@ public class Main {
 
         //адрес
         String queryUrl  = "https://192.168.200.10/index.php?kokoko=1";
+        
         //тело запроса
         String queryBody  = "{\"k\":\"val\"}";
+        
         //заголовки запроса
         HashMap<String,String> queryHeaders = new HashMap<>();
         queryHeaders.put("CONTENT-TYPE","text/plain2; charset=UTF-8");
@@ -55,12 +58,12 @@ RestHelper Rest = new RestHelper(
                 "client-keystore3.jks", //путь до клиентского хранилища
                 "JKS", //тип клиентского хранилища
                 "123321", //пароль к клиентскому хранилищу
-                "2", //alias клиентского сертификата
-                null //путь до трастового хранилища
-                null //его тип
-                null //пароль
+                "2" //alias клиентского сертификата
         );
-
 ```
 
+> Если в качестве алиаса в клиентском сертификате передать null, 
+> то будет выбран первый попавшийся.
+
+
 ***to be continue***
\ No newline at end of file
diff --git a/src/main/java/org/pavlik/helpers/Main.java b/src/main/java/org/pavlik/helpers/Main.java
index 0282912..727f956 100644
--- a/src/main/java/org/pavlik/helpers/Main.java
+++ b/src/main/java/org/pavlik/helpers/Main.java
@@ -6,14 +6,21 @@ import java.util.HashMap;
 
 public class Main {
     public static void main(String[] args) {
-        RestHelper Rest = new RestHelper(
+        /*RestHelper Rest = new RestHelper(
                 "client-keystore3.jks",
                 "JKS",
                 "123321",
                 "2",
                 "truststore.jks",
                 "JKS",
-                "123321");
+                "123321");*/
+
+        RestHelper Rest = new RestHelper(
+                "client-keystore3.jks",
+                "JKS",
+                "123321",
+                "2"
+                );
 
 
         String queryUrl  = "https://192.168.200.10/index.php?kokoko=1";
diff --git a/src/main/java/org/pavlik/helpers/RestHelper.java b/src/main/java/org/pavlik/helpers/RestHelper.java
index 6ea7398..00cda15 100644
--- a/src/main/java/org/pavlik/helpers/RestHelper.java
+++ b/src/main/java/org/pavlik/helpers/RestHelper.java
@@ -13,7 +13,9 @@ import java.io.*;
 import java.security.*;
 import java.util.HashMap;
 
-
+/**
+ * RestHelper by Pavel Belyaev
+ */
 public class RestHelper {
 
     public String codepage="UTF-8";
@@ -41,6 +43,17 @@ public class RestHelper {
 
     }
 
+    /**
+     * Only keystore init
+     * @param keypath
+     * @param keytype
+     * @param keypass
+     * @param keyAlias
+     */
+    public RestHelper (String keypath,String keytype,String keypass, String keyAlias) {
+        this(keypath,keytype,keypass,keyAlias, null, null, null);
+    }
+
     /**
      * Подгружает файл JKS или PKCS12
      * @param path - путь до jks/p12
@@ -110,8 +123,9 @@ public class RestHelper {
 
     /**
      * Отправляет запрос "как есть" строкой
-     * @param queryUrl
-     * @param queryBody
+     * @param queryUrl - url
+     * @param queryBody - тело запроса
+     * @param headerMap - заголовки запроса
      */
     public HttpResponse queryPostRaw(String queryUrl, String queryBody, HashMap<String, String> headerMap)  {
         HttpPost query = new HttpPost(queryUrl);