Commit 9d383b74 authored by Antoine Guérin's avatar Antoine Guérin
Browse files

gestion et correction des conflits

parents 7042cd82 39b2f624
namespace java fr.univnantes.alma.thrift
namespace js common
namespace js core
exception InvalidOperationException {
......
= Conception préliminaire
== Création d'une partie
== Diagrammes de séquences
[.lead]
......
......@@ -2,6 +2,13 @@
:source-highlighter: rouge
[source,java]
----
public class Usine{
int stmth;
}
----
== ServeurNotAlone
......
package fr.univnantes.alma;
import fr.univnantes.alma.thrift.GameService;
import fr.univnantes.alma.handler.GameServiceHandler;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocolFactory;
......@@ -32,7 +30,6 @@ public class NotAloneApplication {
@Bean
public ServletRegistrationBean gameServer(TProtocolFactory protocolFactory, GameServiceHandler handler) {
TServlet tServlet = new TServlet(new GameService.Processor<GameServiceHandler>(handler), protocolFactory);
return new ServletRegistrationBean(tServlet, "/api");
}
......
......@@ -58,5 +58,6 @@ public class Game {
}
private void handleRequest(GameJoinRequest request) {
}
}
......@@ -4,7 +4,6 @@ import fr.univnantes.alma.common.GameInterface;
import fr.univnantes.alma.common.GameJoinRequest;
import fr.univnantes.alma.thrift.GameService;
import fr.univnantes.alma.thrift.JoinRequest;
import fr.univnantes.alma.common.GameJoinRequest;
import fr.univnantes.alma.thrift.GameNotFound;
import org.apache.thrift.TException;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -24,7 +24,6 @@ class NotAloneApplicationTest {
@LocalServerPort
protected int port;
protected GameService.Iface client;
@BeforeEach
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment