Skip to content

Dev #324

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

Merged
gcheng merged 5 commits into from
Apr 12, 2013
Merged

Dev #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e745872
ensure the tests can be passed on machines with space in directory name.
Apr 11, 2013
3e44038
Exposing error message body for UniformInterfaceException
Apr 12, 2013
11992bb
Merge pull request #32 from WindowsAzure/dev
Apr 12, 2013
53de17d
Merge pull request #33 from gcheng/dev
Apr 12, 2013
bdc1c7d
Merge pull request #31 from gcheng/bettererror
Apr 12, 2013
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
16 changes: 14 additions & 2 deletions ...rc/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/PipelineHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,29 @@
import com.sun.jersey.api.client.WebResource.Builder;

public class PipelineHelpers {

private static String createErrorMessage(ClientResponse clientResponse) {
clientResponse.bufferEntity();
String errorMessage = clientResponse.toString();
if (clientResponse.hasEntity()) {
errorMessage = errorMessage + " " + clientResponse.getEntity(String.class);
}
return errorMessage;
}

public static void ThrowIfNotSuccess(ClientResponse clientResponse) {
int statusCode = clientResponse.getStatus();

if ((statusCode < 200) || (statusCode >= 300)) {
throw new UniformInterfaceException(clientResponse);
String errorMessage = createErrorMessage(clientResponse);
throw new UniformInterfaceException(errorMessage, clientResponse);
}
}

public static void ThrowIfError(ClientResponse clientResponse) {
if (clientResponse.getStatus() >= 400) {
throw new UniformInterfaceException(clientResponse);
String errorMessage = createErrorMessage(clientResponse);
throw new UniformInterfaceException(errorMessage, clientResponse);
}
}

Expand Down
6 changes: 4 additions & 2 deletions ...pi/src/test/java/com/microsoft/windowsazure/services/media/ContentKeyIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static org.junit.Assert.*;

import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.security.PrivateKey;
import java.security.Security;
Expand Down Expand Up @@ -284,9 +285,10 @@ public void rebindContentKeyWithX509CertficateSuccess() throws Exception {
byte[] aesKey = createTestAesKey();
ContentKeyInfo contentKeyInfo = createValidTestContentKeyWithAesKey("rebindContentKeyWithX509Success", aesKey);
URL serverCertificateUri = getClass().getResource("/certificate/server.crt");
X509Certificate x509Certificate = EncryptionHelper.loadX509Certificate(serverCertificateUri.getFile());
X509Certificate x509Certificate = EncryptionHelper.loadX509Certificate(URLDecoder.decode(
serverCertificateUri.getFile(), "UTF-8"));
URL serverPrivateKey = getClass().getResource("/certificate/server.der");
PrivateKey privateKey = EncryptionHelper.getPrivateKey(serverPrivateKey.getFile());
PrivateKey privateKey = EncryptionHelper.getPrivateKey(URLDecoder.decode(serverPrivateKey.getFile(), "UTF-8"));

String rebindedContentKey = service.action(ContentKey.rebind(contentKeyInfo.getId(),
URLEncoder.encode(Base64.encode(x509Certificate.getEncoded()), "UTF-8")));
Expand Down