Skip to content

Commit 025c19e

Browse files
committed
fix: misleading variable names and useless checks
1 parent ad1e914 commit 025c19e

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/main/java/edu/kit/datamanager/ro_crate/externalproviders/organizationprovider/RorProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public static OrganizationEntity getOrganization(String url) {
4141
CloseableHttpClient httpClient = HttpClients.createDefault();
4242
CloseableHttpResponse response = httpClient.execute(request);
4343
) {
44-
boolean isOk = response.getStatusLine().getStatusCode() != HttpStatus.SC_OK;
45-
if (isOk) {
44+
boolean isError = response.getStatusLine().getStatusCode() != HttpStatus.SC_OK;
45+
if (isError) {
4646
String errorMessage = String.format("Identifier not found: %s", response.getStatusLine().toString());
4747
logger.error(errorMessage);
4848
return null;

src/main/java/edu/kit/datamanager/ro_crate/externalproviders/personprovider/OrcidProvider.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,11 @@ public static PersonEntity getPerson(String url) {
4848
CloseableHttpClient httpClient = HttpClients.createDefault();
4949
CloseableHttpResponse response = httpClient.execute(request);
5050
) {
51-
boolean isOk = response.getStatusLine().getStatusCode() != HttpStatus.SC_OK;
52-
boolean isJson = response.containsHeader(HttpHeaders.CONTENT_TYPE)
53-
&& response.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue().equals(ContentType.TEXT_HTML.toString());
54-
if (isOk && isJson) {
51+
boolean isError = response.getStatusLine().getStatusCode() != HttpStatus.SC_OK;
52+
String receivedMimeType = ContentType.parse(response.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue()).getMimeType();
53+
boolean isUnexpectedFormat = response.containsHeader(HttpHeaders.CONTENT_TYPE)
54+
&& !receivedMimeType.equals("application/ld+json");
55+
if (isError || isUnexpectedFormat) {
5556
String errorMessage = String.format("Identifier not found: %s", response.getStatusLine().toString());
5657
logger.error(errorMessage);
5758
return null;

0 commit comments

Comments
 (0)