Skip to content

Commit 34af1ca

Browse files
nilsbehlennilsbehlen
committed
optimize imports, cleanup
1 parent ea8d412 commit 34af1ca

File tree

5 files changed

+122
-26
lines changed

5 files changed

+122
-26
lines changed

‎src/main/java/org/privacyidea/AsyncRequestCallable.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,15 @@
1616
*/
1717
package org.privacyidea;
1818

19-
import okhttp3.Call;
20-
import okhttp3.Callback;
21-
import okhttp3.Response;
22-
import org.jetbrains.annotations.NotNull;
23-
2419
import java.io.IOException;
2520
import java.util.Map;
2621
import java.util.concurrent.Callable;
2722
import java.util.concurrent.CountDownLatch;
2823
import java.util.concurrent.TimeUnit;
29-
30-
import static org.privacyidea.PIConstants.ENDPOINT_AUTH;
24+
import okhttp3.Call;
25+
import okhttp3.Callback;
26+
import okhttp3.Response;
27+
import org.jetbrains.annotations.NotNull;
3128

3229
/**
3330
* Instances of this class are submitted to the thread pool so that requests can be executed in parallel.

‎src/main/java/org/privacyidea/Endpoint.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
*/
1717
package org.privacyidea;
1818

19-
import okhttp3.*;
20-
21-
import javax.net.ssl.SSLContext;
22-
import javax.net.ssl.SSLSocketFactory;
23-
import javax.net.ssl.TrustManager;
24-
import javax.net.ssl.X509TrustManager;
2519
import java.io.IOException;
2620
import java.net.InetSocketAddress;
2721
import java.net.Proxy;
@@ -31,8 +25,20 @@
3125
import java.security.NoSuchAlgorithmException;
3226
import java.util.Map;
3327
import java.util.concurrent.TimeUnit;
34-
35-
import static org.privacyidea.PIConstants.*;
28+
import javax.net.ssl.SSLContext;
29+
import javax.net.ssl.SSLSocketFactory;
30+
import javax.net.ssl.TrustManager;
31+
import javax.net.ssl.X509TrustManager;
32+
import okhttp3.Callback;
33+
import okhttp3.FormBody;
34+
import okhttp3.HttpUrl;
35+
import okhttp3.OkHttpClient;
36+
import okhttp3.Request;
37+
38+
import static org.privacyidea.PIConstants.GET;
39+
import static org.privacyidea.PIConstants.HEADER_USER_AGENT;
40+
import static org.privacyidea.PIConstants.POST;
41+
import static org.privacyidea.PIConstants.WEBAUTHN_PARAMETERS;
3642

3743
/**
3844
* This class handles sending requests to the server.

‎src/main/java/org/privacyidea/JSONParser.java‎

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,70 @@
1616
*/
1717
package org.privacyidea;
1818

19-
import com.google.gson.*;
20-
21-
import java.util.*;
22-
23-
import static org.privacyidea.PIConstants.*;
19+
import com.google.gson.Gson;
20+
import com.google.gson.GsonBuilder;
21+
import com.google.gson.JsonArray;
22+
import com.google.gson.JsonElement;
23+
import com.google.gson.JsonObject;
24+
import com.google.gson.JsonParser;
25+
import com.google.gson.JsonPrimitive;
26+
import com.google.gson.JsonSyntaxException;
27+
import java.util.ArrayList;
28+
import java.util.Base64;
29+
import java.util.Date;
30+
import java.util.LinkedHashMap;
31+
import java.util.List;
32+
import java.util.Map;
33+
34+
import static org.privacyidea.PIConstants.ASSERTIONCLIENTEXTENSIONS;
35+
import static org.privacyidea.PIConstants.ATTESTATION_OBJECT;
36+
import static org.privacyidea.PIConstants.ATTRIBUTES;
37+
import static org.privacyidea.PIConstants.AUTHENTICATION;
38+
import static org.privacyidea.PIConstants.AUTHENTICATORDATA;
39+
import static org.privacyidea.PIConstants.AUTHENTICATOR_ATTACHMENT;
40+
import static org.privacyidea.PIConstants.AUTHENTICATOR_DATA;
41+
import static org.privacyidea.PIConstants.CHALLENGE_STATUS;
42+
import static org.privacyidea.PIConstants.CLIENTDATA;
43+
import static org.privacyidea.PIConstants.CLIENTDATAJSON;
44+
import static org.privacyidea.PIConstants.CLIENT_MODE;
45+
import static org.privacyidea.PIConstants.CODE;
46+
import static org.privacyidea.PIConstants.CREDENTIALID;
47+
import static org.privacyidea.PIConstants.CREDENTIAL_ID;
48+
import static org.privacyidea.PIConstants.DETAIL;
49+
import static org.privacyidea.PIConstants.ERROR;
50+
import static org.privacyidea.PIConstants.EXP;
51+
import static org.privacyidea.PIConstants.ID;
52+
import static org.privacyidea.PIConstants.IMAGE;
53+
import static org.privacyidea.PIConstants.INFO;
54+
import static org.privacyidea.PIConstants.JSONRPC;
55+
import static org.privacyidea.PIConstants.JWT;
56+
import static org.privacyidea.PIConstants.JWT_EXPIRATION_TIME;
57+
import static org.privacyidea.PIConstants.LINK;
58+
import static org.privacyidea.PIConstants.MAXFAIL;
59+
import static org.privacyidea.PIConstants.MESSAGE;
60+
import static org.privacyidea.PIConstants.MESSAGES;
61+
import static org.privacyidea.PIConstants.MULTI_CHALLENGE;
62+
import static org.privacyidea.PIConstants.OTPLEN;
63+
import static org.privacyidea.PIConstants.PASSKEY;
64+
import static org.privacyidea.PIConstants.PASSKEY_REGISTRATION;
65+
import static org.privacyidea.PIConstants.PREFERRED_CLIENT_MODE;
66+
import static org.privacyidea.PIConstants.RAW_ID;
67+
import static org.privacyidea.PIConstants.REALMS;
68+
import static org.privacyidea.PIConstants.RESULT;
69+
import static org.privacyidea.PIConstants.SERIAL;
70+
import static org.privacyidea.PIConstants.SIGNATURE;
71+
import static org.privacyidea.PIConstants.SIGNATUREDATA;
72+
import static org.privacyidea.PIConstants.STATUS;
73+
import static org.privacyidea.PIConstants.TIME;
74+
import static org.privacyidea.PIConstants.TOKEN;
75+
import static org.privacyidea.PIConstants.TOKENS;
76+
import static org.privacyidea.PIConstants.TOKEN_TYPE_WEBAUTHN;
77+
import static org.privacyidea.PIConstants.TRANSACTION_ID;
78+
import static org.privacyidea.PIConstants.TYPE;
79+
import static org.privacyidea.PIConstants.USERHANDLE;
80+
import static org.privacyidea.PIConstants.USERNAME;
81+
import static org.privacyidea.PIConstants.VALUE;
82+
import static org.privacyidea.PIConstants.VERSION_NUMBER;
2483

2584
public class JSONParser
2685
{

‎src/main/java/org/privacyidea/PIResponse.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.privacyidea;
1818

1919
import com.google.gson.JsonSyntaxException;
20-
2120
import java.util.ArrayList;
2221
import java.util.List;
2322
import java.util.function.Predicate;
@@ -56,7 +55,6 @@ public class PIResponse
5655
public String username = "";
5756
public String enrollmentLink = "";
5857

59-
6058
public boolean authenticationSuccessful()
6159
{
6260
if (authentication == AuthenticationStatus.ACCEPT)

‎src/main/java/org/privacyidea/PrivacyIDEA.java‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,46 @@
1818

1919
import java.io.Closeable;
2020
import java.io.IOException;
21-
import java.util.*;
22-
import java.util.concurrent.*;
23-
24-
import static org.privacyidea.PIConstants.*;
21+
import java.util.Arrays;
22+
import java.util.Collections;
23+
import java.util.LinkedHashMap;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.Objects;
27+
import java.util.concurrent.ArrayBlockingQueue;
28+
import java.util.concurrent.BlockingQueue;
29+
import java.util.concurrent.Callable;
30+
import java.util.concurrent.CountDownLatch;
31+
import java.util.concurrent.ExecutionException;
32+
import java.util.concurrent.Executors;
33+
import java.util.concurrent.Future;
34+
import java.util.concurrent.ScheduledExecutorService;
35+
import java.util.concurrent.ThreadPoolExecutor;
36+
import java.util.concurrent.TimeUnit;
37+
38+
import static org.privacyidea.PIConstants.ENDPOINT_AUTH;
39+
import static org.privacyidea.PIConstants.ENDPOINT_POLLTRANSACTION;
40+
import static org.privacyidea.PIConstants.ENDPOINT_TOKEN;
41+
import static org.privacyidea.PIConstants.ENDPOINT_TOKEN_INIT;
42+
import static org.privacyidea.PIConstants.ENDPOINT_TRIGGERCHALLENGE;
43+
import static org.privacyidea.PIConstants.ENDPOINT_VALIDATE_CHECK;
44+
import static org.privacyidea.PIConstants.ENDPOINT_VALIDATE_INITIALIZE;
45+
import static org.privacyidea.PIConstants.GENKEY;
46+
import static org.privacyidea.PIConstants.GET;
47+
import static org.privacyidea.PIConstants.HEADER_ORIGIN;
48+
import static org.privacyidea.PIConstants.JWT;
49+
import static org.privacyidea.PIConstants.JWT_EXPIRATION_TIME;
50+
import static org.privacyidea.PIConstants.OTPKEY;
51+
import static org.privacyidea.PIConstants.PASS;
52+
import static org.privacyidea.PIConstants.PASSWORD;
53+
import static org.privacyidea.PIConstants.POST;
54+
import static org.privacyidea.PIConstants.REALM;
55+
import static org.privacyidea.PIConstants.SERIAL;
56+
import static org.privacyidea.PIConstants.TOKEN_TYPE_PASSKEY;
57+
import static org.privacyidea.PIConstants.TRANSACTION_ID;
58+
import static org.privacyidea.PIConstants.TYPE;
59+
import static org.privacyidea.PIConstants.USER;
60+
import static org.privacyidea.PIConstants.USERNAME;
2561

2662
/**
2763
* This is the main class. It implements the common endpoints such as /validate/check as methods for easy usage.

0 commit comments

Comments
 (0)