Update samples to make them compatible with Java 7

The main project supports Java 7 or later, but, prior to this commit,
the Spring HATEOAS sample required Java 8. This commit updates updates
the Spring HATEOAS sample to make it compatible with Java 7 and
updates the build configuration of both samples to specify Java 7.

Closes gh-51

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NoteRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,12 @@ package com.example.notes;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 
 import org.springframework.data.repository.CrudRepository;
 
 public interface NoteRepository extends CrudRepository<Note, Long> {
 
-	Optional<Note> findById(long id);
+	Note findById(long id);
 
 	List<Note> findByTagsIn(Collection<Tag> tags);
 }

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NotesController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ package com.example.notes;
 import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.hateoas.Resource;
@@ -92,25 +92,19 @@ public class NotesController {
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	Resource<Note> note(@PathVariable("id") long id) {
-		Note note = this.noteRepository.findById(id).orElseThrow(
-				() -> new ResourceDoesNotExistException());
-		return this.noteResourceAssembler.toResource(note);
+		return this.noteResourceAssembler.toResource(findNoteById(id));
 	}
 
 	@RequestMapping(value = "/{id}/tags", method = RequestMethod.GET)
 	ResourceSupport noteTags(@PathVariable("id") long id) {
 		return new NestedContentResource<TagResource>(
-				this.tagResourceAssembler.toResources(this.noteRepository
-						.findById(id)
-						.orElseThrow(
-								() -> new ResourceDoesNotExistException()).getTags()));
+				this.tagResourceAssembler.toResources(findNoteById(id).getTags()));
 	}
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.PATCH)
 	@ResponseStatus(HttpStatus.NO_CONTENT)
 	void updateNote(@PathVariable("id") long id, @RequestBody NotePatchInput noteInput) {
-		Note note = this.noteRepository.findById(id).orElseThrow(
-				() -> new ResourceDoesNotExistException());
+		Note note = findNoteById(id);
 		if (noteInput.getTagUris() != null) {
 			note.setTags(getTags(noteInput.getTagUris()));
 		}
@@ -123,14 +117,25 @@ public class NotesController {
 		this.noteRepository.save(note);
 	}
 
+	private Note findNoteById(long id) {
+		Note note = this.noteRepository.findById(id);
+		if (note == null) {
+			throw new ResourceDoesNotExistException();
+		}
+		return note;
+	}
+
 	private List<Tag> getTags(List<URI> tagLocations) {
-		return tagLocations
-				.stream()
-				.map(location -> this.tagRepository.findById(extractTagId(location))
-						.<IllegalArgumentException> orElseThrow(
-								() -> new IllegalArgumentException("The tag '" + location
-										+ "' does not exist")))
-				.collect(Collectors.toList());
+		List<Tag> tags = new ArrayList<>(tagLocations.size());
+		for (URI tagLocation: tagLocations) {
+			Tag tag = this.tagRepository.findById(extractTagId(tagLocation));
+			if (tag == null) {
+				throw new IllegalArgumentException("The tag '" + tagLocation
+										+ "' does not exist");
+			}
+			tags.add(tag);
+		}
+		return tags;
 	}
 
 	private long extractTagId(URI tagLocation) {

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/TagRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@
 
 package com.example.notes;
 
-import java.util.Optional;
-
 import org.springframework.data.repository.CrudRepository;
 
 public interface TagRepository extends CrudRepository<Tag, Long> {
 
-	Optional<Tag> findById(long id);
+	Tag findById(long id);
 
 }

samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/TagsController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,24 +79,29 @@ public class TagsController {
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	Resource<Tag> tag(@PathVariable("id") long id) {
-		Tag tag = this.repository.findById(id).orElseThrow(
-				() -> new ResourceDoesNotExistException());
+		Tag tag = findTagById(id);
 		return this.tagResourceAssembler.toResource(tag);
 	}
 
 	@RequestMapping(value = "/{id}/notes", method = RequestMethod.GET)
 	ResourceSupport tagNotes(@PathVariable("id") long id) {
+		Tag tag = findTagById(id);
 		return new NestedContentResource<NoteResource>(
-				this.noteResourceAssembler.toResources(this.repository.findById(id)
-						.orElseThrow(() -> new ResourceDoesNotExistException())
-						.getNotes()));
+				this.noteResourceAssembler.toResources(tag.getNotes()));
+	}
+
+	private Tag findTagById(long id) {
+		Tag tag = this.repository.findById(id);
+		if (tag == null) {
+			throw new ResourceDoesNotExistException();
+		}
+		return tag;
 	}
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.PATCH)
 	@ResponseStatus(HttpStatus.NO_CONTENT)
 	void updateTag(@PathVariable("id") long id, @RequestBody TagPatchInput tagInput) {
-		Tag tag = this.repository.findById(id).orElseThrow(
-				() -> new ResourceDoesNotExistException());
+		Tag tag = findTagById(id);
 		if (tagInput.getName() != null) {
 			tag.setName(tagInput.getName());
 		}