Skip to content

Commit 88b8558

Browse files
committed
Corrected the controller mappings and the parent project of microservices.
1 parent 6b6e086 commit 88b8558

File tree

17 files changed

+144
-29
lines changed

17 files changed

+144
-29
lines changed

.gitignore

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/target/
2+
!.mvn/wrapper/maven-wrapper.jar
3+
4+
### STS ###
5+
.apt_generated
6+
.classpath
7+
.factorypath
8+
.project
9+
.settings
10+
.springBeans
11+
.sts4-cache
12+
13+
### IntelliJ IDEA ###
14+
.idea
15+
*.iws
16+
*.iml
17+
*.ipr
18+
19+
### NetBeans ###
20+
/nbproject/private/
21+
/nbbuild/
22+
/dist/
23+
/nbdist/
24+
/.nb-gradle/
25+
/build/

commons/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111

1212
<artifactId>commons</artifactId>
1313
<groupId>self.erp.commons</groupId>
14-
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.boot</groupId>
17+
<artifactId>spring-boot-starter-data-rest</artifactId>
18+
</dependency>
19+
</dependencies>
1520

1621
</project>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
package self.erp.commons;
22

33
public interface RestfulHelper {
4+
5+
int post(String url, Object o);
6+
47
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
package self.erp.commons;
22

3-
public class RestfulHelperImpl {
3+
import org.springframework.http.*;
4+
import org.springframework.stereotype.Service;
5+
import org.springframework.web.client.RestTemplate;
6+
7+
import java.util.Arrays;
8+
9+
@Service
10+
public class RestfulHelperImpl implements RestfulHelper {
11+
12+
private static final RestTemplate restTemplate = new RestTemplate();
13+
14+
@Override
15+
public int post(String url, Object o) {
16+
HttpHeaders headers = new HttpHeaders();
17+
headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
18+
HttpEntity<Object> entity = new HttpEntity<Object>(o, headers);
19+
ResponseEntity<Object> responseEntity = restTemplate.exchange(url, HttpMethod.POST, entity, Object.class);
20+
return responseEntity.getStatusCode().value();
21+
}
422
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
spring.main.web-application-type=none

communicationservice/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,22 @@
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>communicationservice</artifactId>
13+
<groupId>self.erp.communicationservice</groupId>
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.boot</groupId>
17+
<artifactId>spring-boot-starter-web</artifactId>
18+
</dependency>
1319

20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-starter-data-jpa</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>mysql</groupId>
26+
<artifactId>mysql-connector-java</artifactId>
27+
</dependency>
28+
29+
</dependencies>
1430

1531
</project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package self.erp.communicationservice.controller;
2+
3+
import org.springframework.web.bind.annotation.RequestMapping;
4+
import org.springframework.web.bind.annotation.RequestMethod;
5+
import org.springframework.web.bind.annotation.RestController;
6+
7+
@RestController
8+
@RequestMapping(value = "/communication")
9+
public class CommunicationServiceController {
10+
11+
@RequestMapping(value = "/communicate", method = RequestMethod.GET)
12+
public String communicate() {
13+
return "hello from communication service module controller";
14+
}
15+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
3+
spring.datasource.url=jdbc:mysql://localhost:3306/ERP
4+
spring.datasource.username=root
5+
spring.datasource.password=mib
6+
7+
spring.jpa.show-sql=true

erpapplication/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
<artifactId>visitorservice</artifactId>
1818
<version>0.0.1-SNAPSHOT</version>
1919
</dependency>
20+
<dependency>
21+
<groupId>self.erp.communicationservice</groupId>
22+
<artifactId>communicationservice</artifactId>
23+
<version>0.0.1-SNAPSHOT</version>
24+
</dependency>
2025
</dependencies>
2126
<build>
2227
<plugins>

erpapplication/src/main/java/self/erp/erpapplication/ErpApplication.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.autoconfigure.domain.EntityScan;
6-
import org.springframework.context.annotation.ComponentScan;
76
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
87

98
/**
10-
* This is the main spring boot application of erp.
11-
* It scans all the controllers , models and repositories for the spring application context
12-
* Just run this as a simple jar
9+
* This is the main spring boot application of erp. It scans all the controllers , models and repositories for the
10+
* spring application context Just run this as a simple jar
1311
*/
14-
@ComponentScan(basePackages = "self.erp.visitorservice")
1512
@EnableJpaRepositories(basePackages = { "self.erp.visitorservice.repositories" })
1613
@EntityScan(basePackages = { "self.erp.visitorservice.repositories" })
17-
@SpringBootApplication
14+
@SpringBootApplication(scanBasePackages = { "self.erp.visitorservice.controller",
15+
"self.erp.communicationservice.controller" })
1816
public class ErpApplication {
1917
public static void main(String[] args) {
2018
SpringApplication.run(ErpApplication.class, args);
19+
2120
}
2221
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
server.servlet.context-path = /erp
2+
server.port=8880
3+
4+
5+
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
6+
spring.datasource.url=jdbc:mysql://localhost:3306/ERP
7+
spring.datasource.username=root
8+
spring.datasource.password=mib
9+
10+
spring.jpa.show-sql=true

pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@
2222

2323
<!-- spring boot dependencies -->
2424
<dependencies>
25-
<dependency>
26-
<groupId>org.springframework.boot</groupId>
27-
<artifactId>spring-boot-starter-data-rest</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.springframework.boot</groupId>
31-
<artifactId>spring-boot-starter-web</artifactId>
32-
</dependency>
3325

3426
<dependency>
3527
<groupId>org.springframework.boot</groupId>
@@ -48,14 +40,6 @@
4840
<artifactId>commons-io</artifactId>
4941
<version>2.6</version>
5042
</dependency>
51-
<dependency>
52-
<groupId>org.springframework.boot</groupId>
53-
<artifactId>spring-boot-starter-data-jpa</artifactId>
54-
</dependency>
55-
<dependency>
56-
<groupId>mysql</groupId>
57-
<artifactId>mysql-connector-java</artifactId>
58-
</dependency>
5943

6044
</dependencies>
6145

ui/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,11 @@
1818
<artifactId>visitorservice</artifactId>
1919
<version>0.0.1-SNAPSHOT</version>
2020
</dependency>
21+
22+
<dependency>
23+
<groupId>self.erp.commons</groupId>
24+
<artifactId>commons</artifactId>
25+
<version>0.0.1-SNAPSHOT</version>
26+
</dependency>
2127
</dependencies>
2228
</project>

visitorservice/pom.xml

+14-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,18 @@
1111

1212
<artifactId>visitorservice</artifactId>
1313
<groupId>self.erp.visitorservice</groupId>
14-
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.boot</groupId>
17+
<artifactId>spring-boot-starter-data-jpa</artifactId>
18+
</dependency>
19+
<dependency>
20+
<groupId>mysql</groupId>
21+
<artifactId>mysql-connector-java</artifactId>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.springframework.boot</groupId>
25+
<artifactId>spring-boot-starter-web</artifactId>
26+
</dependency>
27+
</dependencies>
1528
</project>

visitorservice/src/main/java/self/erp/visitorservice/controller/VisitController.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
import java.util.logging.Level;
1414
import java.util.logging.Logger;
1515

16-
@RestController(value = "/erp/visits")
16+
@RestController
17+
@RequestMapping(value = "/visit")
1718
public class VisitController {
1819

1920
private static final Logger LOGGER = Logger.getLogger("VisitController");

visitorservice/src/main/java/self/erp/visitorservice/repositories/Visit.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import java.time.LocalDateTime;
77

88
@Entity
9-
@Table(name = "Schema_Visitor")
9+
@Table(name = "Schema_Visitors")
1010
public class Visit {
1111

1212
@Id
13-
@GeneratedValue
13+
@GeneratedValue(strategy = GenerationType.AUTO)
1414
@Column(name = "VISIT_ID")
1515
private int visitId;
1616

@@ -42,6 +42,10 @@ public Visit(String visitorName, LocalDateTime fromDate, LocalDateTime endDate,
4242
this.visitPurposeStatusType = visitPurposeStatusType;
4343
}
4444

45+
public Visit() {
46+
47+
}
48+
4549
public int getVisitId() {
4650
return visitId;
4751
}

visitorservice/src/main/resources/application.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ spring.datasource.url=jdbc:mysql://localhost:3306/ERP
33
spring.datasource.username=root
44
spring.datasource.password=mib
55

6-
spring.jpa.show-sql=true
6+
spring.jpa.show-sql=true
7+
8+
server.port=8881
9+

0 commit comments

Comments
 (0)