Web interface

AccessPointListener beginning First servlets management

Web interface
AccessPointListener beginning First servlets management
thomas godart
1 parent da345024
Showing 18 changed files with 551 additions and 277 deletions Show diff stats
.gitignore
.idea/artifacts/LO53_mobile_localization_war_exploded.xml
.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23.xml
.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata
.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata.values.at
LO53_mobile_localization.iml
pom.xml
src/main/java/com/lo53_mobile_localization/core/entity/Rssi.java
src/main/java/com/lo53_mobile_localization/core/entity/RssiID.java
src/main/java/com/lo53_mobile_localization/core/repository/RSSIDAO.java
src/main/java/com/lo53_mobile_localization/core/service/AccessPointService.java
src/main/java/com/lo53_mobile_localization/core/service/LocationService.java
src/main/java/com/lo53_mobile_localization/core/service/RSSIService.java
src/main/java/com/lo53_mobile_localization/core/servlet/CalibrationServlet.java
src/main/java/com/lo53_mobile_localization/core/servlet/PositionServlet.java
src/main/java/com/lo53_mobile_localization/core/servlet/PreferencesServlet.java
src/main/java/com/lo53_mobile_localization/core/servlet/util/Param.java
src/test/java/com/lo53_mobile_localization/core/service/RssiServiceTest.java
+# Created by .ignore support plugin (hsz.mobi)
@@ -33,6 +33,7 @@
           <element id="library" level="project" name="Maven: commons-beanutils:commons-beanutils:1.9.3" />
           <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
           <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.2" />
+          <element id="library" level="project" name="Maven: taglibs:standard:1.1.2" />
         </element>
       </element>
       <element id="directory" name="META-INF">
@@ -9,8 +9,8 @@
     </database>
     <schema id="3" parent="2" name="public">
       <ObjectId>2200</ObjectId>
-      <IntrospectionTimestamp>2017-05-31.07:36:16.132</IntrospectionTimestamp>
-      <IntrospectionStateNumber>11286</IntrospectionStateNumber>
+      <IntrospectionTimestamp>2017-06-07.19:30:21.978</IntrospectionTimestamp>
+      <IntrospectionStateNumber>17257</IntrospectionStateNumber>
       <Current>1</Current>
       <Visible>1</Visible>
     </schema>
@@ -30,65 +30,65 @@
       <ObjectId>12113</ObjectId>
     </schema>
     <sequence id="9" parent="3" name="hibernate_sequence">
-      <ObjectId>35521</ObjectId>
-      <StateNumber>11277</StateNumber>
+      <ObjectId>47042</ObjectId>
+      <StateNumber>17248</StateNumber>
       <SequenceIdentity>1</SequenceIdentity>
     </sequence>
     <table id="10" parent="3" name="accesspoint">
-      <ObjectId>35523</ObjectId>
-      <StateNumber>11285</StateNumber>
+      <ObjectId>47044</ObjectId>
+      <StateNumber>17256</StateNumber>
     </table>
     <table id="11" parent="3" name="location">
-      <ObjectId>35528</ObjectId>
-      <StateNumber>11286</StateNumber>
+      <ObjectId>47049</ObjectId>
+      <StateNumber>17257</StateNumber>
     </table>
     <table id="12" parent="3" name="map">
-      <ObjectId>35533</ObjectId>
-      <StateNumber>11284</StateNumber>
+      <ObjectId>47054</ObjectId>
+      <StateNumber>17255</StateNumber>
     </table>
     <table id="13" parent="3" name="rssi">
-      <ObjectId>35541</ObjectId>
-      <StateNumber>11286</StateNumber>
+      <ObjectId>47062</ObjectId>
+      <StateNumber>17257</StateNumber>
     </table>
     <column id="14" parent="10" name="id">
       <Position>1</Position>
       <DataType>integer|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11278</StateNumber>
+      <StateNumber>17249</StateNumber>
     </column>
     <column id="15" parent="10" name="mac_address">
       <Position>2</Position>
       <DataType>varchar(18)|0</DataType>
-      <StateNumber>11278</StateNumber>
+      <StateNumber>17249</StateNumber>
     </column>
     <column id="16" parent="10" name="location_id_id">
       <Position>3</Position>
       <DataType>integer|0</DataType>
-      <StateNumber>11278</StateNumber>
+      <StateNumber>17249</StateNumber>
     </column>
     <index id="17" parent="10" name="accesspoint_pkey">
-      <ObjectId>35526</ObjectId>
+      <ObjectId>47047</ObjectId>
       <ColNames>id</ColNames>
       <Unique>1</Unique>
     </index>
     <index id="18" parent="10" name="uk_58em6b5lhouv812y1d05nwv9w">
-      <ObjectId>35546</ObjectId>
+      <ObjectId>47067</ObjectId>
       <ColNames>mac_address</ColNames>
       <Unique>1</Unique>
     </index>
     <key id="19" parent="10" name="accesspoint_pkey">
-      <ObjectId>35527</ObjectId>
+      <ObjectId>47048</ObjectId>
       <ColNames>id</ColNames>
       <UnderlyingIndexName>accesspoint_pkey</UnderlyingIndexName>
       <Primary>1</Primary>
     </key>
     <key id="20" parent="10" name="uk_58em6b5lhouv812y1d05nwv9w">
-      <ObjectId>35547</ObjectId>
+      <ObjectId>47068</ObjectId>
       <ColNames>mac_address</ColNames>
       <UnderlyingIndexName>uk_58em6b5lhouv812y1d05nwv9w</UnderlyingIndexName>
     </key>
     <foreign-key id="21" parent="10" name="fk6hlfk3hfjm2b4i72q2ihikhhf">
-      <ObjectId>35548</ObjectId>
+      <ObjectId>47069</ObjectId>
       <ColNames>location_id_id</ColNames>
       <RefTableName>location</RefTableName>
       <RefKeyName>location_pkey</RefKeyName>
@@ -98,38 +98,38 @@
       <Position>1</Position>
       <DataType>integer|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11279</StateNumber>
+      <StateNumber>17250</StateNumber>
     </column>
     <column id="23" parent="11" name="x">
       <Position>2</Position>
       <DataType>double precision|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11279</StateNumber>
+      <StateNumber>17250</StateNumber>
     </column>
     <column id="24" parent="11" name="y">
       <Position>3</Position>
       <DataType>double precision|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11279</StateNumber>
+      <StateNumber>17250</StateNumber>
     </column>
     <column id="25" parent="11" name="map_id">
       <Position>4</Position>
       <DataType>integer|0</DataType>
-      <StateNumber>11279</StateNumber>
+      <StateNumber>17250</StateNumber>
     </column>
     <index id="26" parent="11" name="location_pkey">
-      <ObjectId>35531</ObjectId>
+      <ObjectId>47052</ObjectId>
       <ColNames>id</ColNames>
       <Unique>1</Unique>
     </index>
     <key id="27" parent="11" name="location_pkey">
-      <ObjectId>35532</ObjectId>
+      <ObjectId>47053</ObjectId>
       <ColNames>id</ColNames>
       <UnderlyingIndexName>location_pkey</UnderlyingIndexName>
       <Primary>1</Primary>
     </key>
     <foreign-key id="28" parent="11" name="fk5t1p6agc1qiyteqvt1tbkml2e">
-      <ObjectId>35553</ObjectId>
+      <ObjectId>47074</ObjectId>
       <ColNames>map_id</ColNames>
       <RefTableName>map</RefTableName>
       <RefKeyName>map_pkey</RefKeyName>
@@ -139,109 +139,101 @@
       <Position>1</Position>
       <DataType>integer|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11280</StateNumber>
+      <StateNumber>17251</StateNumber>
     </column>
     <column id="30" parent="12" name="content">
       <Position>2</Position>
       <DataType>bytea|0</DataType>
-      <StateNumber>11280</StateNumber>
+      <StateNumber>17251</StateNumber>
     </column>
     <column id="31" parent="12" name="description">
       <Position>3</Position>
       <DataType>varchar(100)|0</DataType>
-      <StateNumber>11280</StateNumber>
+      <StateNumber>17251</StateNumber>
     </column>
     <column id="32" parent="12" name="m_height">
       <Position>4</Position>
       <DataType>double precision|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11280</StateNumber>
+      <StateNumber>17251</StateNumber>
     </column>
     <column id="33" parent="12" name="m_width">
       <Position>5</Position>
       <DataType>double precision|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11280</StateNumber>
+      <StateNumber>17251</StateNumber>
     </column>
     <column id="34" parent="12" name="px_height">
       <Position>6</Position>
       <DataType>integer|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11280</StateNumber>
+      <StateNumber>17251</StateNumber>
     </column>
     <column id="35" parent="12" name="px_width">
       <Position>7</Position>
       <DataType>integer|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11280</StateNumber>
+      <StateNumber>17251</StateNumber>
     </column>
     <index id="36" parent="12" name="map_pkey">
-      <ObjectId>35539</ObjectId>
+      <ObjectId>47060</ObjectId>
       <ColNames>id</ColNames>
       <Unique>1</Unique>
     </index>
     <key id="37" parent="12" name="map_pkey">
-      <ObjectId>35540</ObjectId>
+      <ObjectId>47061</ObjectId>
       <ColNames>id</ColNames>
       <UnderlyingIndexName>map_pkey</UnderlyingIndexName>
       <Primary>1</Primary>
     </key>
-    <column id="38" parent="13" name="accesspointid">
+    <column id="38" parent="13" name="id">
       <Position>1</Position>
       <DataType>integer|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11281</StateNumber>
+      <StateNumber>17252</StateNumber>
     </column>
-    <column id="39" parent="13" name="locationid">
+    <column id="39" parent="13" name="occurences">
       <Position>2</Position>
       <DataType>integer|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11281</StateNumber>
+      <StateNumber>17252</StateNumber>
     </column>
-    <column id="40" parent="13" name="occurences">
+    <column id="40" parent="13" name="value">
       <Position>3</Position>
-      <DataType>integer|0</DataType>
-      <NotNull>1</NotNull>
-      <StateNumber>11281</StateNumber>
-    </column>
-    <column id="41" parent="13" name="value">
-      <Position>4</Position>
       <DataType>double precision|0</DataType>
       <NotNull>1</NotNull>
-      <StateNumber>11281</StateNumber>
+      <StateNumber>17252</StateNumber>
     </column>
-    <column id="42" parent="13" name="accesspoint_id">
-      <Position>5</Position>
+    <column id="41" parent="13" name="accesspoint_id">
+      <Position>4</Position>
       <DataType>integer|0</DataType>
-      <StateNumber>11281</StateNumber>
+      <StateNumber>17252</StateNumber>
     </column>
-    <column id="43" parent="13" name="location_id">
-      <Position>6</Position>
+    <column id="42" parent="13" name="location_id">
+      <Position>5</Position>
       <DataType>integer|0</DataType>
-      <StateNumber>11281</StateNumber>
+      <StateNumber>17252</StateNumber>
     </column>
-    <index id="44" parent="13" name="rssi_pkey">
-      <ObjectId>35544</ObjectId>
-      <ColNames>accesspointid
-locationid</ColNames>
+    <index id="43" parent="13" name="rssi_pkey">
+      <ObjectId>47065</ObjectId>
+      <ColNames>id</ColNames>
       <Unique>1</Unique>
     </index>
-    <key id="45" parent="13" name="rssi_pkey">
-      <ObjectId>35545</ObjectId>
-      <ColNames>accesspointid
-locationid</ColNames>
+    <key id="44" parent="13" name="rssi_pkey">
+      <ObjectId>47066</ObjectId>
+      <ColNames>id</ColNames>
       <UnderlyingIndexName>rssi_pkey</UnderlyingIndexName>
       <Primary>1</Primary>
     </key>
-    <foreign-key id="46" parent="13" name="fk6g5r08ytgt65j1ge02na9qnbh">
-      <ObjectId>35558</ObjectId>
+    <foreign-key id="45" parent="13" name="fk6g5r08ytgt65j1ge02na9qnbh">
+      <ObjectId>47079</ObjectId>
       <ColNames>accesspoint_id</ColNames>
       <RefTableName>accesspoint</RefTableName>
       <RefKeyName>accesspoint_pkey</RefKeyName>
       <RefColNames>id</RefColNames>
     </foreign-key>
-    <foreign-key id="47" parent="13" name="fk8s4vdy24a1d8idnwoxi0njnko">
-      <ObjectId>35563</ObjectId>
+    <foreign-key id="46" parent="13" name="fk8s4vdy24a1d8idnwoxi0njnko">
+      <ObjectId>47084</ObjectId>
       <ColNames>location_id</ColNames>
       <RefTableName>location</RefTableName>
       <RefKeyName>location_pkey</RefKeyName>
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="hibernate" name="Hibernate">
       <configuration>
         <datasource-map>
           <unit-entry name="hibernate.cfg.xml" value="767b098c-c5bc-42ee-b3bc-d02e521ecc23" />
         </datasource-map>
-        <naming-strategy-map />
+        <naming-strategy-map>
+          <unit-entry name="hibernate.cfg.xml" />
+        </naming-strategy-map>
         <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
       </configuration>
     </facet>
     <facet type="web" name="Web">
       <configuration>
+        <descriptors>
+          <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/main/webapp/META-INF/context.xml" />
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
         <webroots>
           <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
         </webroots>
@@ -22,44 +28,4 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.2.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.el:el-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:1.0.0.Beta1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-servlet-api:9.0.0.M15" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.5.8" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
-    <orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901.jdbc4" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-annotations:3.5.6-Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
 </module>
 \ No newline at end of file
@@ -73,6 +73,11 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>1.1.2</version>
+        </dependency>
     </dependencies>
@@ -8,18 +8,15 @@ import java.io.Serializable;
  */
 @Entity
-public class Rssi implements Serializable {
+public class Rssi implements Serializable, IEntity {
-    @EmbeddedId
-    private RssiID id;
+    @Id
+    @GeneratedValue
+    private int id;
-    @MapsId("locationId")
-    @JoinColumn(name = "location_id")
     @OneToOne
     private Location location;
-    @MapsId("accessPointId")
-    @JoinColumn(name = "accessPoint_id")
     @OneToOne
     private AccessPoint accessPoint;
@@ -43,10 +40,6 @@ public class Rssi implements Serializable {
         this.occurences = occurences;
     }
-    public RssiID getId() {
-        return id;
-    }
-
     public Location getLocation() {
         return location;
     }
@@ -62,4 +55,9 @@ public class Rssi implements Serializable {
     public void setAccessPoint(AccessPoint accessPoint) {
         this.accessPoint = accessPoint;
     }
+
+    @Override
+    public int getId() {
+        return id;
+    }
 }
@@ -3,6 +3,7 @@ package com.lo53_mobile_localization.core.entity;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import java.io.Serializable;
+import java.util.Objects;
 /**
  * Created by Thomas on 18/05/2017.
@@ -11,8 +12,10 @@ import java.io.Serializable;
 @Embeddable
 public class RssiID implements Serializable {
+
     @Column(name = "location_id")
     private int locationId;
+
     @Column(name = "accessPoint_id")
     private int accessPointId;
@@ -31,4 +34,18 @@ public class RssiID implements Serializable {
     public void setAccessPointId(int accessPointId) {
         this.accessPointId = accessPointId;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof RssiID)) return false;
+        RssiID that = (RssiID) o;
+        return Objects.equals(getLocationId(), that.getLocationId()) &&
+                Objects.equals(getAccessPointId(), that.getAccessPointId());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getAccessPointId(), getLocationId());
+    }
 }
 package com.lo53_mobile_localization.core.repository;
+import com.lo53_mobile_localization.core.entity.AccessPoint;
+import com.lo53_mobile_localization.core.entity.Location;
 import com.lo53_mobile_localization.core.entity.Rssi;
 import com.lo53_mobile_localization.core.entity.RssiID;
 import com.lo53_mobile_localization.core.util.HibernateUtil;
@@ -21,136 +23,10 @@ import java.util.List;
 /**
  * Created by Thomas on 10/05/2017.
  */
-public class RSSIDAO {
-
-    protected Logger LOGGER;
-    protected EntityManagerFactory emf = Persistence.createEntityManagerFactory("rssi");
-    protected EntityManager em = emf.createEntityManager();
+public class RSSIDAO extends DefaultDAO<Rssi>{
     public RSSIDAO() {
         super();
+        entityType = Rssi.class;
     }
-
-    /**
-     * To insert an entity into the database
-     * @param entity
-     */
-    public void insertEntity(Rssi entity) {
-        Session session = HibernateUtil.getSession();
-        EntityTransaction entr = em.getTransaction();
-        try {
-            entr.begin();
-            session.persist(entity);
-            entr.commit();
-        } catch(Exception e) {
-            LOGGER.error("error in insertEntity: " + e);
-            if(entr != null)
-                entr.rollback();
-            throw e;
-        }
-    }
-
-    /**
-     * To update an entity into the database
-     * @param id
-     * @param entity
-     */
-    public void updateEntity(RssiID id, Rssi entity) throws Exception {
-
-        Rssi storedEntity = getEntity(id);
-
-        try {
-            BeanUtils.copyProperties(storedEntity, entity);
-        } catch (IllegalAccessException|InvocationTargetException e) {
-            LOGGER.error("error in updateEntity: " + e);
-            throw e;
-        }
-
-        Session session = HibernateUtil.getSession();
-        Transaction tr = session.getTransaction();
-        try {
-            tr.begin();
-            session.update(entity);
-            tr.commit();
-        } catch(Exception e) {
-            LOGGER.error("error in updateEntity: " + e);
-            if(tr != null)
-                tr.rollback();
-            throw e;
-        }
-    }
-
-    /**
-     * To remove an entity into the database
-     * @param id
-     */
-    public void removeEntity(RssiID id) throws Exception {
-
-        Rssi entity = getEntity(id);
-
-        Session session = HibernateUtil.getSession();
-        Transaction tr = session.getTransaction();
-        try {
-            tr.begin();
-            session.delete(entity);
-            tr.commit();
-        } catch(Exception e) {
-            LOGGER.error("error in removeEntity: " + e);
-            if(tr != null)
-                tr.rollback();
-            throw e;
-        }
-    }
-
-    /**
-     * To get an entity from its id and class
-     * @param id
-     * @return
-     */
-    @SuppressWarnings(value="unchecked")
-    public Rssi getEntity(RssiID id) throws Exception {
-        Rssi entity = null;
-
-        Session session = HibernateUtil.getSession();
-        Transaction tr = session.getTransaction();
-        try {
-            tr.begin();
-            String hql = "From Rssi r where r.id.locationId = :locationId AND r.id.accessPointId = :accessPointId";
-
-
-
-            String strLocId = Integer.toString(id.getLocationId());
-            String strApId = Integer.toString(id.getAccessPointId());
-            Query query  = HibernateUtil.getSession().createQuery(hql);
-            query.setParameter("locationId",strApId);
-            query.setParameter("accessPointId", strApId);
-            entity = (Rssi)query.getSingleResult();
-            tr.commit();
-        } catch(Exception e) {
-            LOGGER.error("error in getEntity: " + e);
-            if(tr != null)
-                tr.rollback();
-            throw e;
-        }
-        return entity;
-    }
-
-    /**
-     * To get all entities
-     * @return
-     */
-    public List getEntities() throws Exception {
-        List listEntities = null;
-
-        Session session = HibernateUtil.getSession();
-        try {
-            Query query = session.createQuery("from Rssi");
-            listEntities = query.list();
-        }catch (HibernateException e) {
-            LOGGER.error("error in getEntities: " + e);
-            throw e;
-        }
-        return listEntities;
-    }
-
 }
@@ -2,7 +2,12 @@ package com.lo53_mobile_localization.core.service;
 import com.lo53_mobile_localization.core.entity.AccessPoint;
 import com.lo53_mobile_localization.core.entity.IEntity;
+import com.lo53_mobile_localization.core.entity.Location;
+import com.lo53_mobile_localization.core.entity.Rssi;
 import com.lo53_mobile_localization.core.repository.AccessPointDAO;
+import com.lo53_mobile_localization.core.util.HibernateUtil;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
 import java.util.List;
@@ -37,4 +42,35 @@ public class AccessPointService implements IService{
     public List getEntities() throws Exception {
         return this.accessPointDAO.getEntities();
     }
+
+    public AccessPoint getSingleAccessPointFromMacAdress(String mac){
+
+        Session session = HibernateUtil.getSession();
+        session.beginTransaction();
+
+        String hql= "from " + AccessPoint.class.getCanonicalName() + " ap where ap.mac_address = :mac";
+
+        Query query = session.createQuery(hql);
+        query.setParameter("mac", mac);
+
+        AccessPoint result = (AccessPoint) query.getSingleResult();
+
+        return result;
+    }
+
+    public List<AccessPoint> getAccessPointFromMacAdress(String mac){
+
+        Session session = HibernateUtil.getSession();
+        session.beginTransaction();
+
+        String hql= "from " + AccessPoint.class.getCanonicalName() + " ap where ap.mac_address = :mac";
+
+        Query query = session.createQuery(hql);
+        query.setParameter("mac", mac);
+
+        List<AccessPoint> result = query.list();
+
+        return result;
+    }
+
 }
 package com.lo53_mobile_localization.core.service;
+import com.lo53_mobile_localization.core.entity.AccessPoint;
 import com.lo53_mobile_localization.core.entity.IEntity;
 import com.lo53_mobile_localization.core.entity.Location;
+import com.lo53_mobile_localization.core.entity.Rssi;
 import com.lo53_mobile_localization.core.repository.LocationDAO;
+import com.lo53_mobile_localization.core.util.HibernateUtil;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
 import java.util.List;
@@ -37,4 +42,20 @@ public class LocationService implements IService {
     public List getEntities() throws Exception {
         return this.locationDAO.getEntities();
     }
+
+    public Location getLocationFromCoordinates(double x, double y){
+
+        Session session = HibernateUtil.getSession();
+        session.beginTransaction();
+
+        String hql= "from " + Location.class.getCanonicalName() + " l where l.x = :x and l.y = :y";
+
+        Query query = session.createQuery(hql);
+        query.setParameter("x", x);
+        query.setParameter("y",y);
+
+        Location result = (Location) query.getSingleResult();
+
+        return result;
+    }
 }
 package com.lo53_mobile_localization.core.service;
-import com.lo53_mobile_localization.core.entity.IEntity;
-import com.lo53_mobile_localization.core.entity.Rssi;
-import com.lo53_mobile_localization.core.entity.RssiID;
+import com.lo53_mobile_localization.core.entity.*;
 import com.lo53_mobile_localization.core.repository.RSSIDAO;
+import com.lo53_mobile_localization.core.util.HibernateUtil;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
 import java.util.List;
@@ -19,23 +20,56 @@ public class RSSIService {
         this.rssi_recordDAO = new RSSIDAO();
     }
-    public void storeEntity(Rssi entity) {
+    public void storeEntity(IEntity entity) {
         this.rssi_recordDAO.insertEntity((Rssi) entity);
     }
-    public void updateEntity(RssiID id, Rssi entity) throws Exception {
+    public void updateEntity(int id, IEntity entity) throws Exception {
         this.rssi_recordDAO.updateEntity(id, (Rssi) entity);
     }
-    public void removeEntity(RssiID id) throws Exception {
+    public void removeEntity(int id) throws Exception {
         this.rssi_recordDAO.removeEntity(id);
     }
-    public Rssi getEntity(RssiID id) throws Exception {
+    public Rssi getEntity(int id) throws Exception {
         return this.rssi_recordDAO.getEntity(id);
     }
     public List getEntities() throws Exception {
         return this.rssi_recordDAO.getEntities();
     }
+
+    public Rssi getRssiWithLocationAndAP(Location location, AccessPoint ap){
+
+        Session session = HibernateUtil.getSession();
+        session.beginTransaction();
+
+        String hql= "from " + Rssi.class.getCanonicalName() + " r where r.location.id = :loc and r.accessPoint.id = :accesspoint";
+
+        Query query = session.createQuery(hql);
+        query.setParameter("loc", location.getId());
+        query.setParameter("accesspoint",ap.getId());
+
+        Rssi result = (Rssi)query.getSingleResult();
+
+        return result;
+    }
+
+    public List<Rssi> getRssiWithMacAdress(String mac){
+
+        Session session = HibernateUtil.getSession();
+        session.beginTransaction();
+
+        String hql= "from " + Rssi.class.getCanonicalName() + " r where r.accessPoint.mac_address = :macAddress";
+
+        Query query = session.createQuery(hql);
+        query.setParameter("macAddress", mac);
+
+        List<Rssi> result = query.list();
+
+        return result;
+    }
+
+
 }
 package com.lo53_mobile_localization.core.servlet;
+import com.lo53_mobile_localization.core.entity.Location;
+import com.lo53_mobile_localization.core.service.LocationService;
+import com.lo53_mobile_localization.core.servlet.util.Param;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
 /**
  * Created by Thomas on 18/05/2017.
  */
+@WebServlet(
+        name = "CalibrationServlet",
+        urlPatterns = {"/calibration"}
+)
 public class CalibrationServlet extends HttpServlet {
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+
+        response.setContentType(Param.CONTENT_TYPE);
+
+        request.getRequestDispatcher(Param.PATH_CALIBRATION).forward(request, response);
+
+
+    }
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+
+        String apRequestIp = request.getRemoteAddr();
+        System.out.println("Request from " + apRequestIp + " received");
+
+        int x = -1;
+        int y = -1;
+        try{
+            x = Integer.parseInt(request.getParameter("positionX"));
+            y = Integer.parseInt(request.getParameter("positionY"));
+
+            System.out.println("x = " + x + " y = " + y);
+        }catch (NumberFormatException nfe){
+            System.out.println("Wrong parameters");
+        }
+
+        if (x != -1 && y != -1){
+            //String macAddr = getMacAddressFromArpTable(apRequestIp);
+            String macAddr = "12:12:12:12:12:12";
+            if (macAddr != null){
+                System.out.println("MAC Address found : "+macAddr);
+                DatagramSocket socket = null;
+                try{
+                    for (int i = 0 ; i < Param.AP_IPS.length ; i++){
+
+                        InetAddress address = InetAddress.getByAddress(Param.AP_IPS[i]);
+                        socket = new DatagramSocket(Param.AP_COMM_PORT);
+
+                        String msg = buildRssiRequestMessage(Param.AP_IPS[i], Param.AP_COMM_PORT);
+
+                        DatagramPacket packet = new DatagramPacket(msg.getBytes(), msg.length(), address, Param.AP_COMM_PORT);
+                        socket.send(packet);
+                        System.out.println("Sending "+msg+" to AP number " + i);
+                    }
+                    socket.close();
+                } catch (IOException iox){
+                    System.out.println(iox+" [Calibration Servlet] IOException");
+                }finally{
+                    if (socket != null) socket.close();
+                }
+            }else{
+                System.out.println("MAC Address not found !");
+            }
+        }else{
+            System.out.println("Coordinates not found");
+        }
+        request.getRequestDispatcher(Param.PATH_CALIBRATION).forward(request, response);
+    }
+
+    private String getMacAddressFromArpTable(String ip) throws IOException {
-    private String getMacAdressFromArpTable(String ip) throws IOException {
-        // Open the ARP table too look up for this IP
         BufferedReader in = new BufferedReader(new FileReader("/proc/net/arp"));
         String strLine;
         String macAddr = null;
-        // Read File Line By Line
         while ((strLine = in.readLine()) != null) {
-            // Find the matching IP
             System.out.println(strLine);
             if (strLine.contains(ip)) {
-                // Split the line
                 String[] table = strLine.split(" ");
-                // Retrieve the MAC Address
-                //macAddr = table[24];
                 for (int i = 0; i < table.length; i++) {
                     if (table[i].length() == 17)
                         macAddr = table[i];
-                    //System.out.println("Table["+i+"] : "+table[i]);
                 }
             }
         }
         return macAddr;
     }
+    private String buildRssiRequestMessage(byte [] apIp, int port){
+
+        String request = "http://";
+
+        String ip = new String(apIp, StandardCharsets.UTF_8);
+
+        String macaddress = (String) getServletContext().getAttribute("macaddress");
+        String map_id = "1";
+        String get = "/get";
+        String macReq = "macs=";
+
+        request += ip + ":" + port + get + "?";
+        request += macReq + macaddress;
+
+        System.out.println(request);
+
+        return request;
+    }
+
 }
+package com.lo53_mobile_localization.core.servlet;
+
+import com.lo53_mobile_localization.core.entity.Rssi;
+import com.lo53_mobile_localization.core.service.RSSIService;
+import com.lo53_mobile_localization.core.servlet.util.Param;
+
+import java.io.BufferedReader;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+@WebServlet(
+        name = "PositionServlet",
+        urlPatterns = {"/position"}
+)public class PositionServlet extends HttpServlet {
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        String requestIp = request.getRemoteAddr();
+        System.out.println("Request from ip : " + requestIp);
+
+        //String macAddr = getMacAdressFromArpTable(requestIp);
+        String macAddr = "12:12:12:12:12:12";
+
+        if (macAddr != null) {
+
+            // Send Get request to all APs
+            DatagramSocket socket = null;
+            try {
+                for (int i = 0; i < Param.AP_IPS.length; i++) {
+                    InetAddress address = InetAddress.getByAddress(Param.AP_IPS[i]);
+                    socket = new DatagramSocket(Param.AP_COMM_PORT);
+
+                    String msg = buildMessage(macAddr, Param.AP_IPS[i]);
+
+                    DatagramPacket packet = new DatagramPacket(msg.getBytes(), msg.length(), address, Param.AP_COMM_PORT);
+                    socket.send(packet);
+                    System.out.println("Sending " + msg + " to AP number " + i);
+                }
+                socket.close();
+            } catch (IOException iox) {
+                System.out.println("[Positioning Servlet:Sending GET message to APs] IOException");
+            } finally {
+                if (socket != null) socket.close();
+            }
+
+            // Sleep during 500ms
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e1) {
+                e1.printStackTrace();
+            }
+
+            RSSIService rssiService = new RSSIService();
+
+            List<Rssi> rssis = rssiService.getRssiWithMacAdress(macAddr);
+
+            int nbRes = 0;
+            for (Rssi r : rssis) {
+                nbRes++;
+            }
+
+
+        }
+    }
+
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    }
+
+    private String getMacAdressFromArpTable(String ip) throws IOException {
+
+        BufferedReader in = new BufferedReader(new FileReader("/proc/net/arp"));
+        String strLine;
+        String macAddr = null;
+
+        while ((strLine = in.readLine()) != null) {
+            System.out.println(strLine);
+            if (strLine.contains(ip)) {
+                String[] table = strLine.split(" ");
+                //macAddr = table[24];
+                for (int i = 0; i < table.length; i++) {
+                    if (table[i].length() == 17)
+                        macAddr = table[i];
+                }
+            }
+        }
+        return macAddr;
+    }
+
+    private String buildMessage(String mac, byte[] apIp){
+
+        //String msg = http://<AP IP>:<PORT>/get?macs=XX:XX:XX:XX:XX
+
+        String request = "http://";
+
+        String ip = new String(apIp, StandardCharsets.UTF_8);
+        int port = Param.AP_COMM_PORT;
+        String map_id = "1";
+        String positionServlet = "/position";
+
+        request += ip + ":" + port + positionServlet + "?";
+        request += "macs=" + mac;
+
+        System.out.println(request);
+
+        return request;
+    }
+
+}
 \ No newline at end of file
+package com.lo53_mobile_localization.core.servlet;
+
+import com.lo53_mobile_localization.core.servlet.util.Param;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by Thomas on 03/06/2017.
+ */
+@WebServlet(
+        name = "PreferencesServlet",
+        urlPatterns = {"/preferences"}
+)
+public class PreferencesServlet extends HttpServlet {
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        response.setContentType(Param.CONTENT_TYPE);
+        request.setAttribute("message", "HELLO THERE");
+        request.getRequestDispatcher(Param.PATH_PREFERENCES).forward(request,response);
+
+    }
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+
+        response.setContentType(Param.CONTENT_TYPE);
+
+        String macAddress = request.getParameter(Param.AP_MAC_ADDRESS);
+        String ip = request.getParameter(Param.ATTRIBUTE_IP);
+        String port = request.getParameter(Param.ATTRIBUTE_PORT);
+
+        String IP_PATTERN = "^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\."
+                + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\."
+                + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\."
+                + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])$";
+
+        String MAC_PATTERN = "^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$";
+
+        String PORT_PATTERN = "[0-9]{4}";
+
+        Pattern patternMac = Pattern.compile(MAC_PATTERN);
+        Matcher matchMac = patternMac.matcher(macAddress);
+
+        Pattern patternIP = Pattern.compile(IP_PATTERN);
+        Matcher matchIp = patternIP.matcher(ip);
+
+        Pattern patternPort = Pattern.compile(PORT_PATTERN);
+        Matcher matchPort = patternPort.matcher(port);
+
+        if (!matchIp.find() || !matchMac.find() || !matchPort.find()) {
+            System.out.println("ERROR IN SETTINGS");
+            request.setAttribute("message", "ERROR IN ONE OF THE FIELDS");
+            request.getRequestDispatcher(Param.PATH_PREFERENCES).forward(request, response);
+
+        } else {
+
+            System.out.println("MAC ADDRESS = " + macAddress + "  IP = " + ip + "   PORT = " + port);
+
+            getServletContext().setAttribute("macaddress", macAddress);
+            getServletContext().setAttribute("ip", ip);
+            getServletContext().setAttribute("port", port);
+
+            request.getRequestDispatcher(Param.PATH_HOME).forward(request, response);
+        }
+    }
+
+}
+package com.lo53_mobile_localization.core.servlet.util;
+
+/**
+ * Created by Thomas on 03/06/2017.
+ */
+public class Param{
+
+
+        public static final String ATTRIBUTE_IP = "ip";
+        public static final String ATTRIBUTE_PORT = "port";
+
+        public static final String AP_MAC_ADDRESS = "macaddress";
+
+        public static final String PATH_PREFERENCES= "/jsp/preferences.jsp";
+        public static final String PATH_POSITION= "/jsp/position.jsp";
+        public static final String PATH_CALIBRATION="/jsp/calibration.jsp";
+
+        public static final String PATH_HOME = "/index.jsp";
+
+        public static final String CONTENT_TYPE = "text/html;charset=UTF-8";
+
+        public static final int AP_COMM_PORT = 7777;
+
+        public static final byte[][] AP_IPS = {
+                {(byte)192,(byte)168,(byte)1,(byte)1},
+                {(byte)192,(byte)168,(byte)1,(byte)2},
+                {(byte)192,(byte)168,(byte)1,(byte)3}
+        };
+
+        public static final int DATAG_LISTENING_PORT = 8080;
+
+        public static final String CALIBRATION = "calibration";
+        public static final String POSITION = "position";
+
+
+}
@@ -2,9 +2,6 @@ package com.lo53_mobile_localization.core.service;
 import com.lo53_mobile_localization.core.entity.*;
 import com.lo53_mobile_localization.core.helpers.HibernateTestHelper;
-import com.lo53_mobile_localization.core.repository.AccessPointDAO;
-import com.lo53_mobile_localization.core.repository.LocationDAO;
-import com.lo53_mobile_localization.core.repository.RSSIDAO;
 import org.junit.Before;
 import org.junit.Test;
@@ -18,8 +15,8 @@ import static org.junit.Assert.assertTrue;
  */
 public class RssiServiceTest extends HibernateTestHelper{
-    Rssi item = null;
-    RSSIService service;
+    private Rssi item = null;
+    private RSSIService service;
     @Before
     public void setUp() throws Exception {
@@ -31,19 +28,18 @@ public class RssiServiceTest extends HibernateTestHelper{
         Location loc = new Location();
         AccessPoint ap = new AccessPoint();
-        LocationDAO locationDAO = new LocationDAO();
-        AccessPointDAO accessPointDAO = new AccessPointDAO();
+        LocationService locationService = new LocationService();
+        AccessPointService apService = new AccessPointService();
-        locationDAO.insertEntity(loc);
-        accessPointDAO.insertEntity(ap);
+        locationService.storeEntity(loc);
+        apService.storeEntity(ap);
-        rssi.getId().setAccessPointId(ap.getId());
-        rssi.getId().setLocationId(loc.getId());
+        rssi.setAccessPoint(ap);
+        rssi.setLocation(loc);
         rssi.setValue(10);
         rssi.setOccurences(6);
-        RSSIDAO rssiDao = new RSSIDAO();
-        rssiDao.insertEntity(rssi);
+        service.storeEntity(rssi);
         item = rssi;
     }
@@ -62,8 +58,14 @@ public class RssiServiceTest extends HibernateTestHelper{
             Location loc = new Location();
             AccessPoint ap = new AccessPoint();
-            testingRssi.getId().setAccessPointId(ap.getId());
-            testingRssi.getId().setLocationId(loc.getId());
+            AccessPointService apService = new AccessPointService();
+            LocationService locationService = new LocationService();
+
+            locationService.storeEntity(loc);
+            apService.storeEntity(ap);
+
+            testingRssi.setAccessPoint(ap);
+            testingRssi.setLocation(loc);
             service.storeEntity(testingRssi);
@@ -116,5 +118,14 @@ public class RssiServiceTest extends HibernateTestHelper{
         assertTrue(storedItems.containsAll(addedItems));
     }
+    @Test
+    public void getRssiWithLocationAndAP(){
+
+        Rssi testRssi = service.getRssiWithLocationAndAP(item.getLocation(), item.getAccessPoint());
+
+        assertEquals(item, testRssi);
+
+    }
+
 }