Bladeren bron

Set up GET to use dynamic data. Sample body for a PUT request:
{ "userid": 1, "name": "Free Pizza Knight", "description": "Free pizza and board games!", "lat": 12, "lng": -7 }

Thomas Flucke 9 jaren geleden
bovenliggende
commit
ffd389134c
5 gewijzigde bestanden met toevoegingen van 261 en 368 verwijderingen
  1. 1 1
      .idea/misc.xml
  2. 251 321
      .idea/workspace.xml
  3. 0 11
      app/app.iml
  4. 2 2
      local.properties
  5. 7 33
      server/app/controllers/EventsController.java

+ 1 - 1
.idea/misc.xml

@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

File diff suppressed because it is too large
+ 251 - 321
.idea/workspace.xml


+ 0 - 11
app/app.iml

@@ -76,14 +76,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -91,13 +84,10 @@
     <orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
     <orderEntry type="library" exported="" name="constraint-layout-1.0.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-10.2.4" level="project" />
     <orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tasks-10.2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
     <orderEntry type="library" exported="" name="design-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-maps-10.2.4" level="project" />
     <orderEntry type="library" exported="" name="jackson-annotations-2.0.1" level="project" />
     <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
     <orderEntry type="library" exported="" name="bottom-bar-1.3.3" level="project" />
@@ -113,7 +103,6 @@
     <orderEntry type="library" exported="" name="jackson-core-2.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-10.2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
     <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />

+ 2 - 2
local.properties

@@ -7,5 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu May 25 13:29:53 PDT 2017
-sdk.dir=/Users/bryanmcguffin/Library/Android/sdk
+#Wed May 31 16:59:34 PDT 2017
+sdk.dir=/home/tom/Android/Sdk

+ 7 - 33
server/app/controllers/EventsController.java

@@ -17,41 +17,15 @@ import models.Event;
  */
 public class EventsController extends Controller {
 
+    @Transactional
     public Result get()
     {
-	List<Event> res = new LinkedList<>();
-	Event tmp = new Event();
-	tmp.eventId = 1;
-	tmp.userId = 1;
-	tmp.name = "Hello World!";
-	tmp.time = new Date();
-	tmp.foodType = "BBQ";
-	tmp.description = "Free BBQ here!";
-	tmp.lat = 0;
-	tmp.lng = 0;
-	res.add(tmp);
-	tmp = new Event();
-	tmp.eventId = 2;
-	tmp.userId = 1;
-	tmp.name = "Free Pizza Knight";
-	tmp.time = new Date();
-	tmp.foodType = "Pizza";
-	tmp.description = "Board games and Pizza!";
-	tmp.lat = 0;
-	tmp.lng = 0;
-	res.add(tmp);
-	tmp = new Event();
-	tmp.eventId = 3;
-	tmp.userId = 2;
-	tmp.name = "Some other Event";
-	tmp.time = new Date();
-	tmp.foodType = "Other";
-	tmp.description = "Really long\nDescription\nWith\nLots\nof\nnew\nlines. " +
-	    "ThisIsAReallyUnrrealisticallyLongWordThatIAmUsingAsATestCase.";
-	tmp.lat = 0;
-	tmp.lng = 0;
-	res.add(tmp);
-	return ok(Json.toJson(res));
+		List<Event> res = JPA.em().createQuery("SELECT e from Event e", Event.class).getResultList();
+		if (res == null || res.size() == 0)
+		{
+			return notFound();
+		}
+		return ok(Json.toJson(res));
     }
 
     @Transactional

Some files were not shown because too many files changed in this diff