You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/06/02 17:08:02 UTC
[44/54] [abbrv] usergrid git commit: Fixed name of
UsergridUser.getPicture() and fixed a constructor of UsergridRequest.
Fixed name of UsergridUser.getPicture() and fixed a constructor of UsergridRequest.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f0829ac7
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f0829ac7
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f0829ac7
Branch: refs/heads/apm
Commit: f0829ac76b254a9d6ae79128dddf42233e0b57e5
Parents: 5871497
Author: Robert Walsh <rj...@gmail.com>
Authored: Tue May 10 17:26:36 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Tue May 10 17:26:36 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/usergrid/java/client/UsergridRequest.java | 7 ++++---
.../org/apache/usergrid/java/client/model/UsergridUser.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f0829ac7/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequest.java
----------------------------------------------------------------------
diff --git a/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequest.java b/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequest.java
index 77ee148..6939eb2 100644
--- a/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequest.java
+++ b/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequest.java
@@ -140,6 +140,7 @@ public class UsergridRequest {
this.data = data;
this.headers = headers;
this.query = query;
+ this.auth = auth;
this.pathSegments = pathSegments;
}
@@ -153,7 +154,7 @@ public class UsergridRequest {
}
@NotNull
- private HttpUrl constructUrl() {
+ protected HttpUrl constructUrl() {
String url = this.baseUrl;
if( this.query != null ) {
url += this.query.build();
@@ -172,7 +173,7 @@ public class UsergridRequest {
return urlBuilder.build();
}
- private void addHeaders(@NotNull final Request.Builder requestBuilder) {
+ protected void addHeaders(@NotNull final Request.Builder requestBuilder) {
requestBuilder.addHeader("User-Agent", UsergridRequestManager.USERGRID_USER_AGENT);
if (this.auth != null ) {
String accessToken = this.auth.getAccessToken();
@@ -188,7 +189,7 @@ public class UsergridRequest {
}
@Nullable
- private RequestBody constructRequestBody() {
+ protected RequestBody constructRequestBody() {
RequestBody requestBody = null;
if (method == UsergridHttpMethod.POST || method == UsergridHttpMethod.PUT) {
String jsonString = "";
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f0829ac7/sdks/java/src/main/java/org/apache/usergrid/java/client/model/UsergridUser.java
----------------------------------------------------------------------
diff --git a/sdks/java/src/main/java/org/apache/usergrid/java/client/model/UsergridUser.java b/sdks/java/src/main/java/org/apache/usergrid/java/client/model/UsergridUser.java
index 4092a21..9a5bd86 100644
--- a/sdks/java/src/main/java/org/apache/usergrid/java/client/model/UsergridUser.java
+++ b/sdks/java/src/main/java/org/apache/usergrid/java/client/model/UsergridUser.java
@@ -76,7 +76,7 @@ public class UsergridUser extends UsergridEntity {
@Nullable public String getPassword() { return this.password; }
public void setPassword(@Nullable final String password) { this.password = password; }
- @Nullable public String setPicture() { return this.picture; }
+ @Nullable public String getPicture() { return this.picture; }
public void setPicture(@Nullable final String picture) { this.picture = picture; }
public boolean isActivated() { return this.activated; }