Skip to content

Commit dd5d765

Browse files
royclarksonroyclarkson
committed
Updated basic auth sample with latest RestTemplate changes
1 parent 2caea22 commit dd5d765

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

‎spring-android-basic-auth/client/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,29 @@
1919
<maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>
2020
<java-version>1.6</java-version>
2121
<maven-eclipse-plugin-version>2.8</maven-eclipse-plugin-version>
22-
<android-version>4.0.1.2</android-version>
22+
<com.google.android-version>4.0.1.2</com.google.android-version>
2323
<!-- Available Android versions: 1.5_r3, 1.5_r4, 1.6_r2, 2.1.2, 2.1_r1, 2.2.1, 2.3.1, 2.3.3, 4.0.1.2 -->
24-
<spring-android-version>1.0.0.RC1</spring-android-version>
25-
<jackson-version>1.9.7</jackson-version>
24+
<org.springframework.android-version>1.0.0.BUILD-SNAPSHOT</org.springframework.android-version>
25+
<org.codehaus.jackson-version>1.9.7</org.codehaus.jackson-version>
2626
</properties>
2727

2828
<dependencies>
2929
<dependency>
3030
<groupId>com.google.android</groupId>
3131
<artifactId>android</artifactId>
32-
<version>${android-version}</version>
32+
<version>${com.google.android-version}</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.springframework.android</groupId>
3737
<artifactId>spring-android-rest-template</artifactId>
38-
<version>${spring-android-version}</version>
38+
<version>${org.springframework.android-version}</version>
3939
</dependency>
4040
<dependency>
4141
<!-- Using Jackson for JSON marshaling -->
4242
<groupId>org.codehaus.jackson</groupId>
4343
<artifactId>jackson-mapper-asl</artifactId>
44-
<version>${jackson-version}</version>
44+
<version>${org.codehaus.jackson-version}</version>
4545
</dependency>
4646
</dependencies>
4747

‎spring-android-basic-auth/client/src/org/springframework/android/basicauth/MainActivity.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.http.HttpMethod;
2525
import org.springframework.http.MediaType;
2626
import org.springframework.http.ResponseEntity;
27+
import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
2728
import org.springframework.web.client.HttpClientErrorException;
2829
import org.springframework.web.client.RestTemplate;
2930

@@ -50,9 +51,9 @@ public void onCreate(Bundle savedInstanceState) {
5051
super.onCreate(savedInstanceState);
5152
setContentView(R.layout.main_activity_layout);
5253

53-
// Initiate the JSON POST request when the JSON button is clicked
54-
final Button buttonJson = (Button) findViewById(R.id.submit);
55-
buttonJson.setOnClickListener(new View.OnClickListener() {
54+
// Initiate the request to the protected service
55+
final Button submitButton = (Button) findViewById(R.id.submit);
56+
submitButton.setOnClickListener(new View.OnClickListener() {
5657
public void onClick(View v) {
5758
new FetchSecuredResourceTask().execute();
5859
}
@@ -91,22 +92,20 @@ protected void onPreExecute() {
9192
protected Message doInBackground(Void... params) {
9293
final String url = getString(R.string.base_uri) + "/getmessage";
9394

94-
// Populate the HTTP Basic Auth header with the username and password
95+
// Populate the HTTP Basic Authentitcation header with the username and password
9596
HttpAuthentication authHeader = new HttpBasicAuthentication(username, password);
9697
HttpHeaders requestHeaders = new HttpHeaders();
9798
requestHeaders.setAuthorization(authHeader);
9899
requestHeaders.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
99100

100-
// HttpEntity object to use for the request
101-
HttpEntity<?> requestEntity = new HttpEntity<Object>(requestHeaders);
102-
103101
// Create a new RestTemplate instance
104102
RestTemplate restTemplate = new RestTemplate();
103+
restTemplate.getMessageConverters().add(new MappingJacksonHttpMessageConverter());
105104

106105
try {
107106
// Make the network request
108107
Log.d(TAG, url);
109-
ResponseEntity<Message> response = restTemplate.exchange(url, HttpMethod.GET, requestEntity, Message.class);
108+
ResponseEntity<Message> response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<Object>(requestHeaders), Message.class);
110109
return response.getBody();
111110
} catch (HttpClientErrorException e) {
112111
Log.e(TAG, e.getLocalizedMessage(), e);

0 commit comments

Comments
 (0)