Skip to content

Commit

Permalink
Added result read message and fix bug from NewMessage in personal gap
Browse files Browse the repository at this point in the history
  • Loading branch information
@bardiademon
bardiademon committed Feb 4, 2021
1 parent 39d4f26 commit 00929f1
Show file tree
Hide file tree
Showing 70 changed files with 435 additions and 189 deletions.
3 changes: 1 addition & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
<artifactId>jackson-databind</artifactId>
<version>2.10.2</version>
</dependency>

<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
Expand All @@ -148,8 +149,6 @@
<version>2.8.6</version>
</dependency>



</dependencies>

<build>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bardiademon/CyrusMessenger/Controller/AnswerToClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static AnswerToClient OK ()
}

@JsonIgnore
public static AnswerToClient error400 ()
public static AnswerToClient BadRequest ()
{
return new AnswerToClient (400 , false);
}
Expand Down Expand Up @@ -70,7 +70,7 @@ public static AnswerToClient KeyAnswer (AnswerToClient _AnswerToClient , Object.
@JsonIgnore
public static AnswerToClient RequestIsNull ()
{
AnswerToClient answerToClient = error400 ();
AnswerToClient answerToClient = BadRequest ();
answerToClient.put (CUK.answer.name () , CUV.request_is_null.name ());
return answerToClient;
}
Expand Down Expand Up @@ -107,13 +107,13 @@ public static AnswerToClient IdInvalid ()
@JsonIgnore
public static AnswerToClient IdInvalid (String ValAnswer)
{
return AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer);
return AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer);
}

@JsonIgnore
public static AnswerToClient NotLoggedIn ()
{
AnswerToClient answerToClient = AnswerToClient.error400 ();
AnswerToClient answerToClient = AnswerToClient.BadRequest ();
answerToClient.put (CUK.answer.name () , "not_logged_in");
return answerToClient;
}
Expand Down
10 changes: 5 additions & 5 deletions ...om/bardiademon/CyrusMessenger/Controller/Rest/Gap/Groups/CreateGroup/RestCreateGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public final class RestCreateGroup
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.you_have_made_too_many_groups.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.you_have_made_too_many_groups.name ());
answerToClient.put (KeyAnswer.construction_limit.name () , Groups.MAX_CREATE_GROUP);
answerToClient.setReqRes (req , res);
l.n (ToJson.To (request) , Domain.RNGap.RNGroups.RN_CREATE_GROUP , mainAccount , answerToClient , Thread.currentThread ().getStackTrace () , new Exception ("limit create group") , null);
Expand Down Expand Up @@ -119,7 +119,7 @@ private AnswerToClient checkRequest (RequestCreateGroup request , MainAccount ma

if (Str.IsEmpty (request.getName ()))
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.name_empty.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.name_empty.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.To (request) , Domain.RNGap.RNGroups.RN_CREATE_GROUP , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.name_empty.name ()) , null);
r.n (mainAccount , SubmitRequestType.create_group , true);
Expand All @@ -128,7 +128,7 @@ private AnswerToClient checkRequest (RequestCreateGroup request , MainAccount ma
{
if (Str.IsEmpty (request.getGroupname ()) && !request.isCreateLinkJoin ())
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.groupname_and_link_join_empty.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.groupname_and_link_join_empty.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.To (request) , Domain.RNGap.RNGroups.RN_CREATE_GROUP , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.groupname_and_link_join_empty.name ()) , null);
r.n (mainAccount , SubmitRequestType.create_group , true);
Expand All @@ -140,7 +140,7 @@ private AnswerToClient checkRequest (RequestCreateGroup request , MainAccount ma
VUsername vUsername = new VUsername (request.getGroupname ());
if (!vUsername.check ())
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.groupname_invalid.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.groupname_invalid.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.To (request) , Domain.RNGap.RNGroups.RN_CREATE_GROUP , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.groupname_invalid.name ()) , null);
r.n (mainAccount , SubmitRequestType.create_group , true);
Expand All @@ -150,7 +150,7 @@ private AnswerToClient checkRequest (RequestCreateGroup request , MainAccount ma
Usernames forGroup = usernamesService.findForGroup (request.getGroupname ());
if (forGroup != null)
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.groupname_is_exists.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.groupname_is_exists.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.To (request) , Domain.RNGap.RNGroups.RN_CREATE_GROUP , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.groupname_is_exists.name ()) , null);
r.n (mainAccount , SubmitRequestType.create_group , true);
Expand Down
10 changes: 5 additions & 5 deletions .../com/bardiademon/CyrusMessenger/Controller/Rest/Gap/Groups/FindGroups/RestFindGroups.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,23 @@ public AnswerToClient findByUsername (HttpServletResponse res , HttpServletReque
answerToClient = getInfoGroup (req , res , forGroup.getGroups () , ValAnswer.groupname.name () , username);
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.not_found.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.not_found.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.CreateClass.n ("username" , username).toJson () , Domain.RNGap.RNGroups.RN_FIND_GROUPS , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.not_found.name ()) , null);
r.n (req.getRemoteAddr () , SubmitRequestType.find_groups , true);
}
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.username_invalid.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.username_invalid.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.CreateClass.n ("username" , username).toJson () , Domain.RNGap.RNGroups.RN_FIND_GROUPS , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.username_invalid.name ()) , null);
r.n (req.getRemoteAddr () , SubmitRequestType.find_groups , true);
}
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.username_is_empty.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.username_is_empty.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.CreateClass.n ("username" , username).toJson () , Domain.RNGap.RNGroups.RN_FIND_GROUPS , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.link_is_empty.name ()) , null);
r.n (req.getRemoteAddr () , SubmitRequestType.find_groups , true);
Expand Down Expand Up @@ -112,15 +112,15 @@ public AnswerToClient findByLink (HttpServletResponse res , HttpServletRequest r
answerToClient = getInfoGroup (req , res , groupsService.hasLink (link) , ValAnswer.link.name () , link);
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.link_invalid.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.link_invalid.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.CreateClass.n ("link" , link).toJson () , Domain.RNGap.RNGroups.RN_FIND_GROUPS , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.link_invalid.name ()) , null);
r.n (req.getRemoteAddr () , SubmitRequestType.find_groups , true);
}
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.link_is_empty.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.link_is_empty.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.CreateClass.n ("link" , link).toJson () , Domain.RNGap.RNGroups.RN_FIND_GROUPS , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.link_is_empty.name ()) , null);
}
Expand Down
8 changes: 4 additions & 4 deletions ...va/com/bardiademon/CyrusMessenger/Controller/Rest/Gap/Groups/JoinGroup/RestJoinGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public AnswerToClient join (HttpServletResponse res , HttpServletRequest req , @
Integer maxMember = group.getGroupSecurityProfile ().getMaxMember ();
if (group.getMembers ().size () >= maxMember)
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.group_members_have_been_completed.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.group_members_have_been_completed.name ());
answerToClient.setReqRes (req , res);
l.n (reqJson , Domain.RNGap.RNGroups.RN_JOIN_GROUP , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.group_members_have_been_completed.name ()) , null);
r.n (mainAccount , SubmitRequestType.join_group , true);
Expand Down Expand Up @@ -136,7 +136,7 @@ public AnswerToClient join (HttpServletResponse res , HttpServletRequest req , @
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.joining_has_been_disabled.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.joining_has_been_disabled.name ());
answerToClient.setReqRes (req , res);
l.n (reqJson , Domain.RNGap.RNGroups.RN_JOIN_GROUP , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.joining_has_been_disabled.name ()) , null);
r.n (mainAccount , SubmitRequestType.join_group , true);
Expand Down Expand Up @@ -204,7 +204,7 @@ public AnswerToClient join (HttpServletResponse res , HttpServletRequest req , @
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.group_not_found.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.group_not_found.name ());
answerToClient.setReqRes (req , res);
l.n (reqJson , Domain.RNGap.RNGroups.RN_JOIN_GROUP , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.group_not_found.name ()) , null);
r.n (req.getRemoteAddr () , SubmitRequestType.join_group , true);
Expand All @@ -224,7 +224,7 @@ public AnswerToClient join (HttpServletResponse res , HttpServletRequest req , @
{
if (e.getMessage () != null && e.getMessage ().matches (AnswerToClient.CUV.id_invalid.name ()))
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , AnswerToClient.CUV.id_invalid.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , AnswerToClient.CUV.id_invalid.name ());
answerToClient.setReqRes (req , res);
l.n (reqJson , Domain.RNGap.RNGroups.RN_JOIN_GROUP , null , answerToClient , Thread.currentThread ().getStackTrace () , e , AnswerToClient.CUV.id_invalid.name ());
r.n (req.getRemoteAddr () , SubmitRequestType.join_group , false);
Expand Down
4 changes: 2 additions & 2 deletions ...emon/CyrusMessenger/Controller/Rest/Gap/Groups/Security/GroupMembers/RestGroupMember.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public final class RestGroupMember
}
catch (Exception e)
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , AnswerToClient.CUV.id_invalid.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , AnswerToClient.CUV.id_invalid.name ());
answerToClient.setReqRes (req , res);
l.n (strIdGroups , Domain.RNGap.RNGroups.Security.RN_SECURITY_GROUP_MEMBERS , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (AnswerToClient.CUV.id_invalid.name ()) , ToJson.CreateClass.n (MCookie.KEY_CODE_LOGIN_COOKIE , codeLogin).toJson ());
r.n (mainAccount , SubmitRequestType.group_members , true);
Expand All @@ -101,7 +101,7 @@ public final class RestGroupMember
Groups group = groupsService.hasGroup (idGroup);
if (group == null)
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.group_not_found.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.group_not_found.name ());
answerToClient.setReqRes (req , res);
l.n (strIdGroups , Domain.RNGap.RNGroups.Security.RN_SECURITY_GROUP_MEMBERS , null , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.group_not_found.name ()) , ToJson.CreateClass.n (MCookie.KEY_CODE_LOGIN_COOKIE , codeLogin).toJson ());
r.n (mainAccount , SubmitRequestType.group_members , true);
Expand Down
2 changes: 1 addition & 1 deletion ...essenger/Controller/Rest/Gap/Groups/Security/Management/AddManager/RequestNewManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ private boolean checkBool (String str)
@NotNull
private AnswerToClient notBool (String which)
{
AnswerToClient answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , RestNewManager.ValAnswer.invalid_request);
AnswerToClient answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , RestNewManager.ValAnswer.invalid_request);
answerToClient.put (AnswerToClient.CUK.which.name () , which);
return answerToClient;
}
Expand Down
2 changes: 1 addition & 1 deletion ...usMessenger/Controller/Rest/Gap/Groups/Security/Management/AddManager/RestNewManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public final class RestNewManager
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.id_user_invalid.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.id_user_invalid.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.To (request) , Domain.RNGap.RNGroups.Security.RN_SECURITY_NEW_MANAGER , mainAccount , answerToClient , Thread.currentThread ().getStackTrace () , new Exception ("Error from CanManageGroup") , cookieJson);
r.n (mainAccount , SubmitRequestType.group_members , true);
Expand Down
2 changes: 1 addition & 1 deletion ...oller/Rest/Gap/Groups/Security/Management/Change/ChangeInfoGroup/RestChangeInfoGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public final class RestChangeInfoGroup
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , ValAnswer.group_not_found.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , ValAnswer.group_not_found.name ());
answerToClient.setReqRes (req , res);
l.n (ToJson.To (request) , router , mainAccount , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (ValAnswer.group_not_found.name ()) , null);
r.n (mainAccount , type , true);
Expand Down
2 changes: 1 addition & 1 deletion ...er/Rest/Gap/Groups/Security/Management/Change/ChangeUsername/RestChangeUsernameGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public final class RestChangeUsernameGroup
}
else
{
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.error400 () , AnswerToClient.CUV.username_invalid.name ());
answerToClient = AnswerToClient.OneAnswer (AnswerToClient.BadRequest () , AnswerToClient.CUV.username_invalid.name ());
answerToClient.setReqRes (req , res);
l.n (null , router , mainAccount , answerToClient , Thread.currentThread ().getStackTrace () , new Exception (AnswerToClient.CUV.username_invalid.name ()) , null);
r.n (mainAccount , type , true);
Expand Down
Loading

0 comments on commit 00929f1

Please sign in to comment.