-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Basic #9
Merged
Merged
Basic #9
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7d2d3eb
basis for the interconnection
DarraghClarke 2dd4566
Fixes to get Docker working
oisinq 008dee8
Minor fix, added build script
oisinq d146064
docker compose then run launcher in intellij
DarraghClarke 727eec3
Fixes
oisinq 1ad803b
updated session pom and annotation
DarraghClarke aa593b2
Slightly longer sleep in gateway
oisinq File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
cd core | ||
mvn install | ||
cd ../gateway | ||
mvn clean package | ||
cd ../load-balancer | ||
mvn clean package | ||
cd ../session | ||
mvn clean package |
This file was deleted.
Oops, something went wrong.
37 changes: 37 additions & 0 deletions
37
client/src/main/java/service/client/chatwindow/CellRenderer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package service.client.chatwindow; | ||
|
||
import javafx.geometry.Pos; | ||
import javafx.scene.control.ListCell; | ||
import javafx.scene.control.ListView; | ||
import javafx.scene.layout.HBox; | ||
import javafx.scene.text.Text; | ||
import javafx.util.Callback; | ||
import message.SessionMessage; | ||
|
||
class CellRenderer implements Callback<ListView<SessionMessage>, ListCell<SessionMessage>> { | ||
@Override | ||
public ListCell<SessionMessage> call(ListView<SessionMessage> p) { | ||
|
||
ListCell<SessionMessage> cell = | ||
new ListCell<SessionMessage>() { | ||
|
||
@Override | ||
protected void updateItem(SessionMessage user, boolean bln) { | ||
super.updateItem(user, bln); | ||
setGraphic(null); | ||
setText(null); | ||
if (user != null) { | ||
HBox hBox = new HBox(); | ||
|
||
Text username = new Text(user.getUsername());//atm just adds user name | ||
|
||
hBox.getChildren().add(username); | ||
hBox.setAlignment(Pos.CENTER_LEFT); | ||
|
||
setGraphic(hBox); | ||
} | ||
} | ||
}; | ||
return cell; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,29 +3,36 @@ version: "3" | |
services: | ||
# client: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can get rid of client from here now |
||
# build: client | ||
# #image: "client:latest" | ||
# depends_on: | ||
# - gateway | ||
# gateway: | ||
# build: gateway | ||
# ports: | ||
# - "8080:8080" | ||
gateway: | ||
build: gateway | ||
ports: | ||
- "8080:8080" | ||
depends_on: | ||
- load-balancer | ||
load-balancer: | ||
build: load-balancer | ||
ports: | ||
- "8081:8081" | ||
depends_on: | ||
- session | ||
session: | ||
build: session | ||
depends_on: | ||
- mongo | ||
- activemq | ||
session-test-client: | ||
build: session-test-client | ||
depends_on: | ||
- mongo | ||
- activemq | ||
- session | ||
activemq: | ||
image: rmohr/activemq:latest | ||
container_name: activemq | ||
ports: | ||
- "8161:8161" | ||
- "61616:61616" | ||
mongo: | ||
image: mongo:4.0.4 | ||
image: mongo:4.0.4 | ||
# session-test-client: | ||
# build: session-test-client | ||
# depends_on: | ||
# - mongo | ||
# - activemq | ||
# - session |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,8 @@ | |
import java.net.*; | ||
import java.nio.ByteBuffer; | ||
import java.time.Instant; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
import com.google.gson.Gson; | ||
import com.google.gson.GsonBuilder; | ||
|
@@ -12,16 +14,17 @@ | |
import org.java_websocket.WebSocket; | ||
import org.java_websocket.handshake.ClientHandshake; | ||
import org.java_websocket.server.WebSocketServer; | ||
import org.springframework.core.ParameterizedTypeReference; | ||
import org.springframework.http.HttpEntity; | ||
import org.springframework.http.HttpMethod; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.web.client.RestTemplate; | ||
|
||
import javax.jms.*; | ||
|
||
//based on the sample implementation provided here: https://github.com/TooTallNate/Java-WebSocket/wiki#server-example | ||
|
||
public class ChatEndpoint extends WebSocketServer { | ||
MessageProducer producer; | ||
Session session; | ||
|
||
public ChatEndpoint(InetSocketAddress address) { | ||
super(address); | ||
|
@@ -45,22 +48,63 @@ public void onMessage(WebSocket conn, String message) { | |
System.out.println("received message from " + conn.getRemoteSocketAddress() + ": " + message); | ||
|
||
try { | ||
ConnectionFactory factory = new ActiveMQConnectionFactory("failover://tcp://activemq:61616"); | ||
Connection connection = factory.createConnection(); | ||
connection.setClientID("gateway"); | ||
Session session = connection.createSession(false, javax.jms.Session.CLIENT_ACKNOWLEDGE); | ||
connection.start(); | ||
|
||
SessionMessage sessionMessage = new SessionMessage(msg.getTime().getEpochSecond(), msg.getSender(), getAddress().toString()); | ||
|
||
Queue requestsQueue = session.createQueue("SESSIONS"); | ||
MessageProducer producer = session.createProducer(requestsQueue); | ||
producer.send(session.createObjectMessage(sessionMessage)); | ||
|
||
producer.close(); | ||
session.close(); | ||
connection.close(); | ||
} catch (JMSException e) { | ||
e.printStackTrace(); | ||
} | ||
|
||
//sample code | ||
Message Response = new Message(); | ||
Response.setMessage("returning message: "+msg.getMessage()); | ||
Response.setSender("Gateway"); | ||
Response.setReciever(msg.getSender()); | ||
Response.setTime(Instant.now()); | ||
|
||
Gson builder = new GsonBuilder().setPrettyPrinting().create(); | ||
String jsonStr = builder.toJson(Response); | ||
conn.send(jsonStr); | ||
// Message Response = new Message(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we delete the sample code yet |
||
// Response.setMessage("returning message: "+msg.getMessage()); | ||
// Response.setSender("Gateway"); | ||
// Response.setReciever(msg.getSender()); | ||
// Response.setTime(Instant.now()); | ||
// long timestamp, String username, String gateway | ||
// | ||
// List<SessionMessage> Response = new ArrayList<>(); | ||
// Response.add(new SessionMessage(19l,"big Tom","this gateway idk")); | ||
// Response.add(new SessionMessage(29l,"GIT","this gateway idk")); | ||
try { | ||
// SessionMessage sessionMessage = new SessionMessage(Instant.now().getEpochSecond(), "oisinq-baby", InetAddress.getLocalHost().toString()); // (msg.getTime().getEpochSecond(), msg.getSender(), getAddress().toString() | ||
// System.out.println("Sending message..."); | ||
// producer.send(session.createObjectMessage(sessionMessage)); | ||
// System.out.println("sent message"); | ||
|
||
Thread.sleep(3000); | ||
|
||
System.out.println("rest time..."); | ||
RestTemplate restTemplate = new RestTemplate(); | ||
|
||
ResponseEntity<List<SessionMessage>> rateResponse = | ||
restTemplate.exchange("http://session:8080/sessions", | ||
HttpMethod.GET, null, new ParameterizedTypeReference<List<SessionMessage>>() { | ||
}); | ||
System.out.println("Code: " + rateResponse.getStatusCodeValue()); | ||
List<SessionMessage> response = rateResponse.getBody(); | ||
System.out.println("There are " + response.size() + " messages. Neat."); | ||
for (SessionMessage message2 : response) { | ||
System.out.println("Content: " + message2.getTimestamp() + " - " + message2.getUsername() + " - " + message2.getGateway()); | ||
} | ||
Gson builder = new GsonBuilder().setPrettyPrinting().create(); | ||
String jsonStr = builder.toJson(response); | ||
conn.send(jsonStr); | ||
} catch (Exception ex) { | ||
System.out.println("hi"); | ||
} | ||
} | ||
|
||
@Override | ||
|
@@ -75,37 +119,34 @@ public void onError(WebSocket conn, Exception ex) { | |
|
||
@Override | ||
public void onStart() { | ||
connectToLoadBalancer(); | ||
System.out.println("server started successfully"); | ||
|
||
String host = "localhost"; | ||
|
||
try { | ||
ConnectionFactory factory = new ActiveMQConnectionFactory("failover://tcp://" + host + ":61616"); | ||
Connection connection = factory.createConnection(); | ||
connection.setClientID("sessions"); | ||
session = connection.createSession(false, javax.jms.Session.CLIENT_ACKNOWLEDGE); | ||
connection.start(); | ||
|
||
Queue requestsQueue = session.createQueue("SESSIONS"); | ||
producer = session.createProducer(requestsQueue); | ||
} catch (JMSException e) { | ||
connectToLoadBalancer(); | ||
} catch (UnknownHostException e) { | ||
e.printStackTrace(); | ||
} | ||
System.out.println("server started successfully"); | ||
} | ||
|
||
public void connectToLoadBalancer() { | ||
public void connectToLoadBalancer() throws UnknownHostException { | ||
RestTemplate restTemplate = new RestTemplate(); | ||
String gatewayAddress = getAddress().getHostString() + ":" + getAddress().getPort(); | ||
HttpEntity<String> request = new HttpEntity<>(gatewayAddress); | ||
|
||
restTemplate.postForObject("http://localhost:8081/addGateway", request, String.class); | ||
try { | ||
Thread.sleep(10000); | ||
} catch (InterruptedException e) { | ||
e.printStackTrace(); | ||
} | ||
|
||
restTemplate.postForObject("http://load-balancer:8081/addGateway", request, String.class); | ||
System.out.println("I've posted! go me!"); | ||
} | ||
|
||
public static void main(String[] args) { | ||
String host = "localhost"; | ||
public static void main(String[] args) throws UnknownHostException { | ||
String host = Inet4Address.getLocalHost().getHostAddress(); | ||
int port = 8080; | ||
|
||
System.out.println("waiting"); | ||
WebSocketServer server = new ChatEndpoint(new InetSocketAddress(host, port)); | ||
server.run(); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
FROM openjdk:8-jre-alpine | ||
VOLUME /tmp | ||
ARG DEPENDENCY=target/dependency | ||
COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib | ||
COPY ${DEPENDENCY}/META-INF /app/META-INF | ||
COPY ${DEPENDENCY}/BOOT-INF/classes /app | ||
ENTRYPOINT ["java","-cp","app:app/lib/*","service.balancer.Application", "mongo"] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we get rid of this commented out code yet?