Skip to content

Commit

Permalink
Merge pull request #10 from tvd12/master
Browse files Browse the repository at this point in the history
release version 1.1.3
  • Loading branch information
tvd12 authored Sep 6, 2016
2 parents 1bb13b7 + fd35c49 commit c19f4e7
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 6 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ This project supports to create a server side game application more efficiently
context.command(Log.class).from(this).info("user " + user.getName()
+ " joined room " + room.getName());
context.command(Response.class)
.command("1").recipient(user).data(room).execute();
.command("1").recipients(user).data(room).execute();
}

}
Expand Down Expand Up @@ -122,7 +122,7 @@ Let's say you need validate a parameter in a request from client (i.e money in "
public void execute(AppContext context, MyUser user) throws Exception {
if(money <= 0) {
context.command(Response.class)
.command("2").recipient(user).execute();
.command("2").recipients(user).execute();
throw new BadRequestException();
}
}
Expand Down Expand Up @@ -154,12 +154,12 @@ We must spend a lot of time to declare, init variables. Some time we also have t
<dependency>
<groupId>com.tvd12</groupId>
<artifactId>ezyfox-core</artifactId>
<version>1.1.1</version>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>com.tvd12</groupId>
<artifactId>ezyfox-sfs2x</artifactId>
<version>1.1.1</version>
<version>1.1.3</version>
</dependency>
```

Expand Down
32 changes: 32 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
**version 1.1.3**

- Add serialize and deserialize features, example:

public class BetRequestSerializer implements ObjectSerializer {

@Override
public Parameters serialize(Object object) {
BetRequestListener bet = (BetRequestListener)object;
Parameters answer = new ParameterWrapper();
answer.set("1", bet.getBettingTypeId());
return answer;
}

}

public class BetRequestDeserializer implements ObjectDeserializer {

@SuppressWarnings("unchecked")
@Override
public BetRequestListener deserialize(Object object, Parameters params) {
BetRequestListener bet = (BetRequestListener)object;
bet.setBettingTypeId(params.get("1", int.class));
return bet;
}

}

context.command(AddObjectSerializer.class)
.add(BetRequestListener.class, new BetRequestSerializer());
context.command(AddObjectDeserializer.class)
.add(BetRequestDeserializer.class, new BetRequestDeserializer());
2 changes: 1 addition & 1 deletion ezyfox-core
Submodule ezyfox-core updated 94 files
+1 −1 README.md
+1 −1 pom.xml
+2 −4 src/main/java/com/tvd12/ezyfox/core/command/AddCommand.java
+25 −0 src/main/java/com/tvd12/ezyfox/core/command/AddObjectDeserializer.java
+25 −0 src/main/java/com/tvd12/ezyfox/core/command/AddObjectSerializer.java
+16 −2 src/main/java/com/tvd12/ezyfox/core/command/Response.java
+22 −7 src/main/java/com/tvd12/ezyfox/core/command/ResponseToRoom.java
+31 −0 src/main/java/com/tvd12/ezyfox/core/command/impl/AddCommandImpl.java
+34 −0 src/main/java/com/tvd12/ezyfox/core/command/impl/AddObjectDeserializerImpl.java
+34 −0 src/main/java/com/tvd12/ezyfox/core/command/impl/AddObjectSerializerImpl.java
+21 −0 src/main/java/com/tvd12/ezyfox/core/command/impl/FixedCommand.java
+65 −0 src/main/java/com/tvd12/ezyfox/core/config/ObjectDeserializerMapper.java
+65 −0 src/main/java/com/tvd12/ezyfox/core/config/ObjectSerializerMapper.java
+474 −0 src/main/java/com/tvd12/ezyfox/core/content/impl/BaseAppContext.java
+11 −0 src/main/java/com/tvd12/ezyfox/core/reflect/ReflectTypeUtil.java
+16 −0 src/main/java/com/tvd12/ezyfox/core/serialize/ObjectDeserializer.java
+16 −0 src/main/java/com/tvd12/ezyfox/core/serialize/ObjectSerializer.java
+3 −1 src/main/java/com/tvd12/ezyfox/core/structure/ClassUnwrapper.java
+19 −5 src/main/java/com/tvd12/ezyfox/core/structure/MethodCover.java
+12 −0 src/main/java/com/tvd12/ezyfox/core/structure/SetterMethodCover.java
+7 −2 src/main/java/com/tvd12/ezyfox/core/transport/Parameters.java
+10 −1 src/main/java/com/tvd12/ezyfox/core/transport/impl/ConcurrentParameters.java
+10 −1 src/main/java/com/tvd12/ezyfox/core/transport/impl/ParameterWrapper.java
+23 −0 src/test/java/com/tvd12/ezyfox/core/testing/command/AddCommandImplTest.java
+27 −0 src/test/java/com/tvd12/ezyfox/core/testing/command/AddObjectDeserializerImplTest.java
+26 −0 src/test/java/com/tvd12/ezyfox/core/testing/command/AddObjectSerializerImplTest.java
+29 −0 src/test/java/com/tvd12/ezyfox/core/testing/command/BaseCommandTest.java
+35 −0 src/test/java/com/tvd12/ezyfox/core/testing/config/ObjectDeserializerMapperTest.java
+36 −0 src/test/java/com/tvd12/ezyfox/core/testing/config/ObjectSerializerMapperTest.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/AppCommand.java
+20 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/AppCommand2.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/AppCommand3.java
+18 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/AppCommand4.java
+11 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/AppConfig.java
+146 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/AppContextImplTest.java
+11 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/AppEntryPoint.java
+23 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/AppUser.java
+15 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BettingRequestListener.java
+13 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BettingRequestListener2.java
+15 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BettingRequestListener3.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BettingRequestListener4.java
+16 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BettingRequestListener5.java
+16 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BettingRequestListener6.java
+21 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BuddyAddHandler.java
+21 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BuddyAddHandler2.java
+20 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BuddyInitHandler.java
+20 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BuddyInitHandler2.java
+25 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BuddyMessageHandler.java
+20 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/BuddyOnlineStateChangeHandler.java
+31 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/CurrentState.java
+57 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/ExAppContextImpl.java
+20 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/GameInvationFailureHandler.java
+21 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/GameInvationSuccessHandler.java
+15 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/HistoryRequestListener.java
+18 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/PokerMessages.java
+19 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/PokerResult.java
+19 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/PokerRoom.java
+18 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/PokerUser.java
+25 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/PrivateMessageHandler.java
+25 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/PrivateMessageHandler2.java
+23 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/PublicMessageHandler.java
+25 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/PublicMessageHandler2.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/ServerInitializingHandler.java
+13 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/ServerInitializingHandler2.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/ServerReadyHandler.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/ServerReadyHandler2.java
+19 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserAddBuddyFilter.java
+26 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserDeserializer.java
+20 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserDisconnectHandler.java
+19 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinRoomFilter.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinRoomHandler.java
+16 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinRoomHandler2.java
+16 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinRoomHandler3.java
+16 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinRoomHandler4.java
+16 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinRoomHandler5.java
+17 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinRoomHandler6.java
+15 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinZoneHandler.java
+17 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinZoneHandler2.java
+17 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinZoneHandler3.java
+17 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserJoinZoneHandler4.java
+15 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserLoginHandler.java
+15 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserLoginHandler2.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserLogoutHandler.java
+14 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserLogoutHandler2.java
+19 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserReconnectionTryHandler.java
+27 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/UserSerializer.java
+21 −0 src/test/java/com/tvd12/ezyfox/core/testing/context/VideoPokerRoom.java
+2 −31 src/test/java/com/tvd12/ezyfox/core/testing/methodcover/MethodCoverTest.java
+1 −0 src/test/java/com/tvd12/ezyfox/core/testing/model/ConcurrentParametersTest.java
+1 −0 src/test/java/com/tvd12/ezyfox/core/testing/model/ParametersTest.java
+3 −0 src/test/java/com/tvd12/ezyfox/core/testing/reflectutil/ReflectTypeUtilTest.java
+23 −0 src/test/java/com/tvd12/ezyfox/core/testing/requestlistenerclass/RequestListenerClassTest.java
+10 −5 src/test/java/com/tvd12/ezyfox/core/testing/responsehandlerclasss/ResponseHandlerClassTest.java
+12 −0 src/test/resources/AllTests.tng.xml
2 changes: 1 addition & 1 deletion ezyfox-sfs2x
Submodule ezyfox-sfs2x updated 43 files
+1 −1 README.md
+2 −2 pom.xml
+22 −7 src/main/java/com/tvd12/ezyfox/sfs2x/clienthandler/ClientEventHandler.java
+0 −36 src/main/java/com/tvd12/ezyfox/sfs2x/command/impl/AddCommandImpl.java
+2 −2 src/main/java/com/tvd12/ezyfox/sfs2x/command/impl/LeaveRoomImpl.java
+36 −20 src/main/java/com/tvd12/ezyfox/sfs2x/command/impl/ResponseImpl.java
+71 −0 src/main/java/com/tvd12/ezyfox/sfs2x/command/impl/ResponseParamsBuilder.java
+46 −30 src/main/java/com/tvd12/ezyfox/sfs2x/command/impl/ResponseToRoomImpl.java
+18 −329 src/main/java/com/tvd12/ezyfox/sfs2x/content/impl/AppContextImpl.java
+69 −7 src/main/java/com/tvd12/ezyfox/sfs2x/content/impl/RoomContextImpl.java
+12 −0 src/main/java/com/tvd12/ezyfox/sfs2x/data/SfsTransformer.java
+74 −0 src/main/java/com/tvd12/ezyfox/sfs2x/data/impl/ParamTransformer.java
+222 −0 src/main/java/com/tvd12/ezyfox/sfs2x/data/impl/SfsObjectTransformer.java
+103 −0 src/main/java/com/tvd12/ezyfox/sfs2x/data/impl/SfsVariableTransformer.java
+32 −14 src/main/java/com/tvd12/ezyfox/sfs2x/data/impl/SimpleTransformer.java
+2 −1 src/main/java/com/tvd12/ezyfox/sfs2x/extension/RoomExtension.java
+7 −1 src/main/java/com/tvd12/ezyfox/sfs2x/extension/ZoneExtension.java
+104 −15 src/main/java/com/tvd12/ezyfox/sfs2x/serializer/ParameterSerializer.java
+1 −1 src/main/resources/ezyfox/config/commands.properties
+7 −1 src/test/java/com/tvd12/ezyfox/sfs2x/testing/any/ListServerEventHandlerTest.java
+35 −5 src/test/java/com/tvd12/ezyfox/sfs2x/testing/clienthandler/ClientEventHandlerTest.java
+37 −3 src/test/java/com/tvd12/ezyfox/sfs2x/testing/clienthandler/ClientRoomEventHandlerTest.java
+0 −23 src/test/java/com/tvd12/ezyfox/sfs2x/testing/command/AddCommandImplTest.java
+19 −12 src/test/java/com/tvd12/ezyfox/sfs2x/testing/command/BaseCommandTest.java
+8 −8 src/test/java/com/tvd12/ezyfox/sfs2x/testing/command/ResponseImplTest.java
+107 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/command/ResponseImplTest2.java
+0 −5 src/test/java/com/tvd12/ezyfox/sfs2x/testing/command/ResponseToRoomImplTest.java
+81 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/command/ResponseToRoomImplTest2.java
+10 −4 src/test/java/com/tvd12/ezyfox/sfs2x/testing/context/AppContextImplTest.java
+10 −5 src/test/java/com/tvd12/ezyfox/sfs2x/testing/context/BaseHandlerTest.java
+5 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/context/BettingRequestListener.java
+16 −4 src/test/java/com/tvd12/ezyfox/sfs2x/testing/context/RoomContextImplTest.java
+173 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/data/ParamTransformerTest.java
+173 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/data/ParamTransformerTest2.java
+177 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/data/ParamTransformerTest3.java
+267 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/data/SfsObjectTransformerTest.java
+291 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/data/SfsVariableTransformerTest.java
+114 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/data/SimpleTransformer3Test.java
+7 −1 src/test/java/com/tvd12/ezyfox/sfs2x/testing/extension/RoomExtensionTest.java
+4 −2 src/test/java/com/tvd12/ezyfox/sfs2x/testing/paramtypeparser/ParamTypeParserTest.java
+82 −6 src/test/java/com/tvd12/ezyfox/sfs2x/testing/responseparameterparser/ResponseParamParserTest.java
+7 −0 src/test/java/com/tvd12/ezyfox/sfs2x/testing/roomcontext/BetRequestListener.java
+32 −5 src/test/java/com/tvd12/ezyfox/sfs2x/testing/roomcontext/ExRoomExtension.java

0 comments on commit c19f4e7

Please sign in to comment.