nellemann
/
libcvrapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autoformat, constants, make the server instance variable

This commit is contained in:
mrok 2019-09-29 23:33:22 +02:00
parent a93cd4692a
commit af74b269e4
1 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/biz/nellemann/libcvrapi/CvrApi.java
View File

@ -19,44 +19,46 @@
package biz.nellemann.libcvrapi;
import java.io.IOException;
import biz.nellemann.libcvrapi.pojo.Company;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import okhttp3.Credentials;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
public class CvrApi {
private final static Logger log = LoggerFactory.getLogger(CvrApi.class);
private final OkHttpClient client;
private static final Logger log = LoggerFactory.getLogger(CvrApi.class);
private final OkHttpClient client = new OkHttpClient();
private final String userAgent;
private final String authenticationToken;
protected String baseUrl = "https://rest.cvrapi.dk/v1/dk";
private static final String BASE_URL = "https://rest.cvrapi.dk/v1/dk";
public CvrApi(String userAgent, String authenticationToken) {
this.userAgent = userAgent;
this.authenticationToken = authenticationToken;
client = new OkHttpClient();
}
protected String get(String url) throws IOException, Exception {
protected String get(String url) throws Exception {
String credential = Credentials.basic(authenticationToken, "");
Request request = new Request.Builder().url(url).header("User-Agent", userAgent)
.header("Authorization", credential).addHeader("Accept", "application/json;").build();
Request request = new Request
.Builder()
.url(url)
.header("User-Agent", userAgent)
.header("Authorization", credential)
.addHeader("Accept", "application/json;")
.build();
Response response = client.newCall(request).execute();
switch (response.code()) {
@ -71,7 +73,6 @@ public class CvrApi {
default:
throw new Exception("get() - Unknown Error - status code: " + response.code());
}
}
@ -82,9 +83,9 @@ public class CvrApi {
* @return
* @throws IOException
*/
protected String getCompanyJson(String vatNumber) throws IOException, Exception {
String response = get(baseUrl + "/company/" + vatNumber);
log.debug("getCompanyJson() response: " + response);
protected String getCompanyJson(String vatNumber) throws Exception {
String response = get(BASE_URL + "/company/" + vatNumber);
log.debug("getCompanyJson() response: {}", response);
return response;
}
@ -95,10 +96,9 @@ public class CvrApi {
* @param json
* @return
*/
protected Company parseJsonIntoCompany(String json) throws JsonSyntaxException {
protected Company parseJsonIntoCompany(String json) {
Gson gson = new Gson();
Company company = gson.fromJson(json, Company.class);
return company;
return gson.fromJson(json, Company.class);
}