From 67b84e3af7ef4c271b358e7b39ce215f3891a4f2 Mon Sep 17 00:00:00 2001
From: Gabriele Civitarese <gabriele.civitarese@unimi.it>
Date: Thu, 3 May 2018 18:45:22 +0200
Subject: [PATCH] Adding helloworld

---
 .idea/workspace.xml                           |  69 +++++++++++++++---
 .../EsercizioRest/services/UsersService.class | Bin 1894 -> 1843 bytes
 services/HelloWorld.java                      |  31 ++++++++
 services/UsersService.java                    |   2 -
 4 files changed, 89 insertions(+), 13 deletions(-)
 create mode 100644 services/HelloWorld.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 94c8c2e..9434015 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="e6692560-0b5d-4330-a8d0-384142cc3c13" name="Default" comment="" />
+    <list default="true" id="e6692560-0b5d-4330-a8d0-384142cc3c13" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/services/HelloWorld.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/EsercizioRest/services/UsersService.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EsercizioRest/services/UsersService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/services/UsersService.java" beforeDir="false" afterPath="$PROJECT_DIR$/services/UsersService.java" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -33,11 +38,27 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UsersService.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="UsersService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/services/UsersService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="140">
-              <caret line="33" column="28" selection-start-line="33" selection-start-column="28" selection-end-line="33" selection-end-column="28" />
+            <state relative-caret-position="126">
+              <caret line="16" selection-start-line="16" selection-end-line="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="HelloWorld.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/services/HelloWorld.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="414">
+              <caret line="23" column="17" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="17" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#333#334#0" expanded="true" />
+                <element signature="e#357#358#0" expanded="true" />
+                <element signature="e#463#464#0" expanded="true" />
+                <element signature="e#488#489#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -53,10 +74,21 @@
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/services/UsersService.java" />
+        <option value="$PROJECT_DIR$/services/HelloWorld.java" />
       </list>
     </option>
   </component>
@@ -71,6 +103,7 @@
     <option name="width" value="1264" />
     <option name="height" value="798" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
@@ -223,12 +256,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1525364520924</updated>
-      <workItem from="1525364522466" duration="530000" />
+      <workItem from="1525364522466" duration="1369000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="530000" />
+    <option name="totallyTimeSpent" value="1369000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-1" y="24" width="1922" height="1033" extended-state="6" />
@@ -244,12 +277,12 @@
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" />
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32890365" />
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32963374" />
+      <window_info anchor="bottom" id="Version Control" />
       <window_info anchor="bottom" id="Terminal" />
       <window_info id="Capture Tool" />
       <window_info id="Designer" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2497332" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2497332" />
       <window_info anchor="right" id="Database" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -299,8 +332,22 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/services/UsersService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="33" column="28" selection-start-line="33" selection-start-column="28" selection-end-line="33" selection-end-column="28" />
+        <state relative-caret-position="126">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/services/HelloWorld.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="23" column="17" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="17" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#333#334#0" expanded="true" />
+            <element signature="e#357#358#0" expanded="true" />
+            <element signature="e#463#464#0" expanded="true" />
+            <element signature="e#488#489#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/out/production/EsercizioRest/services/UsersService.class b/out/production/EsercizioRest/services/UsersService.class
index ce258a3643c7628dd284c5f42c912b597b915f43..ea9f3a5ed3f7404a77162d8cd41947d5882a5b73 100644
GIT binary patch
delta 569
zcmZvZM@|Dl5JlgNZN?1E0LCUKld%mZ=bSN_oy9S{V9A0LARhp61d9a{3l6|RI0Zud
z9xQ<no38r5fBmZJeh;34wYSfgS74SapE~kBlT7(cGvkY!vvA(R1)D9_vc$55D;}#J
zYn7toI_u?Y_h#8p@3CRnWXogQu*1H`f#Hy(p^qcW6bu6#dz=`~I5%8y>5#gAOg*I|
zIkx~&9Au<3&`fznM=_Rp#;GWAY0y~{l8rPfH{Sx9NC-JJlawkbKg2q>f3&T?w0>2a
zl0GGEi(;!P+pcj-w3p}*=%g#O`H1xvt&J~)w(v-YRxKe8s#a*)ZhBN_O?!yYYYj^(
zNQ>yV;J5n#gVF@$yPEv1bx&w-7$Z(b3uU#!c-W;+D(m;XoXv(9mRVdw+kP%1x{u?0
zkn|Y++kNc6-7=~$_F1#xh;y=xkQ3>usU5#ge0BT@_CzFfHLEY*joROz=5(|D3)K)W
AX#fBK

delta 597
zcmZva%T7~K6o$WjXgTGuDW%e4LCPIeT8nZMx!><sbzm4l(nJ%&z@uT{z=!CQ7-kH3
z0G_}naK;-L<G&9jKy<Rt{?}gX`~Q`k^W?AOhpRsqm%s?`0_u4g@QUF;ax`F!aVK9p
zIpJ<^>X>B8$!VV%pIJlQ*RcFKJoyxUF*Ix)myb@v(tB5${4s4jGgq1Q&c>58`pjDv
zSoB%4EVJgbZrLDf>1NYawk&;Y`|Mcu*tZ<;_Wasg@-hYwOM^1TFbJhHRhfxr2bxr?
zm4Xy$oi@71c|^06AwyQPsmix_+rnLM?p|+D?QKziM!k>q&1tgr5HF-H<cUN(`3Unf
z-tp040x9Uhr#C`56BO*m*4;Yj)SQDB6}rm-L+#n4LhnQRKW2UOQ=`m#wWaUQEG+;O
zNC;(lq0NRO(@u4vV7I1u26!rVLOVNqk7s&MV1Co=^E?WZ*Gx6c;Qv-FXu=vnic#WG
hA!}rbV5JC9uX+_Q#Ht?BdK%O3uo82B#t6G}xxZ6QIV=DG

diff --git a/services/HelloWorld.java b/services/HelloWorld.java
new file mode 100644
index 0000000..9d2d934
--- /dev/null
+++ b/services/HelloWorld.java
@@ -0,0 +1,31 @@
+package services;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/helloworld")
+public class HelloWorld {
+
+    @GET
+    @Produces("text/plain")
+    public String helloWorld(){
+
+        return "Hello world!";
+
+    }
+
+    @GET
+    @Produces("application/json")
+    public String helloWorld2(){
+        return "{\"message\": \"helloWorld\"}";
+    }
+
+    @Path("/inner")
+    @GET
+    @Produces("text/plain")
+    public String innerHello(){
+        return "Inner Hello!";
+    }
+
+}
diff --git a/services/UsersService.java b/services/UsersService.java
index a011bad..ffc51c1 100644
--- a/services/UsersService.java
+++ b/services/UsersService.java
@@ -15,8 +15,6 @@ import javax.ws.rs.core.Response;
 @Path("users")
 public class UsersService {
 
-    private Users userslist;
-
     //restituisce la lista di utenti
     @GET
     @Produces({"application/json", "application/xml"})
-- 
2.18.1