Refactor classes

src/main/java/device/FITBITData/Device.java

@@ -1,4 +1,4 @@
-package manage.FITBITData;
+package device.FITBITData;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 

src/main/java/device/FITBITData/HeartRate.java

@@ -1,4 +1,4 @@
-package manage.FITBITData;
+package device.FITBITData;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/device/FITBITData/Sleep.java

@@ -1,4 +1,4 @@
-package manage.FITBITData;
+package device.FITBITData;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/device/FITBITData/Steps.java

@@ -1,4 +1,4 @@
-package manage.FITBITData;
+package device.FITBITData;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/device/FitBit.java

@@ -1,11 +1,14 @@
-package manage.FITBITData;
+package device;
 
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 
-import manage.AuthFITBIT;
+import device.FITBITData.HeartRate;
+import device.FITBITData.Sleep;
+import device.FITBITData.Steps;
+import oauth.AuthFITBIT;
 
 public class FitBit {
 

src/main/java/device/Hue.java

@@ -3,7 +3,7 @@ package device;
 import java.util.Map;
 import java.util.Set;
 
-import manage.Rest;
+import support.Rest;
 
 public class Hue {
     //private String baseURL = "192.168.0.2";

src/main/java/device/Sensor.java

@@ -4,6 +4,8 @@ import de.fh_zwickau.informatik.sensor.IZWayApi;
 import de.fh_zwickau.informatik.sensor.ZWayApiHttp;
 import de.fh_zwickau.informatik.sensor.model.devices.Device;
 import de.fh_zwickau.informatik.sensor.model.devices.DeviceList;
+import support.ZWaySimpleCallback;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,15 +23,12 @@ public class Sensor {
     public IZWayApi zwayApi;
     private DeviceList allZWaveDevices;
     private DeviceList devices;
-    private Integer nodeId;
 
     public Sensor() {
         this(null);
     }
 
     public Sensor (Integer nodeId) {
-        this.nodeId = nodeId;
-
         // create an instance of the Z-Way library; all the params are mandatory (we are not going to use the remote service/id)
         zwayApi = new ZWayApiHttp(ipAddress, 8083, "http", username, password, 0, false, new ZWaySimpleCallback());
 

src/main/java/oauth/AuthFITBIT.java

@@ -1,4 +1,4 @@
-package manage;
+package oauth;
 
 import java.io.IOException;
 import java.util.Arrays;

src/main/java/oauth/FITBITUrl.java

@@ -1,4 +1,4 @@
-package manage;
+package oauth;
 
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.util.Key;

src/main/java/oauth/OAuth2ClientCredentials.java

@@ -1,4 +1,4 @@
-package manage;
+package oauth;
 
 public class OAuth2ClientCredentials {
 

src/main/java/support/Rest.java

@@ -1,4 +1,4 @@
-package manage;
+package support;
 
 import java.io.IOException;
 import java.util.HashMap;

src/main/java/support/ZWaySimpleCallback.java

@@ -1,4 +1,4 @@
-package device;
+package support;
 
 import de.fh_zwickau.informatik.sensor.IZWayApiCallbacks;
 import de.fh_zwickau.informatik.sensor.model.devicehistory.DeviceHistory;
@@ -17,6 +17,8 @@ import de.fh_zwickau.informatik.sensor.model.profiles.Profile;
 import de.fh_zwickau.informatik.sensor.model.profiles.ProfileList;
 import de.fh_zwickau.informatik.sensor.model.zwaveapi.controller.ZWaveController;
 import de.fh_zwickau.informatik.sensor.model.zwaveapi.devices.ZWaveDevice;
+import device.Sensor;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/test/java/TestFitbit.java

@@ -1,13 +1,17 @@
-import manage.FITBITData.FitBit;
+import org.junit.Test;
 
-public class Main {
-    public static void main(String[] args) throws Exception {
-        FitBit fitBit = new FitBit();
+import device.FitBit;
+
+public class TestFitbit {
+	
+	@Test
+	public void test01() throws Exception {
+		FitBit fitBit = new FitBit();
         fitBit.getHoursSleep();
 
         System.out.println("Today's average heart-rate: "+fitBit.getHeartRate());
         System.out.println("Today's hours of sleep: "+fitBit.getHoursSleep());
         System.out.println("Today's steps: "+fitBit.getSteps());
         System.out.println("Fine.");
-    }
+	}
 }