Skip to content

Rewrite CloseableHttpResponse to ClassicHttpResponse and use executeOpen #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahzebs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rewrite CloseableHttpResponse to ClassicHttpResponse and use executeOpen #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/no/digipost/api/client/DigipostClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
import no.digipost.api.client.tag.TagApi;
import no.digipost.api.client.util.JAXBContextUtils;
import no.digipost.http.client.HttpClientFactory;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -145,7 +145,7 @@ public OngoingDelivery.ForPrintOnly createPrintOnlyMessage(final Message printMe
}

public IdentificationResult identifyRecipient(final Identification identification) {
try (CloseableHttpResponse response = messageApi.identifyRecipient(identification)) {
try (ClassicHttpResponse response = messageApi.identifyRecipient(identification)) {
checkResponse(response, eventLogger);
return JAXBContextUtils.unmarshal(jaxbContext, response.getEntity().getContent(), IdentificationResult.class);
} catch (IOException e) {
Expand Down Expand Up @@ -330,7 +330,7 @@ public SharedDocumentContent getSharedDocumentContent(URI uri) {
return sharedDocumentsApi.getSharedDocumentContent(uri);
}

public CloseableHttpResponse stopSharing(SenderId senderId, URI uri) {
public ClassicHttpResponse stopSharing(SenderId senderId, URI uri) {
return sharedDocumentsApi.stopSharing(senderId, uri);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/no/digipost/api/client/archive/ArchiveApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import no.digipost.api.client.representations.archive.ArchiveDocument;
import no.digipost.api.client.representations.archive.ArchiveDocumentContent;
import no.digipost.api.client.representations.archive.Archives;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpEntity;

import java.io.ByteArrayInputStream;
Expand All @@ -32,7 +32,7 @@ public interface ArchiveApi {

Archives getArchives(SenderId senderId);

CloseableHttpResponse sendMultipartArchive(HttpEntity build);
ClassicHttpResponse sendMultipartArchive(HttpEntity build);

Archive getArchiveDocuments(URI uri);

Expand Down
14 changes: 7 additions & 7 deletions src/main/java/no/digipost/api/client/delivery/MessageDeliveryApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import no.digipost.api.client.representations.accounts.UserAccount;
import no.digipost.api.client.representations.accounts.UserInformation;
import no.digipost.api.client.representations.sender.SenderInformation;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpEntity;

import java.net.URI;
Expand All @@ -49,35 +49,35 @@ public interface MessageDeliveryApi {
/**
* Oppretter og sender en multipartforsendelse
*/
CloseableHttpResponse sendMultipartMessage(HttpEntity multipart);
ClassicHttpResponse sendMultipartMessage(HttpEntity multipart);

/**
* Legger til ytterligere data til et dokument.
* Det er en forutsetning at dokumentet har datatype fra tidligere.
*/
CloseableHttpResponse addData(AddDataLink document, AdditionalData data);
ClassicHttpResponse addData(AddDataLink document, AdditionalData data);

Recipients search(String searchString);

Autocomplete searchSuggest(String searchString);

CloseableHttpResponse identifyRecipient(Identification identification);
ClassicHttpResponse identifyRecipient(Identification identification);

/**
* Sjekker hvis spesifisert mottaker er Digipost-bruker.
* Returnerer då også publik del av krypteringsnøkkel for Digipost-bruker.
* Nøkkelen brukes for å kryptere dokument-innhold for dokumenter som
* skal prekrypteres.
*/
CloseableHttpResponse identifyAndGetEncryptionKey(Identification identification);
ClassicHttpResponse identifyAndGetEncryptionKey(Identification identification);


CloseableHttpResponse getEncryptionKey(URI location);
ClassicHttpResponse getEncryptionKey(URI location);

/**
* Henter public krypteringsnøkkel i x509 format for forsendelser som skal sendes til print.
*/
CloseableHttpResponse getEncryptionCertificateForPrint();
ClassicHttpResponse getEncryptionCertificateForPrint();

/**
* Henter informasjon om en faktisk avsender av en melding, altså
Expand Down
54 changes: 19 additions & 35 deletions src/main/java/no/digipost/api/client/internal/ApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,14 @@
import org.apache.hc.client5.http.classic.methods.HttpPost;
import org.apache.hc.client5.http.classic.methods.HttpPut;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.io.HttpClientResponseHandler;
import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
Expand Down Expand Up @@ -164,7 +163,7 @@ public EntryPoint getEntryPoint() {


@Override
public CloseableHttpResponse sendMultipartMessage(HttpEntity multipart) {
public ClassicHttpResponse sendMultipartMessage(HttpEntity multipart) {
MultipartNoLengthCheckHttpEntity multipartLengthCheckHttpEntity = new MultipartNoLengthCheckHttpEntity(multipart);

EntryPoint entryPoint = getEntryPoint();
Expand All @@ -179,7 +178,7 @@ public CloseableHttpResponse sendMultipartMessage(HttpEntity multipart) {
}

@Override
public CloseableHttpResponse sendMultipartArchive(HttpEntity multipart) {
public ClassicHttpResponse sendMultipartArchive(HttpEntity multipart) {
MultipartNoLengthCheckHttpEntity multipartLengthCheckHttpEntity = new MultipartNoLengthCheckHttpEntity(multipart);

EntryPoint entryPoint = getEntryPoint();
Expand Down Expand Up @@ -213,20 +212,20 @@ public InputStream getArchiveDocumentContentStream(URI uri) {
}

@Override
public CloseableHttpResponse identifyAndGetEncryptionKey(Identification identification) {
public ClassicHttpResponse identifyAndGetEncryptionKey(Identification identification) {
EntryPoint entryPoint = getEntryPoint();
return sendDigipostMedia(identification, entryPoint.getIdentificationWithEncryptionKeyUri().getPath());
}

@Override
public CloseableHttpResponse getEncryptionKey(URI location) {
public ClassicHttpResponse getEncryptionKey(URI location) {
HttpGet httpGet = new HttpGet(location);
httpGet.setHeader(Accept_DIGIPOST_MEDIA_TYPE_V8);
return send(httpGet);
}

@Override
public CloseableHttpResponse getEncryptionCertificateForPrint() {
public ClassicHttpResponse getEncryptionCertificateForPrint() {
EntryPoint entryPoint = getEntryPoint();

HttpGet httpGet = new HttpGet(digipostUrl.resolve(entryPoint.getPrintEncryptionCertificate().getPath()));
Expand All @@ -235,7 +234,7 @@ public CloseableHttpResponse getEncryptionCertificateForPrint() {
}

@Override
public CloseableHttpResponse addData(AddDataLink addDataLink, AdditionalData data) {
public ClassicHttpResponse addData(AddDataLink addDataLink, AdditionalData data) {
return sendDigipostMedia(data, addDataLink.getPath());
}

Expand Down Expand Up @@ -300,7 +299,7 @@ public Autocomplete searchSuggest(String searchString) {
}

@Override
public CloseableHttpResponse identifyRecipient(Identification identification) {
public ClassicHttpResponse identifyRecipient(Identification identification) {
return sendDigipostMedia(identification, getEntryPoint().getIdentificationUri().getPath());
}

Expand All @@ -309,7 +308,7 @@ private EntryPoint fetchEntryPoint(Optional<SenderId> senderId) throws IOExcepti
httpGet.setHeader(Accept_DIGIPOST_MEDIA_TYPE_V8);
final HttpCoreContext httpCoreContext = HttpCoreContext.create();
httpCoreContext.setAttribute(ResponseSignatureInterceptor.NOT_SIGNED_RESPONSE, true);
try (CloseableHttpResponse response = send(httpGet, httpCoreContext)) {
try (ClassicHttpResponse response = send(httpGet, httpCoreContext)) {

if (response.getCode() == HttpStatus.SC_OK) {
return unmarshal(jaxbContext, response.getEntity().getContent(), EntryPoint.class);
Expand Down Expand Up @@ -391,7 +390,7 @@ public Archive addUniqueUUIDToArchiveDocument(SenderId senderId, UUID uuid, UUID
newuuid, document.getFileName(), document.getFileType(), document.getContentType()
);

try (CloseableHttpResponse response = sendDigipostMedia(nyttDokument, addUniqeUUIDUri.getPath())) {
try (ClassicHttpResponse response = sendDigipostMedia(nyttDokument, addUniqeUUIDUri.getPath())) {
checkResponse(response, eventLogger);

archive.getDocuments().addAll(unmarshal(jaxbContext, response.getEntity().getContent(), Archive.class).getDocuments());
Expand Down Expand Up @@ -450,7 +449,7 @@ public UserAccount createOrActivateUserAccount(SenderId senderId, UserInformatio
@Override
public Batch createBatch(UUID batchUUID) {
final URI createBatch = getEntryPoint().getCreateBatch();
try (CloseableHttpResponse response = sendDigipostMedia(new Batch(batchUUID.toString()), createBatch.toString())) {
try (ClassicHttpResponse response = sendDigipostMedia(new Batch(batchUUID.toString()), createBatch.toString())) {
checkResponse(response, eventLogger);
return JAXBContextUtils.unmarshal(jaxbContext, response.getEntity().getContent(), Batch.class);
} catch (IOException e) {
Expand Down Expand Up @@ -478,7 +477,7 @@ public void cancelBatch(Batch batch) {
@Override
public void addTag(Tag tag) {
URI uri = getEntryPoint().getAddTagUri();
try (CloseableHttpResponse response = sendDigipostMedia(tag, uri.getPath())) {
try (ClassicHttpResponse response = sendDigipostMedia(tag, uri.getPath())) {
checkResponse(response, eventLogger);
} catch (IOException e) {
throw new DigipostClientException(ErrorCode.GENERAL_ERROR, e);
Expand All @@ -488,7 +487,7 @@ public void addTag(Tag tag) {
@Override
public void removeTag(Tag tag) {
URI uri = getEntryPoint().getRemoveTagUri();
try (CloseableHttpResponse response = sendDigipostMedia(tag, uri.getPath())) {
try (ClassicHttpResponse response = sendDigipostMedia(tag, uri.getPath())) {
checkResponse(response, eventLogger);
} catch (IOException e) {
throw new DigipostClientException(ErrorCode.GENERAL_ERROR, e);
Expand Down Expand Up @@ -522,7 +521,7 @@ public SharedDocumentContent getSharedDocumentContent(URI uri) {
}

@Override
public CloseableHttpResponse stopSharing(SenderId senderId, URI uri) {
public ClassicHttpResponse stopSharing(SenderId senderId, URI uri) {
DataType dataType = new ShareDocumentsRequestSharingStopped();
AdditionalData data = AdditionalData.Builder
.newAdditionalData(dataType)
Expand Down Expand Up @@ -570,7 +569,7 @@ private <R> R request(ClassicHttpRequest request, Class<R> entityType, Header ..
R responseStream = (R) safelyOfferEntityStreamExternally(send(request), eventLogger);
return responseStream;
} else {
try (CloseableHttpResponse response = send(request)) {
try (ClassicHttpResponse response = send(request)) {
checkResponse(response, eventLogger);
return unmarshal(response.getEntity().getContent(), entityType);
} catch (IOException e) {
Expand All @@ -580,24 +579,20 @@ private <R> R request(ClassicHttpRequest request, Class<R> entityType, Header ..

}

private CloseableHttpResponse send(ClassicHttpRequest request){
private ClassicHttpResponse send(ClassicHttpRequest request) {
return send(request, null);
}

private CloseableHttpResponse send(ClassicHttpRequest request, HttpContext context){
private ClassicHttpResponse send(ClassicHttpRequest request, HttpContext context) {
try {
request.setHeader(X_Digipost_UserId, brokerId.stringValue());
if (context == null) {
return httpClient.execute(request, responseHandler());
} else {
return httpClient.execute(request, context, responseHandler());
}
return httpClient.executeOpen(null, request, context);
} catch (IOException e) {
throw asUnchecked(e);
}
}

private CloseableHttpResponse sendDigipostMedia(Object data, String uri) {
private ClassicHttpResponse sendDigipostMedia(Object data, String uri) {
HttpPost httpPost = new HttpPost(digipostUrl.resolve(uri));
httpPost.setHeader(Accept_DIGIPOST_MEDIA_TYPE_V8);
httpPost.setHeader(Content_Type_DIGIPOST_MEDIA_TYPE_V8);
Expand All @@ -606,15 +601,4 @@ private CloseableHttpResponse sendDigipostMedia(Object data, String uri) {
httpPost.setEntity(new ByteArrayEntity(bao.toByteArray(), ContentType.create(DIGIPOST_MEDIA_TYPE_V8)));
return send(httpPost);
}

private HttpClientResponseHandler<CloseableHttpResponse> responseHandler() {
return response -> {
if (response instanceof CloseableHttpResponse) {
return (CloseableHttpResponse) response;
} else {
throw new DigipostClientException(ErrorCode.GENERAL_ERROR,
"Expected response to be instance of CloseableHttpResponse, but got " + response.getClass().getName());
}
};
}
}
3 changes: 2 additions & 1 deletion src/main/java/no/digipost/api/client/internal/delivery/ArchiveDeliverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.apache.hc.client5.http.entity.mime.HttpMultipartMode;
import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -99,7 +100,7 @@ public Archive sendMultipartMessage(Archive archive, Map<UUID, DocumentContent>
.addField("Content-Disposition", "attachment;" + " filename=\"" + document.uuid.toString() + "\"").build());
}
eventLogger.log("*** STARTER INTERAKSJON MED API: Arkiverer filer ***");
try (CloseableHttpResponse response = apiService.sendMultipartArchive(multipartEntity.build())) {
try (ClassicHttpResponse response = apiService.sendMultipartArchive(multipartEntity.build())) {
checkResponse(response, eventLogger);

eventLogger.log("Arkivdokumentet ble sendt. Status: [" + response + "]");
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/no/digipost/api/client/internal/delivery/MessageDeliverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import org.apache.hc.client5.http.entity.mime.FormBodyPartBuilder;
import org.apache.hc.client5.http.entity.mime.HttpMultipartMode;
import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -155,7 +155,7 @@ public MessageDelivery sendMultipartMessage(Message message, Map<UUID, DocumentC
.addField("Content-Disposition", "attachment;" + " filename=\"" + document.uuid.toString() + "\"").build());
}
eventLogger.log("*** STARTER INTERAKSJON MED API: SENDER MELDING MED ID " + singleChannelMessage.messageId + " ***");
try (CloseableHttpResponse response = apiService.sendMultipartMessage(multipartEntity.build())) {
try (ClassicHttpResponse response = apiService.sendMultipartMessage(multipartEntity.build())) {
checkResponse(response, eventLogger);

eventLogger.log("Brevet ble sendt. Status: [" + response + "]");
Expand All @@ -174,7 +174,7 @@ public MessageDelivery sendMultipartMessage(Message message, Map<UUID, DocumentC

public void addData(AddDataLink addDataLink, AdditionalData data) {
eventLogger.log("*** STARTER INTERAKSJON MED API: LEGGER TIL DATA PÅ DOKUMENT ***");
try (CloseableHttpResponse response = apiService.addData(addDataLink, data)) {
try (ClassicHttpResponse response = apiService.addData(addDataLink, data)) {

checkResponse(response, eventLogger);

Expand All @@ -193,7 +193,7 @@ public void addData(AddDataLink addDataLink, AdditionalData data) {
public InputStream fetchKeyAndEncrypt(Document document, InputStream content) {
checkThatMessageCanBePreEncrypted(document);

try(CloseableHttpResponse encryptionKeyResponse = apiService.getEncryptionKey(document.getEncryptionKeyLink().getUri())){
try(ClassicHttpResponse encryptionKeyResponse = apiService.getEncryptionKey(document.getEncryptionKeyLink().getUri())){
checkResponse(encryptionKeyResponse, eventLogger);

EncryptionKey key = unmarshal(jaxbContext, encryptionKeyResponse.getEntity().getContent(), EncryptionKey.class);
Expand All @@ -205,7 +205,7 @@ public InputStream fetchKeyAndEncrypt(Document document, InputStream content) {
}

public IdentificationResultWithEncryptionKey identifyAndGetEncryptionKey(Identification identification) {
try(CloseableHttpResponse response = apiService.identifyAndGetEncryptionKey(identification)){
try(ClassicHttpResponse response = apiService.identifyAndGetEncryptionKey(identification)){
checkResponse(response, eventLogger);
IdentificationResultWithEncryptionKey result =
unmarshal(jaxbContext, response.getEntity().getContent(), IdentificationResultWithEncryptionKey.class);
Expand All @@ -228,7 +228,7 @@ public X509Certificate getEncryptionCertificateForPrint() {

if (ZERO.equals(config.printKeyCacheTimeToLive) || between(printKeyCachedTime, now).compareTo(config.printKeyCacheTimeToLive) > 0) {
eventLogger.log("*** STARTER INTERAKSJON MED API: HENT KRYPTERINGSNØKKEL FOR PRINT ***");
try (CloseableHttpResponse response = apiService.getEncryptionCertificateForPrint()) {
try (ClassicHttpResponse response = apiService.getEncryptionCertificateForPrint()) {
checkResponse(response, eventLogger);
EncryptionCertificate encryptionCertificate = unmarshal(jaxbContext, response.getEntity().getContent(), EncryptionCertificate.class);
cachedPrintCertificate = encryptionCertificate.getX509Certificate();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/no/digipost/api/client/internal/http/response/HttpResponseUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ public final class HttpResponseUtils {
*
* @return the stream containing the entity of the response.
*/
public static InputStream safelyOfferEntityStreamExternally(CloseableHttpResponse response, EventLogger eventLogger) {
public static InputStream safelyOfferEntityStreamExternally(ClassicHttpResponse response, EventLogger eventLogger) {
HttpEntity entity = null;
try {
checkResponse(response, eventLogger);
entity = response.getEntity();
return entity.getContent();
} catch (IOException | RuntimeException e) {
try (CloseableHttpResponse autoClosed = response) {
try (ClassicHttpResponse autoClosed = response) {
EntityUtils.consume(entity);
} catch (IOException | RuntimeException entityConsumptionException) {
e.addSuppressed(entityConsumptionException);
Expand Down
Loading