Addresses #43 (api_gateway, user_management, mysql)

api_gateway/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:13-jdk
+
+ADD api_gateway.jar /
+
+CMD [ "java", "-jar", "./api_gateway.jar" ]

api_gateway/KafkaProducer/Dockerfile

@@ -0,0 +1,27 @@
+FROM openjdk:13-jdk
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
+    && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+    && echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - \
+    && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
+    && rm -f /tmp/apache-maven.tar.gz \
+    && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY settings-docker.xml /usr/share/maven/ref/
+
+# ADD KafkaProducer /
+
+# RUN cd /KafkaProducer
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+
+CMD ["mvn"]

KafkaProducer/pom.xml → api_gateway/KafkaProducer/pom.xml

@@ -70,7 +70,7 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-		</plugins>
+      	</plugins>
 	</build>
 
 </project>

KafkaProducer/src/main/java/com/example/demo/ApiGatewayResource.java → api_gateway/KafkaProducer/src/main/java/com/example/demo/ApiGatewayResource.java

@@ -43,7 +43,7 @@ public class ApiGatewayResource {
 	  @Autowired KafkaTemplate<String,SessionRequestTemplate> kafkaTemplateSession;
 
 
-	@CrossOrigin(origins = "http://localhost:3000", maxAge = 3600)
+	@CrossOrigin(origins = "http://ui:3000", maxAge = 3600)
 	@RequestMapping(value="/login", method = RequestMethod.POST, consumes = "application/json")
 	public String login(@RequestBody String message) throws InterruptedException {
 		//String message=user.getFirstName();
@@ -60,7 +60,7 @@ public String login(@RequestBody String message) throws InterruptedException {
 		return ack;
 	}
 
-	@CrossOrigin(origins = "http://localhost:3000", maxAge = 3600)
+	@CrossOrigin(origins = "http://ui:3000", maxAge = 3600)
 	@RequestMapping(value="/register", method = RequestMethod.POST, consumes = "application/json")
 	public String register(@RequestBody String message) throws InterruptedException {
 		kafkaTemplate.send(TOPIC_REGISTER_MESSAGE,message);
@@ -77,7 +77,7 @@ public String register(@RequestBody String message) throws InterruptedException
 
 
 
-	@CrossOrigin(origins = "http://localhost:3000", maxAge = 3600)
+	@CrossOrigin(origins = "http://ui:3000", maxAge = 3600)
 	@RequestMapping(value="/dataretrieval", method = RequestMethod.POST, consumes = "application/json")
 	public String dataRetrival(@RequestBody String message) throws InterruptedException {
 		kafkaTemplate.send(TOPIC_DATARETRIVE_MESSAGE,message);
@@ -94,7 +94,7 @@ public String dataRetrival(@RequestBody String message) throws InterruptedExcept
 	}
 
 
-	@CrossOrigin(origins = "http://localhost:3000", maxAge = 3600)
+	@CrossOrigin(origins = "http://ui:3000", maxAge = 3600)
 	@RequestMapping(value = "/sessionmgmt"/* , method = RequestMethod.POST, consumes = "application/json" */)
 	public String sessionManagement(/* @RequestBody String sessionDetails */)
 			throws InterruptedException, URISyntaxException, JSONException, ExecutionException {

KafkaProducer/src/main/java/com/example/demo/KafkaProducerConfiguration.java → api_gateway/KafkaProducer/src/main/java/com/example/demo/KafkaProducerConfiguration.java

@@ -29,7 +29,7 @@ public class KafkaProducerConfiguration {
 	public  ProducerFactory producerFactory(){
 
 		Map<String,Object> config= new HashMap<>();
-		config.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,"127.0.0.1:9092" );
+		config.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,"kafka:9092" );
 		config.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,JsonSerializer.class );
 		config.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,JsonSerializer.class );
 
@@ -54,7 +54,7 @@ public KafkaTemplate<String,String> kafkaTemplate(){
 	public ConsumerFactory<String, String> consumerFactory(){
 		Map<String,Object> config =new HashMap<>();
 
-		config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "127.0.0.1:9092");
+		config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "kafka:9092");
 		config.put(ConsumerConfig.GROUP_ID_CONFIG, "group_id");
 		config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
 		config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);

KafkaProducer/src/test/java/com/example/demo/KafkaProducerApplicationTests.java → api_gateway/KafkaProducer/src/test/java/com/example/demo/KafkaProducerApplicationTests.java

@@ -6,8 +6,8 @@
 @SpringBootTest
 class KafkaProducerApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
+//	@Test
+//	void contextLoads() {
+//	}
 
 }

data-retrieval/Dockerfile

@@ -1,9 +1,8 @@
 FROM python:3-onbuild
 
 ADD dataretrieval.py /
-RUN pip install --upgrade pip
+RUN pip3 install --upgrade pip
 ADD requirements.txt /
 RUN pip3 install -r requirements.txt
-RUN echo "RUN DONE"
 
 CMD [ "python3", "./dataretrieval.py" ]