zdm/envoy
zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: delvh <dev.lh@web.de>
This commit is contained in:
Kai S. K. Engelbart 2020-06-14 16:30:46 +02:00 committed by GitHub
parent a9de00371d
commit f1c49f0b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drop_all_tables.sql
View File

@ -2,4 +2,4 @@ DROP SCHEMA public CASCADE;
CREATE SCHEMA public;
GRANT ALL ON SCHEMA public TO postgres;
GRANT ALL ON SCHEMA public TO envoy;
GRANT ALL ON SCHEMA public TO public;
GRANT ALL ON SCHEMA public TO public;

2
src/main/java/envoy/server/Startup.java
View File

@ -38,7 +38,7 @@ public class Startup {
final var items = new HashMap<String, ConfigItem<?>>();
items.put("homeDirectory",
new ConfigItem<>("homeDirectory", "h", File::new, new File(System.getProperty("user.home"), ".envoy-server"), true));
items.put("fileLevelBarrier", new ConfigItem<>("fileLevelBarrier", "fb", Level::parse, Level.SEVERE, true));
items.put("fileLevelBarrier", new ConfigItem<>("fileLevelBarrier", "fb", Level::parse, Level.WARNING, true));
items.put("consoleLevelBarrier", new ConfigItem<>("consoleLevelBarrier", "cb", Level::parse, Level.FINEST, true));
final var config = new Config();

2
src/main/java/envoy/server/data/Contact.java
View File

@ -40,7 +40,7 @@ public abstract class Contact {
@Temporal(TemporalType.TIMESTAMP)
private Date creationDate;
@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@ManyToMany(fetch = FetchType.EAGER)
protected Set<Contact> contacts;
/**

8
src/main/java/envoy/server/data/PersistenceManager.java
View File

@ -117,7 +117,7 @@ public class PersistenceManager {
* Searches for a {@link User} with a specific ID.
*
* @param id the id to search for
* @return the user with the specified id
* @return the user with the specified ID or {@code null} if none was found
* @since Envoy Server Standalone v0.1-alpha
*/
public User getUserByID(long id) { return entityManager.find(User.class, id); }
@ -126,7 +126,7 @@ public class PersistenceManager {
* Searches for a {@link Group} with a specific ID.
*
* @param id the id to search for
* @return the group with the specific id
* @return the group with the specified ID or {@code null} if none was found
* @since Envoy Server Standalone v0.1-beta
*/
public Group getGroupByID(long id) { return entityManager.find(Group.class, id); }
@ -135,7 +135,7 @@ public class PersistenceManager {
* Searches for a {@link Contact} with a specific ID.
*
* @param id the id to search for
* @return the contact with the specific id
* @return the contact with the specified ID or {@code null} if none was found
* @since Envoy Server Standalone v0.1-beta
*/
public Contact getContactByID(long id) { return entityManager.find(Contact.class, id); }
@ -166,7 +166,7 @@ public class PersistenceManager {
* Searches for a {@link Message} with a specific id.
*
* @param id the id to search for
* @return the message with the specified id
* @return the message with the specified ID or {@code null} if none is found
* @since Envoy Server Standalone v0.1-alpha
*/
public Message getMessageByID(long id) { return entityManager.find(Message.class, id); }

1
src/main/java/envoy/server/net/ObjectWriteProxy.java
View File

@ -43,7 +43,6 @@ public class ObjectWriteProxy {
// Create message targeted at the client
final Message response = writeProxy.getMessage();
response.socketId = recipientSocketID;
logger.fine("Sending " + obj);
// Serialize object to byte array

1
src/main/java/envoy/server/processors/GroupMessageProcessor.java
View File

@ -38,7 +38,6 @@ public class GroupMessageProcessor implements ObjectProcessor<GroupMessage> {
// Checks if all memberMessageStatuses are RECEIVED and if so sets the
// groupMessage Status to RECEIVED.
if (!groupMessage.getMemberStatuses().containsValue(MessageStatus.SENT)) groupMessage.setStatus(MessageStatus.RECEIVED);
members.forEach(user -> { sendToMember(connectionManager, groupMessage, user.getID(), writeProxy); });

13
src/main/java/envoy/server/processors/MessageProcessor.java
View File

@ -31,19 +31,14 @@ public class MessageProcessor implements ObjectProcessor<Message> {
@Override
public void process(Message message, long socketID, ObjectWriteProxy writeProxy) {
if (message.getStatus!=MessageStatus.WAITING) {
logger.warning("Received message with invalid status: " + message);
return;
}
message.nextStatus();
ConnectionManager connectionManager = ConnectionManager.getInstance();
sendToUser(connectionManager, message, writeProxy);
if (message.getStatus() != MessageStatus.SENT) {
// Sending a messageStatusChangeEvent to the sender
try {
writeProxy.write(socketID, new MessageStatusChangeEvent(message));
} catch (IOException e) {
logger.warning("Could not send messageStatusChangeEvent to the sender of this message with ID: " + message.getID());
e.printStackTrace();
}
}
try {
PersistenceManager.getInstance().addMessage(new envoy.server.data.Message(message));
} catch (EntityExistsException e) {

4
src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java
View File

@ -33,8 +33,8 @@ public class MessageStatusChangeProcessor implements ObjectProcessor<MessageStat
persistenceManager.updateMessage(msg);
// Notifies the sender of the message about the status-update to READ
final long senderId = msg.getSender().getID();
if (connectionManager.isOnline(senderId)) writeProxy.write(connectionManager.getSocketId(senderId), input);
final long senderID = msg.getSender().getID();
if (connectionManager.isOnline(senderID)) writeProxy.write(connectionManager.getSocketId(senderID), input);
}
@Override