Skip to content
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.

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

fix: include response body in exception #124

Merged
merged 3 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ hs_err_pid*
target
.gradle
build
.idea/
.idea/

*.iml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,22 @@ public class RemoteDhis2ClientException extends Dhis2ClientException
{
private final int httpStatusCode;

public RemoteDhis2ClientException( String message, int httpStatusCode )
private final String body;

public RemoteDhis2ClientException( String message, int httpStatusCode, String body )
{
super( message );
this.httpStatusCode = httpStatusCode;
this.body = body;
}

public int getHttpStatusCode()
{
return httpStatusCode;
}

public String getBody()
{
return body;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/
package org.hisp.dhis.integration.sdk.internal.operation;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -137,8 +138,20 @@ protected Response onHttpResponse( Callable<Response> callable )

if ( !response.isSuccessful() )
{
String body = null;
try
{
if ( response.body() != null )
{
body = response.body().string();
}
}
catch ( IOException e )
{
throw new Dhis2ClientException( e );
}
response.close();
throw new RemoteDhis2ClientException( response.toString(), response.code() );
throw new RemoteDhis2ClientException( response.toString(), response.code(), body );
}
else
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
* Copyright (c) 2004-2022, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* Neither the name of the HISP project nor the names of its contributors may
* be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.hisp.dhis.integration.sdk.internal.operation;

import okhttp3.HttpUrl;
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.hisp.dhis.integration.sdk.api.RemoteDhis2ClientException;
import org.junit.jupiter.api.Test;

import java.io.IOException;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

public class AbstractOperationTestCase
{
@Test
public void testDoTransferThrowsExceptionWhenResponseIsNotSuccessful()
throws
IOException
{
Response responseMock = mock( Response.class );
ResponseBody responseBodyMock = mock( ResponseBody.class );

when( responseBodyMock.string() ).thenReturn( "body" );
when( responseMock.isSuccessful() ).thenReturn( false );
when( responseMock.toString() ).thenReturn( "toString" );
when( responseMock.code() ).thenReturn( 1 );
when( responseMock.body() ).thenReturn( responseBodyMock );

AbstractOperation<?> resourceOperation = new AbstractOperation<Object>( "http://example", null, null, null )
{
@Override
protected Object doTransfer( HttpUrl httpUrl )
{
return onHttpResponse( () -> responseMock );
}

};

RemoteDhis2ClientException remoteDhis2ClientException = assertThrows( RemoteDhis2ClientException.class, () -> {
resourceOperation.doTransfer( null );
} );

assertEquals( 1, remoteDhis2ClientException.getHttpStatusCode() );
assertEquals( "toString", remoteDhis2ClientException.getMessage() );
assertEquals( "body", remoteDhis2ClientException.getBody() );
}
}