Merge branch 'issue11' #11

Author: lucasgueiros

nbproject/build-impl.xml

@@ -18,6 +18,7 @@
 
         -->
 <project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="Jogo_de_Whist-impl">
+    <import file="rest-build.xml"/>
     <import file="ant-deploy.xml"/>
     <fail message="Please build using Ant 1.7.1 or higher.">
         <condition>
@@ -1004,6 +1005,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${libs.PostgreSQLDriver.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jandex-2.0.2.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${libs.jstl.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${libs.restapi.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${libs.restlib.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.json-1.5-20090211.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
@@ -1015,6 +1019,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${libs.PostgreSQLDriver.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jandex-2.0.2.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${libs.jstl.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.restapi.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.restlib.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.json-1.5-20090211.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

nbproject/genfiles.properties

@@ -1,8 +1,11 @@
-build.xml.data.CRC32=788d88e7
+build.xml.data.CRC32=d3ce7f16
 build.xml.script.CRC32=6c8676ee
 build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=788d88e7
-nbproject/build-impl.xml.script.CRC32=4aa5a2f1
+nbproject/build-impl.xml.data.CRC32=d3ce7f16
+nbproject/build-impl.xml.script.CRC32=6e9de954
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/rest-build.xml.data.CRC32=cddf6025
+nbproject/rest-build.xml.script.CRC32=9716e867
+nbproject/rest-build.xml.stylesheet.CRC32=[email protected]

nbproject/project.properties

@@ -30,6 +30,9 @@ endorsed.classpath=\
     ${libs.javaee-endorsed-api-7.0.classpath}
 excludes=
 file.reference.jandex-2.0.2.Final.jar=/home/lucas/Downloads/jandex-2.0.2.Final.jar
+file.reference.jquery-ui-1.12.1.custom.zip=/home/lucas/Downloads/jquery-ui-1.12.1.custom.zip
+file.reference.json-1.5-20090211.jar=/home/lucas/Downloads/json-1.5-20090211.jar
+file.reference.le-frog-1.0.10.jar=/home/lucas/Downloads/le-frog-1.0.10.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
@@ -45,7 +48,12 @@ javac.classpath=\
     ${libs.hibernate4-persistence.classpath}:\
     ${libs.PostgreSQLDriver.classpath}:\
     ${file.reference.jandex-2.0.2.Final.jar}:\
-    ${libs.jstl.classpath}
+    ${libs.jstl.classpath}:\
+    ${file.reference.jquery-ui-1.12.1.custom.zip}:\
+    ${file.reference.le-frog-1.0.10.jar}:\
+    ${libs.restapi.classpath}:\
+    ${libs.restlib.classpath}:\
+    ${file.reference.json-1.5-20090211.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -78,6 +86,7 @@ no.dependencies=false
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
 resource.dir=setup
+rest.config.type=ide
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}

nbproject/project.xml

@@ -2,6 +2,9 @@
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.web.project</type>
     <configuration>
+        <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1">
+            <extension file="rest-build.xml" id="rest.5"/>
+        </buildExtensions>
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
             <name>Jogo de Whist</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
@@ -34,6 +37,24 @@
                     <file>${libs.jstl.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.jquery-ui-1.12.1.custom.zip}</file>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.le-frog-1.0.10.jar}</file>
+                </library>
+                <library dirs="200">
+                    <file>${libs.restapi.classpath}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${libs.restlib.classpath}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.json-1.5-20090211.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

nbproject/rest-build.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        *** GENERATED - DO NOT EDIT  ***
+        -->
+<project name="Jogo_de_Whist-rest-build" basedir=".." xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:jaxrs="http://www.netbeans.org/ns/jax-rs/1">
+    <target name="-check-trim">
+        <condition property="do.trim">
+            <and>
+                <isset property="client.urlPart"/>
+                <length string="${client.urlPart}" when="greater" length="0"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-trim-url" if="do.trim">
+        <pathconvert pathsep="/" property="rest.base.url">
+            <propertyset>
+                <propertyref name="client.url"/>
+            </propertyset>
+            <globmapper from="*${client.urlPart}" to="*/"/>
+        </pathconvert>
+    </target>
+    <target name="-spare-url" unless="do.trim">
+        <property name="rest.base.url" value="${client.url}"/>
+    </target>
+    <target name="test-restbeans" depends="run-deploy,-init-display-browser,-check-trim,-trim-url,-spare-url">
+        <replace file="${restbeans.test.file}" token="${base.url.token}" value="${rest.base.url}||${rest.application.path}"/>
+        <condition property="do.browse-url">
+            <istrue value="${display.browser}"/>
+        </condition>
+        <antcall target="browse-url"/>
+    </target>
+    <target name="browse-url" if="do.browse-url">
+        <nbbrowse url="${restbeans.test.url}"/>
+    </target>
+</project>

src/java/com/github/lucasgueiros/ifuwhist/partida/Partida.java

@@ -25,6 +25,8 @@
 import com.github.lucasgueiros.ifuwhist.partida.vaza.Naipe;
 import com.github.lucasgueiros.ifuwhist.partida.excecoes.CartaInvalidaException;
 import com.github.lucasgueiros.ifuwhist.partida.excecoes.CartaNaoEstaNaMaoException;
+import com.github.lucasgueiros.ifuwhist.webservice.aletoriedade.GeradorAleatorioJavaRandom;
+import com.github.lucasgueiros.ifuwhist.webservice.aletoriedade.GeradorAleatorioQrngAnu;
 
 /**
  *
@@ -197,7 +199,7 @@ public void iniciar() {
             maos.get(po).clear();
         }
         // embaralhe e crie a bolsa
-        bolsa = new EmbaralhadorSimples().embaralhar(dador);
+        bolsa = new EmbaralhadorSimples().embaralhar(dador, new GeradorAleatorioQrngAnu());
         // distribua as cartas
         for (Posicao posicao : Posicao.values()) {
             maos.get(posicao).addAll(bolsa.getMao(posicao));

src/java/com/github/lucasgueiros/ifuwhist/partida/bolsa/Bolsa.java

@@ -8,9 +8,13 @@
 import com.github.lucasgueiros.ifuwhist.mesa.Posicao;
 import com.github.lucasgueiros.ifuwhist.partida.vaza.Carta;
 import com.github.lucasgueiros.ifuwhist.partida.vaza.Naipe;
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 
 /**
  *
@@ -20,15 +24,21 @@
  * 
  * @author lucas
  */
-public class Bolsa {
+@XmlRootElement
+public class Bolsa implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     private Naipe trunfo;
     private Collection<Carta> norte;
     private Collection<Carta> sul;
     private Collection<Carta> leste;
     private Collection<Carta> oeste;
     private Posicao dealer;
 
+    public Bolsa() {
+    }
+
     private Bolsa(Naipe trunfo, Posicao dealer) {
         this.trunfo = trunfo;
         this.dealer = dealer;
@@ -60,14 +70,16 @@ public Naipe getTrunfo() {
         return trunfo;
     }
 
+    @XmlElement
     public void setTrunfo(Naipe trunfo) {
         this.trunfo = trunfo;
     }
 
     public Posicao getDealer() {
         return dealer;
     }
-
+    
+    @XmlElement
     public void setDealer(Posicao dealer) {
         this.dealer = dealer;
     }
@@ -86,6 +98,7 @@ public Collection<Carta> getNorte() {
         return norte;
     }
 
+    @XmlElement (name="NORTH")
     public void setNorte(Collection<Carta> norte) {
         this.norte = norte;
     }
@@ -94,6 +107,7 @@ public Collection<Carta> getSul() {
         return sul;
     }
 
+    @XmlElement (name="SOUTH")
     public void setSul(Collection<Carta> sul) {
         this.sul = sul;
     }
@@ -102,6 +116,7 @@ public Collection<Carta> getLeste() {
         return leste;
     }
 
+    @XmlElement (name="EAST")
     public void setLeste(Collection<Carta> leste) {
         this.leste = leste;
     }
@@ -110,9 +125,15 @@ public Collection<Carta> getOeste() {
         return oeste;
     }
 
+    @XmlElement (name="WEST")
     public void setOeste(Collection<Carta> oeste) {
         this.oeste = oeste;
     }
+
+    @Override
+    public String toString() {
+        return "Bolsa{" + "trunfo=" + trunfo + ", norte=" + norte + ", sul=" + sul + ", leste=" + leste + ", oeste=" + oeste + ", dealer=" + dealer + '}';
+    }
 
 
 

src/java/com/github/lucasgueiros/ifuwhist/partida/bolsa/Embaralhador.java

@@ -7,6 +7,7 @@
 
 import com.github.lucasgueiros.ifuwhist.mesa.Posicao;
 import com.github.lucasgueiros.ifuwhist.partida.vaza.Carta;
+import com.github.lucasgueiros.ifuwhist.webservice.aletoriedade.GeradorAleatorio;
 
 /**
  *
@@ -18,7 +19,8 @@ public interface Embaralhador {
      * Gera um nova bolsa aleatoriamente, apenas define-se o "imaginável" dealer.
      * 
      * @param posicao dealer
+     * @param geradorAleatorio
      * @return 
      */
-    public Bolsa embaralhar(Posicao posicao);
+    public Bolsa embaralhar(Posicao posicao, GeradorAleatorio geradorAleatorio);
 }

src/java/com/github/lucasgueiros/ifuwhist/partida/bolsa/EmbaralhadorOestePorUltimo.java

@@ -10,6 +10,7 @@
 import com.github.lucasgueiros.ifuwhist.partida.vaza.ComparaCartas;
 import com.github.lucasgueiros.ifuwhist.partida.vaza.Naipe;
 import com.github.lucasgueiros.ifuwhist.partida.vaza.Simbolo;
+import com.github.lucasgueiros.ifuwhist.webservice.aletoriedade.GeradorAleatorio;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
@@ -21,15 +22,15 @@
 public class EmbaralhadorOestePorUltimo implements Embaralhador {
 
     @Override
-    public Bolsa embaralhar(Posicao dealer) {
+    public Bolsa embaralhar(Posicao dealer, GeradorAleatorio gerador) {
         List<Carta> maoDealer = new LinkedList<>();
         List<Carta> maoEsquerda = new LinkedList<>();
         List<Carta> maoDireita = new LinkedList<>();
         List<Carta> maoParceiro = new LinkedList<>();
 
         for(Naipe su : Naipe.values()) {
             for(Simbolo sy : Simbolo.values()) {
-                int random =  (int) ( Math.random() * 3 ) ; // um número entre 0 e 3
+                int random =  gerador.get(1,0,3)[0] ; // um número entre 0 e 3
                 loop:do {
                     switch(random) {
                         case 0: // NORTH

src/java/com/github/lucasgueiros/ifuwhist/partida/bolsa/EmbaralhadorSimples.java

@@ -10,6 +10,7 @@
 import com.github.lucasgueiros.ifuwhist.partida.vaza.ComparaCartas;
 import com.github.lucasgueiros.ifuwhist.partida.vaza.Naipe;
 import com.github.lucasgueiros.ifuwhist.partida.vaza.Simbolo;
+import com.github.lucasgueiros.ifuwhist.webservice.aletoriedade.GeradorAleatorio;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -22,8 +23,8 @@
 public class EmbaralhadorSimples implements Embaralhador {
 
     @Override
-    public Bolsa embaralhar(Posicao dealer){
-        long seed = (long) Math.random();
+    public Bolsa embaralhar(Posicao dealer, GeradorAleatorio geradorAleatorio){
+        //long seed = (long) Math.random();
 
         Carta [] maoDealer = new Carta[13];
         Carta [] maoEsquerda = new Carta[13];
@@ -38,9 +39,16 @@ public Bolsa embaralhar(Posicao dealer){
             }
         }
 
-        Random r = new Random(seed);
+        //Random r = new Random(seed);
         // embaralhe
-        Collections.shuffle(set, r);
+        Collections.shuffle(set, new Random(){
+            private int [] alea = geradorAleatorio.get(52,0,51,-1);
+            
+            @Override
+            public int nextInt(int bound) {
+                return alea[bound-1];
+            }
+        });
 
         // distribua
         // até 13