Browse Source

new changes

placidenduwayo 1 year ago
parent
commit
88eb871d9e
56 changed files with 240 additions and 108 deletions
  1. 8
    0
      spring-project-back/.idea/.gitignore
  2. 30
    0
      spring-project-back/.idea/compiler.xml
  3. 19
    0
      spring-project-back/.idea/encodings.xml
  4. 25
    0
      spring-project-back/.idea/jarRepositories.xml
  5. 20
    0
      spring-project-back/.idea/misc.xml
  6. 8
    0
      spring-project-back/.idea/modules.xml
  7. 3
    0
      spring-project-back/.idea/sonarlint/issuestore/0/1/012e3ed6d807ba6306270c835cba398bf839a3aa
  8. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/2/3/23a69fde0a62bb6f06d73dcc35c7ae038cb96074
  9. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/3/3/3301bb636cfc2f5923ca64ad37a03815a50991fd
  10. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/4/5/45bad8b479a90130e9cf28a827465bd64fb08e0b
  11. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/8/9/89e3eb88892b074fad6deff2a7257bb5e64c60a9
  12. 5
    0
      spring-project-back/.idea/sonarlint/issuestore/9/2/92c7ff832bd61de22c442d7404b52e12f81c9879
  13. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/d/3/d3b958b3db01482b1e76b238443b8cb266371152
  14. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/e/0/e0c37c7b3c9d0817ed756168942f58be0e7178c5
  15. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/e/4/e49febaef22aa6217783f6f1f6e0a65c7bde7cf0
  16. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/e/4/e4dbb285d341866feb96b861d5e8b341c1aea25a
  17. 0
    0
      spring-project-back/.idea/sonarlint/issuestore/f/9/f97726be9c8fddea360a7e9574d702ebee5ca065
  18. 23
    0
      spring-project-back/.idea/sonarlint/issuestore/index.pb
  19. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/0/1/012e3ed6d807ba6306270c835cba398bf839a3aa
  20. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/2/3/23a69fde0a62bb6f06d73dcc35c7ae038cb96074
  21. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/3/3/3301bb636cfc2f5923ca64ad37a03815a50991fd
  22. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/4/5/45bad8b479a90130e9cf28a827465bd64fb08e0b
  23. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/8/9/89e3eb88892b074fad6deff2a7257bb5e64c60a9
  24. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/9/2/92c7ff832bd61de22c442d7404b52e12f81c9879
  25. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/d/3/d3b958b3db01482b1e76b238443b8cb266371152
  26. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/e/0/e0c37c7b3c9d0817ed756168942f58be0e7178c5
  27. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/e/4/e49febaef22aa6217783f6f1f6e0a65c7bde7cf0
  28. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/e/4/e4dbb285d341866feb96b861d5e8b341c1aea25a
  29. 0
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/f/9/f97726be9c8fddea360a7e9574d702ebee5ca065
  30. 23
    0
      spring-project-back/.idea/sonarlint/securityhotspotstore/index.pb
  31. 9
    0
      spring-project-back/.idea/spring-project-back.iml
  32. 6
    0
      spring-project-back/.idea/vcs.xml
  33. 2
    2
      spring-project-back/backend-frontend-gateway-service/src/main/resources/bootstrap.yml
  34. 0
    28
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/entity/Address.java
  35. 1
    1
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressAlreadyExistsException.java
  36. 1
    1
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressFieldsEmptyException.java
  37. 1
    1
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressNumInvalidException.java
  38. 1
    1
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressPBInvalidException.java
  39. 3
    3
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/usecase/AddressInputServiceImpl.java
  40. 4
    14
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/usecase/AddressValidation.java
  41. 14
    16
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/input/controller/AddressController.java
  42. 2
    3
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/input/feignclient/service/EmployeeService.java
  43. 1
    1
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/output/address_mapper/AddressMapper.java
  44. 3
    3
      spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/output/service/AddressOutputServiceImpl.java
  45. 2
    2
      spring-project-back/clean-archi-business-service-address/src/main/resources/bootstrap.yml
  46. 6
    6
      spring-project-back/clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/domain/usecase/CompanyInputServiceImpl.java
  47. 2
    3
      spring-project-back/clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/infrastructure/ports/input/feignclient/service/ProjectService.java
  48. 2
    3
      spring-project-back/clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/infrastructure/ports/output/service/CompanyOutputServiceImpl.java
  49. 2
    2
      spring-project-back/clean-archi-business-service-company/src/main/resources/bootstrap.yml
  50. 2
    3
      spring-project-back/clean-archi-business-service-employee/src/main/java/fr/natan/cleanarchitectureemployeesservice/infrastructure/ports/input/feignclient/services/AddressServiceProxy.java
  51. 2
    3
      spring-project-back/clean-archi-business-service-employee/src/main/java/fr/natan/cleanarchitectureemployeesservice/infrastructure/ports/input/feignclient/services/ProjectService.java
  52. 2
    2
      spring-project-back/clean-archi-business-service-employee/src/main/resources/bootstrap.yml
  53. 2
    3
      spring-project-back/clean-archi-business-service-project/src/main/java/fr/natan/cleanarchitectureprojectservice/infranstructure/ports/input/feignclients/services/CompanyServiceProxy.java
  54. 2
    3
      spring-project-back/clean-archi-business-service-project/src/main/java/fr/natan/cleanarchitectureprojectservice/infranstructure/ports/input/feignclients/services/EmployeeServiceProxy.java
  55. 2
    2
      spring-project-back/clean-archi-business-service-project/src/main/resources/bootstrap.yml
  56. 2
    2
      spring-project-back/microservices-registration-service/src/main/resources/bootstrap.yml

+ 8
- 0
spring-project-back/.idea/.gitignore View File

1
+# Default ignored files
2
+/shelf/
3
+/workspace.xml
4
+# Editor-based HTTP Client requests
5
+/httpRequests/
6
+# Datasource local storage ignored files
7
+/dataSources/
8
+/dataSources.local.xml

+ 30
- 0
spring-project-back/.idea/compiler.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="CompilerConfiguration">
4
+    <annotationProcessing>
5
+      <profile name="Maven default annotation processors profile" enabled="true">
6
+        <sourceOutputDir name="target/generated-sources/annotations" />
7
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8
+        <outputRelativeToContentRoot value="true" />
9
+        <module name="clean-archi-business-service-company" />
10
+        <module name="microservices-registration-service" />
11
+        <module name="clean-archi-business-service-employee" />
12
+        <module name="clean-archi-business-service-address" />
13
+        <module name="microservices-config-service" />
14
+        <module name="backend-frontend-gateway-service" />
15
+        <module name="clean-archi-business-service-project" />
16
+      </profile>
17
+    </annotationProcessing>
18
+  </component>
19
+  <component name="JavacSettings">
20
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
21
+      <module name="backend-frontend-gateway-service" options="-parameters" />
22
+      <module name="clean-archi-business-service-address" options="-parameters" />
23
+      <module name="clean-archi-business-service-company" options="-parameters" />
24
+      <module name="clean-archi-business-service-employee" options="-parameters" />
25
+      <module name="clean-archi-business-service-project" options="-parameters" />
26
+      <module name="microservices-config-service" options="-parameters" />
27
+      <module name="microservices-registration-service" options="-parameters" />
28
+    </option>
29
+  </component>
30
+</project>

+ 19
- 0
spring-project-back/.idea/encodings.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="Encoding">
4
+    <file url="file://$PROJECT_DIR$/backend-frontend-gateway-service/src/main/java" charset="UTF-8" />
5
+    <file url="file://$PROJECT_DIR$/backend-frontend-gateway-service/src/main/resources" charset="UTF-8" />
6
+    <file url="file://$PROJECT_DIR$/clean-archi-business-service-address/src/main/java" charset="UTF-8" />
7
+    <file url="file://$PROJECT_DIR$/clean-archi-business-service-address/src/main/resources" charset="UTF-8" />
8
+    <file url="file://$PROJECT_DIR$/clean-archi-business-service-company/src/main/java" charset="UTF-8" />
9
+    <file url="file://$PROJECT_DIR$/clean-archi-business-service-company/src/main/resources" charset="UTF-8" />
10
+    <file url="file://$PROJECT_DIR$/clean-archi-business-service-employee/src/main/java" charset="UTF-8" />
11
+    <file url="file://$PROJECT_DIR$/clean-archi-business-service-employee/src/main/resources" charset="UTF-8" />
12
+    <file url="file://$PROJECT_DIR$/clean-archi-business-service-project/src/main/java" charset="UTF-8" />
13
+    <file url="file://$PROJECT_DIR$/clean-archi-business-service-project/src/main/resources" charset="UTF-8" />
14
+    <file url="file://$PROJECT_DIR$/microservices-config-service/src/main/java" charset="UTF-8" />
15
+    <file url="file://$PROJECT_DIR$/microservices-config-service/src/main/resources" charset="UTF-8" />
16
+    <file url="file://$PROJECT_DIR$/microservices-registration-service/src/main/java" charset="UTF-8" />
17
+    <file url="file://$PROJECT_DIR$/microservices-registration-service/src/main/resources" charset="UTF-8" />
18
+  </component>
19
+</project>

+ 25
- 0
spring-project-back/.idea/jarRepositories.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="RemoteRepositoriesConfiguration">
4
+    <remote-repository>
5
+      <option name="id" value="central" />
6
+      <option name="name" value="Central Repository" />
7
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
8
+    </remote-repository>
9
+    <remote-repository>
10
+      <option name="id" value="central" />
11
+      <option name="name" value="Maven Central repository" />
12
+      <option name="url" value="https://repo1.maven.org/maven2" />
13
+    </remote-repository>
14
+    <remote-repository>
15
+      <option name="id" value="jboss.community" />
16
+      <option name="name" value="JBoss Community repository" />
17
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
18
+    </remote-repository>
19
+    <remote-repository>
20
+      <option name="id" value="netflix-candidates" />
21
+      <option name="name" value="Netflix Candidates" />
22
+      <option name="url" value="https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates" />
23
+    </remote-repository>
24
+  </component>
25
+</project>

+ 20
- 0
spring-project-back/.idea/misc.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
4
+  <component name="MavenProjectsManager">
5
+    <option name="originalFiles">
6
+      <list>
7
+        <option value="$PROJECT_DIR$/microservices-config-service/pom.xml" />
8
+        <option value="$PROJECT_DIR$/backend-frontend-gateway-service/pom.xml" />
9
+        <option value="$PROJECT_DIR$/microservices-registration-service/pom.xml" />
10
+        <option value="$PROJECT_DIR$/clean-archi-business-service-address/pom.xml" />
11
+        <option value="$PROJECT_DIR$/clean-archi-business-service-company/pom.xml" />
12
+        <option value="$PROJECT_DIR$/clean-archi-business-service-project/pom.xml" />
13
+        <option value="$PROJECT_DIR$/clean-archi-business-service-employee/pom.xml" />
14
+      </list>
15
+    </option>
16
+  </component>
17
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
18
+    <output url="file://$PROJECT_DIR$/out" />
19
+  </component>
20
+</project>

+ 8
- 0
spring-project-back/.idea/modules.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectModuleManager">
4
+    <modules>
5
+      <module fileurl="file://$PROJECT_DIR$/.idea/spring-project-back.iml" filepath="$PROJECT_DIR$/.idea/spring-project-back.iml" />
6
+    </modules>
7
+  </component>
8
+</project>

+ 3
- 0
spring-project-back/.idea/sonarlint/issuestore/0/1/012e3ed6d807ba6306270c835cba398bf839a3aa View File

1
+
2
+k
3
+java:S3655c"NCall "company.isPresent()" or "!company.isEmpty()" before accessing the value.(µÑ�µ8°¹Ó�ù0

+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/2/3/23a69fde0a62bb6f06d73dcc35c7ae038cb96074 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/3/3/3301bb636cfc2f5923ca64ad37a03815a50991fd View File


+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/4/5/45bad8b479a90130e9cf28a827465bd64fb08e0b View File


+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/8/9/89e3eb88892b074fad6deff2a7257bb5e64c60a9 View File


+ 5
- 0
spring-project-back/.idea/sonarlint/issuestore/9/2/92c7ff832bd61de22c442d7404b52e12f81c9879 View File

1
+
2
+U
3
+java:S1118":Add a private constructor to hide the implicit public one.(«�¶›ÿÿÿÿÿ
4
+W
5
+java:S1126	"AReplace this if-then-else statement by a single return statement.(¼òÆÛ

+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/d/3/d3b958b3db01482b1e76b238443b8cb266371152 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/e/0/e0c37c7b3c9d0817ed756168942f58be0e7178c5 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/e/4/e49febaef22aa6217783f6f1f6e0a65c7bde7cf0 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/e/4/e4dbb285d341866feb96b861d5e8b341c1aea25a View File


+ 0
- 0
spring-project-back/.idea/sonarlint/issuestore/f/9/f97726be9c8fddea360a7e9574d702ebee5ca065 View File


+ 23
- 0
spring-project-back/.idea/sonarlint/issuestore/index.pb View File

1
+
2
+²
3
+�clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/domain/usecase/CompanyValidation.java,9/2/92c7ff832bd61de22c442d7404b52e12f81c9879
4
+¸
5
+‡clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/domain/usecase/CompanyInputServiceImpl.java,0/1/012e3ed6d807ba6306270c835cba398bf839a3aa
6
+²
7
+�clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/usecase/AddressValidation.java,f/9/f97726be9c8fddea360a7e9574d702ebee5ca065
8
+Á
9
+�clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressAlreadyExistsException.java,e/4/e49febaef22aa6217783f6f1f6e0a65c7bde7cf0
10
+Å
11
+”clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressAssignedEmployeesException.java,2/3/23a69fde0a62bb6f06d73dcc35c7ae038cb96074
12
+¿
13
+Žclean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressFieldsEmptyException.java,3/3/3301bb636cfc2f5923ca64ad37a03815a50991fd
14
+¼
15
+‹clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressNotFoundException.java,d/3/d3b958b3db01482b1e76b238443b8cb266371152
16
+¾
17
+�clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressNumInvalidException.java,e/4/e4dbb285d341866feb96b861d5e8b341c1aea25a
18
+½
19
+Œclean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressPBInvalidException.java,8/9/89e3eb88892b074fad6deff2a7257bb5e64c60a9
20
+¹
21
+ˆclean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/ExceptionsWarnMessage.java,e/0/e0c37c7b3c9d0817ed756168942f58be0e7178c5
22
+Ê
23
+™clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/output/address_mapper/AddressMapper.java,4/5/45bad8b479a90130e9cf28a827465bd64fb08e0b

+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/0/1/012e3ed6d807ba6306270c835cba398bf839a3aa View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/2/3/23a69fde0a62bb6f06d73dcc35c7ae038cb96074 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/3/3/3301bb636cfc2f5923ca64ad37a03815a50991fd View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/4/5/45bad8b479a90130e9cf28a827465bd64fb08e0b View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/8/9/89e3eb88892b074fad6deff2a7257bb5e64c60a9 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/9/2/92c7ff832bd61de22c442d7404b52e12f81c9879 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/d/3/d3b958b3db01482b1e76b238443b8cb266371152 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/e/0/e0c37c7b3c9d0817ed756168942f58be0e7178c5 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/e/4/e49febaef22aa6217783f6f1f6e0a65c7bde7cf0 View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/e/4/e4dbb285d341866feb96b861d5e8b341c1aea25a View File


+ 0
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/f/9/f97726be9c8fddea360a7e9574d702ebee5ca065 View File


+ 23
- 0
spring-project-back/.idea/sonarlint/securityhotspotstore/index.pb View File

1
+
2
+²
3
+�clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/domain/usecase/CompanyValidation.java,9/2/92c7ff832bd61de22c442d7404b52e12f81c9879
4
+¸
5
+‡clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/domain/usecase/CompanyInputServiceImpl.java,0/1/012e3ed6d807ba6306270c835cba398bf839a3aa
6
+²
7
+�clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/usecase/AddressValidation.java,f/9/f97726be9c8fddea360a7e9574d702ebee5ca065
8
+Á
9
+�clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressAlreadyExistsException.java,e/4/e49febaef22aa6217783f6f1f6e0a65c7bde7cf0
10
+Å
11
+”clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressAssignedEmployeesException.java,2/3/23a69fde0a62bb6f06d73dcc35c7ae038cb96074
12
+¿
13
+Žclean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressFieldsEmptyException.java,3/3/3301bb636cfc2f5923ca64ad37a03815a50991fd
14
+¼
15
+‹clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressNotFoundException.java,d/3/d3b958b3db01482b1e76b238443b8cb266371152
16
+¾
17
+�clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressNumInvalidException.java,e/4/e4dbb285d341866feb96b861d5e8b341c1aea25a
18
+½
19
+Œclean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressPBInvalidException.java,8/9/89e3eb88892b074fad6deff2a7257bb5e64c60a9
20
+¹
21
+ˆclean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/ExceptionsWarnMessage.java,e/0/e0c37c7b3c9d0817ed756168942f58be0e7178c5
22
+Ê
23
+™clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/output/address_mapper/AddressMapper.java,4/5/45bad8b479a90130e9cf28a827465bd64fb08e0b

+ 9
- 0
spring-project-back/.idea/spring-project-back.iml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
4
+    <exclude-output />
5
+    <content url="file://$MODULE_DIR$" />
6
+    <orderEntry type="inheritedJdk" />
7
+    <orderEntry type="sourceFolder" forTests="false" />
8
+  </component>
9
+</module>

+ 6
- 0
spring-project-back/.idea/vcs.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
5
+  </component>
6
+</project>

+ 2
- 2
spring-project-back/backend-frontend-gateway-service/src/main/resources/bootstrap.yml View File

5
     name: backend-frontend-gateway-service
5
     name: backend-frontend-gateway-service
6
   cloud:
6
   cloud:
7
     config:
7
     config:
8
-#      uri: http://localhost:8280
9
-      uri: http://microservices-config-service:8280
8
+      uri: http://localhost:8280
9
+#      uri: http://microservices-config-service:8280

+ 0
- 28
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/entity/Address.java View File

8
     private String city;
8
     private String city;
9
     private String country;
9
     private String country;
10
 
10
 
11
-    public Address(Long id, int num, String street, int pb, String city, String country) {
12
-        this.addressID = id;
13
-        this.num = num;
14
-        this.street = street;
15
-        this.pb = pb;
16
-        this.city = city;
17
-        this.country = country;
18
-    }
19
-
20
     public Address() {
11
     public Address() {
21
     }
12
     }
22
 
13
 
48
         this.addressID = addressID;
39
         this.addressID = addressID;
49
     }
40
     }
50
 
41
 
51
-    public void setNum(int num) {
52
-        this.num = num;
53
-    }
54
-
55
-    public void setStreet(String street) {
56
-        this.street = street;
57
-    }
58
-
59
-    public void setPb(int pb) {
60
-        this.pb = pb;
61
-    }
62
-
63
-    public void setCity(String city) {
64
-        this.city = city;
65
-    }
66
-
67
-    public void setCountry(String country) {
68
-        this.country = country;
69
-    }
70
 }
42
 }

+ 1
- 1
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressAlreadyExistsException.java View File

1
 package fr.natan.cleanarchitectureaddressservice.domain.exceptions;
1
 package fr.natan.cleanarchitectureaddressservice.domain.exceptions;
2
 
2
 
3
-public class AddressAlreadyExistsException extends Exception {
3
+public class AddressAlreadyExistsException extends IllegalArgumentException {
4
 }
4
 }

+ 1
- 1
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressFieldsEmptyException.java View File

1
 package fr.natan.cleanarchitectureaddressservice.domain.exceptions;
1
 package fr.natan.cleanarchitectureaddressservice.domain.exceptions;
2
 
2
 
3
-public class AddressFieldsEmptyException extends Exception {
3
+public class AddressFieldsEmptyException extends IllegalArgumentException {
4
 }
4
 }

+ 1
- 1
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressNumInvalidException.java View File

1
 package fr.natan.cleanarchitectureaddressservice.domain.exceptions;
1
 package fr.natan.cleanarchitectureaddressservice.domain.exceptions;
2
 
2
 
3
-public class AddressNumInvalidException extends Exception {
3
+public class AddressNumInvalidException extends IllegalArgumentException {
4
 }
4
 }

+ 1
- 1
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/exceptions/AddressPBInvalidException.java View File

1
 package fr.natan.cleanarchitectureaddressservice.domain.exceptions;
1
 package fr.natan.cleanarchitectureaddressservice.domain.exceptions;
2
 
2
 
3
-public class AddressPBInvalidException extends Exception {
3
+public class AddressPBInvalidException extends IllegalArgumentException {
4
 }
4
 }

+ 3
- 3
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/usecase/AddressInputServiceImpl.java View File

36
         } else if (!AddressValidation.isValidPb(addressDto.getPb())) {
36
         } else if (!AddressValidation.isValidPb(addressDto.getPb())) {
37
             throw new AddressPBInvalidException();
37
             throw new AddressPBInvalidException();
38
         }
38
         }
39
-        if (getAddressByInfo(addressDto).size() > 0) {
39
+        if (!getAddressByInfo(addressDto).isEmpty()) {
40
             throw new AddressAlreadyExistsException();
40
             throw new AddressAlreadyExistsException();
41
         }
41
         }
42
 
42
 
54
     public void deleteAddress(Long addressID) throws AddressNotFoundException, AddressAssignedEmployeesException {
54
     public void deleteAddress(Long addressID) throws AddressNotFoundException, AddressAssignedEmployeesException {
55
         Optional<Address> address = getAddressByID(addressID);
55
         Optional<Address> address = getAddressByID(addressID);
56
         List<EmployeeModel> employees = getEmployeesLivingAtAddressThis(address.get().getAddressID());
56
         List<EmployeeModel> employees = getEmployeesLivingAtAddressThis(address.get().getAddressID());
57
-        if(employees.size()>0){
57
+        if(!employees.isEmpty()){
58
             throw new AddressAssignedEmployeesException();
58
             throw new AddressAssignedEmployeesException();
59
         }
59
         }
60
         addressOutputService.deleteAddress(addressID);
60
         addressOutputService.deleteAddress(addressID);
80
         } else if (!AddressValidation.areValidAddressTextFields(addressDto)) {
80
         } else if (!AddressValidation.areValidAddressTextFields(addressDto)) {
81
             throw new AddressFieldsEmptyException();
81
             throw new AddressFieldsEmptyException();
82
         }
82
         }
83
-        if(getAddressByInfo(addressDto).size()>0){
83
+        if(!getAddressByInfo(addressDto).isEmpty()){
84
             throw new AddressAlreadyExistsException();
84
             throw new AddressAlreadyExistsException();
85
         }
85
         }
86
         Address address = AddressMapper.mapDtoToClass(addressDto);
86
         Address address = AddressMapper.mapDtoToClass(addressDto);

+ 4
- 14
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/domain/usecase/AddressValidation.java View File

4
 
4
 
5
 @SuppressWarnings("ALL")
5
 @SuppressWarnings("ALL")
6
 public class AddressValidation {
6
 public class AddressValidation {
7
+    private AddressValidation() {}
7
 
8
 
8
     public static boolean areValidAddressTextFields(AddressDto addressDto){
9
     public static boolean areValidAddressTextFields(AddressDto addressDto){
9
-        if(addressDto.getStreet().isBlank()
10
-                || addressDto.getCity().isBlank()
11
-                || addressDto.getCountry().isBlank()){
12
-            return false;
13
-        }
14
-        return true;
10
+        return !addressDto.getStreet().isBlank() && !addressDto.getCity().isBlank() && !addressDto.getCountry().isBlank();
15
     }
11
     }
16
 
12
 
17
     public static boolean isValidNum(int num){
13
     public static boolean isValidNum(int num){
18
-        if(num<=0){
19
-            return false;
20
-        }
21
-        return true;
14
+        return num>0;
22
     }
15
     }
23
 
16
 
24
     public static boolean isValidPb(int pb){
17
     public static boolean isValidPb(int pb){
25
-        if(pb<=10000){
26
-            return false;
27
-        }
28
-        return true;
18
+        return pb>10000;
29
     }
19
     }
30
 
20
 
31
     public static void addressFormatter(AddressDto addressDto){
21
     public static void addressFormatter(AddressDto addressDto){

+ 14
- 16
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/input/controller/AddressController.java View File

4
 import fr.natan.cleanarchitectureaddressservice.domain.exceptions.*;
4
 import fr.natan.cleanarchitectureaddressservice.domain.exceptions.*;
5
 import fr.natan.cleanarchitectureaddressservice.domain.ports.input.AddressInputService;
5
 import fr.natan.cleanarchitectureaddressservice.domain.ports.input.AddressInputService;
6
 import fr.natan.cleanarchitectureaddressservice.infrastructure.ports.input.feignclient.entity.model.EmployeeModel;
6
 import fr.natan.cleanarchitectureaddressservice.infrastructure.ports.input.feignclient.entity.model.EmployeeModel;
7
-import fr.natan.cleanarchitectureaddressservice.infrastructure.ports.input.feignclient.service.EmployeeService;
8
 import fr.natan.cleanarchitectureaddressservice.infrastructure.ports.output.address_models.AddressDto;
7
 import fr.natan.cleanarchitectureaddressservice.infrastructure.ports.output.address_models.AddressDto;
9
 import org.springframework.web.bind.annotation.*;
8
 import org.springframework.web.bind.annotation.*;
10
 
9
 
14
 @RestController
13
 @RestController
15
 public class
14
 public class
16
 AddressController {
15
 AddressController {
16
+    //dependencies injection
17
     private final AddressInputService addressInputService;
17
     private final AddressInputService addressInputService;
18
-    private final EmployeeService employeeService;
19
 
18
 
20
-    public AddressController(AddressInputService addressInputService, EmployeeService employeeService) {
19
+    public AddressController(AddressInputService addressInputService) {
21
         this.addressInputService = addressInputService;
20
         this.addressInputService = addressInputService;
22
-        this.employeeService = employeeService;
23
     }
21
     }
24
 
22
 
25
-    @RequestMapping(value = "/addresses", method = RequestMethod.GET)
26
-    private List<Address> getAllAddresses(){
23
+    @GetMapping(value = "/addresses")
24
+    public List<Address> getAllAddresses(){
27
         return addressInputService.getAllAddresses();
25
         return addressInputService.getAllAddresses();
28
     }
26
     }
29
 
27
 
30
-    @RequestMapping(value = "/addresses", method = RequestMethod.POST)
31
-    private Address createAddress(@RequestBody AddressDto addressDto) throws AddressFieldsEmptyException, AddressAlreadyExistsException, AddressPBInvalidException, AddressNumInvalidException {
28
+    @PostMapping(value = "/addresses")
29
+    public Address createAddress(@RequestBody AddressDto addressDto) throws AddressFieldsEmptyException, AddressAlreadyExistsException, AddressPBInvalidException, AddressNumInvalidException {
32
         return addressInputService.createAddress(addressDto);
30
         return addressInputService.createAddress(addressDto);
33
     }
31
     }
34
 
32
 
35
-    @RequestMapping(value = "/addresses/{addressID}", method = RequestMethod.DELETE)
36
-    private void deleteAddress(@PathVariable(name = "addressID") Long addressID) throws AddressNotFoundException, AddressAssignedEmployeesException {
33
+    @DeleteMapping(value = "/addresses/{addressID}")
34
+    public void deleteAddress(@PathVariable(name = "addressID") Long addressID) throws AddressNotFoundException, AddressAssignedEmployeesException {
37
         addressInputService.deleteAddress(addressID);
35
         addressInputService.deleteAddress(addressID);
38
     }
36
     }
39
 
37
 
40
-    @RequestMapping(value = "/addresses/{addressID}", method = RequestMethod.PUT)
41
-    private Address updateAddress(@PathVariable(name = "addressID") Long addressID, @RequestBody AddressDto addressDto)
38
+    @PutMapping(value = "/addresses/{addressID}")
39
+    public Address updateAddress(@PathVariable(name = "addressID") Long addressID, @RequestBody AddressDto addressDto)
42
             throws AddressFieldsEmptyException, AddressNotFoundException, AddressPBInvalidException, AddressNumInvalidException,
40
             throws AddressFieldsEmptyException, AddressNotFoundException, AddressPBInvalidException, AddressNumInvalidException,
43
             AddressAlreadyExistsException {
41
             AddressAlreadyExistsException {
44
         return addressInputService.updateAddress(addressID, addressDto);
42
         return addressInputService.updateAddress(addressID, addressDto);
45
     }
43
     }
46
 
44
 
47
-    @RequestMapping(value = "/addresses/{addressID}", method = RequestMethod.GET)
48
-    private Optional<Address> getAddress(@PathVariable(name = "addressID") Long addressID) throws AddressNotFoundException {
45
+    @GetMapping(value = "/addresses/{addressID}")
46
+    public Optional<Address> getAddress(@PathVariable(name = "addressID") Long addressID) throws AddressNotFoundException {
49
         return addressInputService.getAddressByID(addressID);
47
         return addressInputService.getAddressByID(addressID);
50
     }
48
     }
51
-    @RequestMapping(value = "/employees/addresses/{addressID}", method = RequestMethod.GET)
52
-    private  List<EmployeeModel> employeesAtAddressThis(@PathVariable(name = "addressID") Long addressID) throws AddressNotFoundException {
49
+    @GetMapping(value = "/employees/addresses/{addressID}")
50
+    public   List<EmployeeModel> employeesAtAddressThis(@PathVariable(name = "addressID") Long addressID) throws AddressNotFoundException {
53
         return addressInputService.getEmployeesLivingAtAddressThis(addressID);
51
         return addressInputService.getEmployeesLivingAtAddressThis(addressID);
54
     }
52
     }
55
 }
53
 }

+ 2
- 3
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/input/feignclient/service/EmployeeService.java View File

2
 
2
 
3
 import fr.natan.cleanarchitectureaddressservice.infrastructure.ports.input.feignclient.entity.model.EmployeeModel;
3
 import fr.natan.cleanarchitectureaddressservice.infrastructure.ports.input.feignclient.entity.model.EmployeeModel;
4
 import org.springframework.cloud.openfeign.FeignClient;
4
 import org.springframework.cloud.openfeign.FeignClient;
5
+import org.springframework.web.bind.annotation.GetMapping;
5
 import org.springframework.web.bind.annotation.PathVariable;
6
 import org.springframework.web.bind.annotation.PathVariable;
6
-import org.springframework.web.bind.annotation.RequestMapping;
7
-import org.springframework.web.bind.annotation.RequestMethod;
8
 
7
 
9
 import java.util.List;
8
 import java.util.List;
10
 
9
 
11
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-EMPLOYEE")
10
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-EMPLOYEE")
12
 public interface EmployeeService {
11
 public interface EmployeeService {
13
-    @RequestMapping(value = "/employees/addresses/{addressID}", method = RequestMethod.GET)
12
+    @GetMapping(value = "/employees/addresses/{addressID}")
14
     List<EmployeeModel> getEmployeesLivingAtGivenAddress(@PathVariable(name = "addressID") Long addressID);
13
     List<EmployeeModel> getEmployeesLivingAtGivenAddress(@PathVariable(name = "addressID") Long addressID);
15
 }
14
 }

+ 1
- 1
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/output/address_mapper/AddressMapper.java View File

6
 import org.springframework.beans.BeanUtils;
6
 import org.springframework.beans.BeanUtils;
7
 
7
 
8
 public class AddressMapper {
8
 public class AddressMapper {
9
+    private AddressMapper(){}
9
 
10
 
10
     public static AddressModel mapClassToModel(Address address){
11
     public static AddressModel mapClassToModel(Address address){
11
         AddressModel addressModel = new AddressModel();
12
         AddressModel addressModel = new AddressModel();
12
         BeanUtils.copyProperties(address, addressModel);
13
         BeanUtils.copyProperties(address, addressModel);
13
-
14
         return addressModel;
14
         return addressModel;
15
     }
15
     }
16
 
16
 

+ 3
- 3
spring-project-back/clean-archi-business-service-address/src/main/java/fr/natan/cleanarchitectureaddressservice/infrastructure/ports/output/service/AddressOutputServiceImpl.java View File

13
 
13
 
14
 import java.util.List;
14
 import java.util.List;
15
 import java.util.Optional;
15
 import java.util.Optional;
16
-import java.util.stream.Collectors;
16
+
17
 
17
 
18
 @Service
18
 @Service
19
 public class AddressOutputServiceImpl implements AddressOutputService {
19
 public class AddressOutputServiceImpl implements AddressOutputService {
32
 
32
 
33
         return addressModels.stream()
33
         return addressModels.stream()
34
                 .map(AddressMapper::mapModelToClass)
34
                 .map(AddressMapper::mapModelToClass)
35
-                .collect(Collectors.toList());
35
+                .toList();
36
     }
36
     }
37
 
37
 
38
     @Override
38
     @Override
50
                 addressDto.getNum(), addressDto.getStreet(), addressDto.getPb(), addressDto.getCity(), addressDto.getCountry());
50
                 addressDto.getNum(), addressDto.getStreet(), addressDto.getPb(), addressDto.getCity(), addressDto.getCountry());
51
         return addressModels.stream()
51
         return addressModels.stream()
52
                 .map(AddressMapper::mapModelToClass)
52
                 .map(AddressMapper::mapModelToClass)
53
-                .collect(Collectors.toList());
53
+                .toList();
54
     }
54
     }
55
 
55
 
56
     @Override
56
     @Override

+ 2
- 2
spring-project-back/clean-archi-business-service-address/src/main/resources/bootstrap.yml View File

4
   cloud:
4
   cloud:
5
     config:
5
     config:
6
       uri:
6
       uri:
7
-#       - http://localhost:8280
8
-        - http://microservices-config-service:8280
7
+       - http://localhost:8280
8
+#        - http://microservices-config-service:8280

+ 6
- 6
spring-project-back/clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/domain/usecase/CompanyInputServiceImpl.java View File

17
 import java.util.Optional;
17
 import java.util.Optional;
18
 import java.util.UUID;
18
 import java.util.UUID;
19
 
19
 
20
-@SuppressWarnings("ALL")
20
+
21
 public class CompanyInputServiceImpl implements CompanyInputSevice {
21
 public class CompanyInputServiceImpl implements CompanyInputSevice {
22
     private final CompanyOutputService companyOutputService;
22
     private final CompanyOutputService companyOutputService;
23
 
23
 
45
 
45
 
46
     @Override
46
     @Override
47
     public Company createCompany(CompanyDto companyDto) throws CompanyAlreadyExistsException, CompanyFieldsEmptyException {
47
     public Company createCompany(CompanyDto companyDto) throws CompanyAlreadyExistsException, CompanyFieldsEmptyException {
48
-       CompanyValidation.companyFormatter(companyDto);
48
+        CompanyValidation.companyFormatter(companyDto);
49
         if (!CompanyValidation.areValidCompanyTextFields(companyDto)) {
49
         if (!CompanyValidation.areValidCompanyTextFields(companyDto)) {
50
             throw new CompanyFieldsEmptyException();
50
             throw new CompanyFieldsEmptyException();
51
         }
51
         }
52
-        if (getCompanyByInfos(companyDto).size() > 0) {
52
+        if (!getCompanyByInfos(companyDto).isEmpty()) {
53
             throw new CompanyAlreadyExistsException();
53
             throw new CompanyAlreadyExistsException();
54
         }
54
         }
55
         Company company = CompanyMapper.dtoToClass(companyDto);
55
         Company company = CompanyMapper.dtoToClass(companyDto);
65
         if(!CompanyValidation.areValidCompanyTextFields(companyDto)){
65
         if(!CompanyValidation.areValidCompanyTextFields(companyDto)){
66
             throw new CompanyFieldsEmptyException();
66
             throw new CompanyFieldsEmptyException();
67
         }
67
         }
68
-        if(getCompanyByInfos(companyDto).size()>0){
68
+        if(!getCompanyByInfos(companyDto).isEmpty()){
69
             throw new CompanyAlreadyExistsException();
69
             throw new CompanyAlreadyExistsException();
70
         }
70
         }
71
         Company company = CompanyMapper.dtoToClass(companyDto);
71
         Company company = CompanyMapper.dtoToClass(companyDto);
75
                     company.setConnectedDate(value.getConnectedDate());
75
                     company.setConnectedDate(value.getConnectedDate());
76
 
76
 
77
                 },
77
                 },
78
-                () -> new CompanyNotFoundException()
78
+                CompanyNotFoundException::new
79
         );
79
         );
80
 
80
 
81
         return companyOutputService.updateCompany(company);
81
         return companyOutputService.updateCompany(company);
86
         Optional<Company> company = getCompanyByID(companyID);
86
         Optional<Company> company = getCompanyByID(companyID);
87
         if(company.isEmpty()){
87
         if(company.isEmpty()){
88
            throw new CompanyNotFoundException();
88
            throw new CompanyNotFoundException();
89
-        } else if (getProjectsAssignedToCompany(company.get().getCompanyID()).size()>0) {
89
+        } else if (!getProjectsAssignedToCompany(company.get().getCompanyID()).isEmpty()) {
90
             throw new CompanyAssociedProjectsException();
90
             throw new CompanyAssociedProjectsException();
91
         }
91
         }
92
 
92
 

+ 2
- 3
spring-project-back/clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/infrastructure/ports/input/feignclient/service/ProjectService.java View File

2
 
2
 
3
 import fr.natan.cleanarchitecturecompanyservice.infrastructure.ports.input.feignclient.model.ProjectModel;
3
 import fr.natan.cleanarchitecturecompanyservice.infrastructure.ports.input.feignclient.model.ProjectModel;
4
 import org.springframework.cloud.openfeign.FeignClient;
4
 import org.springframework.cloud.openfeign.FeignClient;
5
+import org.springframework.web.bind.annotation.GetMapping;
5
 import org.springframework.web.bind.annotation.PathVariable;
6
 import org.springframework.web.bind.annotation.PathVariable;
6
-import org.springframework.web.bind.annotation.RequestMapping;
7
-import org.springframework.web.bind.annotation.RequestMethod;
8
 
7
 
9
 import java.util.List;
8
 import java.util.List;
10
 
9
 
11
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-PROJECT")
10
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-PROJECT")
12
 public interface ProjectService {
11
 public interface ProjectService {
13
-    @RequestMapping(value = "/projects/companies/{companyID}", method = RequestMethod.GET)
12
+    @GetMapping(value = "/projects/companies/{companyID}")
14
     List<ProjectModel> getProjectsAssignedCompany(@PathVariable(name = "companyID") String companyID);
13
     List<ProjectModel> getProjectsAssignedCompany(@PathVariable(name = "companyID") String companyID);
15
 }
14
 }

+ 2
- 3
spring-project-back/clean-archi-business-service-company/src/main/java/fr/natan/cleanarchitecturecompanyservice/infrastructure/ports/output/service/CompanyOutputServiceImpl.java View File

13
 
13
 
14
 import java.util.List;
14
 import java.util.List;
15
 import java.util.Optional;
15
 import java.util.Optional;
16
-import java.util.stream.Collectors;
17
 
16
 
18
 @Service
17
 @Service
19
 public class CompanyOutputServiceImpl implements CompanyOutputService {
18
 public class CompanyOutputServiceImpl implements CompanyOutputService {
30
         List<CompanyModel> companyModels = companyRepository.findByOrderByCompanyIDAsc();
29
         List<CompanyModel> companyModels = companyRepository.findByOrderByCompanyIDAsc();
31
         return companyModels.stream()
30
         return companyModels.stream()
32
                 .map(CompanyMapper::mapToClass)
31
                 .map(CompanyMapper::mapToClass)
33
-                .collect(Collectors.toList());
32
+                .toList();
34
     }
33
     }
35
 
34
 
36
     @Override
35
     @Override
48
         );
47
         );
49
         return companyModels.stream()
48
         return companyModels.stream()
50
                 .map(CompanyMapper::mapToClass)
49
                 .map(CompanyMapper::mapToClass)
51
-                .collect(Collectors.toList());
50
+                .toList();
52
     }
51
     }
53
 
52
 
54
     @Override
53
     @Override

+ 2
- 2
spring-project-back/clean-archi-business-service-company/src/main/resources/bootstrap.yml View File

3
     name: clean-archi-business-service-company
3
     name: clean-archi-business-service-company
4
   cloud:
4
   cloud:
5
     config:
5
     config:
6
-      uri: http://microservices-config-service:8280
7
-#     uri: http://localhost:8280
6
+#      uri: http://microservices-config-service:8280
7
+     uri: http://localhost:8280

+ 2
- 3
spring-project-back/clean-archi-business-service-employee/src/main/java/fr/natan/cleanarchitectureemployeesservice/infrastructure/ports/input/feignclient/services/AddressServiceProxy.java View File

3
 import fr.natan.cleanarchitectureemployeesservice.infrastructure.ports.input.feignclientfallback.AddressServiceProxyFallback;
3
 import fr.natan.cleanarchitectureemployeesservice.infrastructure.ports.input.feignclientfallback.AddressServiceProxyFallback;
4
 import fr.natan.cleanarchitectureemployeesservice.infrastructure.ports.input.feignclient.models.AddressModel;
4
 import fr.natan.cleanarchitectureemployeesservice.infrastructure.ports.input.feignclient.models.AddressModel;
5
 import org.springframework.cloud.openfeign.FeignClient;
5
 import org.springframework.cloud.openfeign.FeignClient;
6
+import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.PathVariable;
7
 import org.springframework.web.bind.annotation.PathVariable;
7
-import org.springframework.web.bind.annotation.RequestMapping;
8
-import org.springframework.web.bind.annotation.RequestMethod;
9
 
8
 
10
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-ADDRESS", fallback = AddressServiceProxyFallback.class)
9
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-ADDRESS", fallback = AddressServiceProxyFallback.class)
11
 public interface AddressServiceProxy {
10
 public interface AddressServiceProxy {
12
-    @RequestMapping(value = "/addresses/{addressID}", method = RequestMethod.GET)
11
+    @GetMapping(value = "/addresses/{addressID}")
13
     AddressModel getAddressById(@PathVariable(name = "addressID") Long addressID);
12
     AddressModel getAddressById(@PathVariable(name = "addressID") Long addressID);
14
 }
13
 }

+ 2
- 3
spring-project-back/clean-archi-business-service-employee/src/main/java/fr/natan/cleanarchitectureemployeesservice/infrastructure/ports/input/feignclient/services/ProjectService.java View File

2
 
2
 
3
 import fr.natan.cleanarchitectureemployeesservice.infrastructure.ports.input.feignclient.models.ProjectModel;
3
 import fr.natan.cleanarchitectureemployeesservice.infrastructure.ports.input.feignclient.models.ProjectModel;
4
 import org.springframework.cloud.openfeign.FeignClient;
4
 import org.springframework.cloud.openfeign.FeignClient;
5
+import org.springframework.web.bind.annotation.GetMapping;
5
 import org.springframework.web.bind.annotation.PathVariable;
6
 import org.springframework.web.bind.annotation.PathVariable;
6
-import org.springframework.web.bind.annotation.RequestMapping;
7
-import org.springframework.web.bind.annotation.RequestMethod;
8
 
7
 
9
 import java.util.List;
8
 import java.util.List;
10
 
9
 
11
 
10
 
12
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-PROJECT")
11
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-PROJECT")
13
 public interface ProjectService {
12
 public interface ProjectService {
14
-    @RequestMapping(value = "/projects/employees/{employeeID}", method = RequestMethod.GET)
13
+    @GetMapping(value = "/projects/employees/{employeeID}")
15
     List<ProjectModel> getProjectsAssignedToEmployee(@PathVariable(name = "employeeID") String employeeID);
14
     List<ProjectModel> getProjectsAssignedToEmployee(@PathVariable(name = "employeeID") String employeeID);
16
 }
15
 }

+ 2
- 2
spring-project-back/clean-archi-business-service-employee/src/main/resources/bootstrap.yml View File

3
     name: clean-archi-business-service-employee
3
     name: clean-archi-business-service-employee
4
   cloud:
4
   cloud:
5
     config:
5
     config:
6
-      uri: http://microservices-config-service:8280
7
-#      uri: http://localhost:8280
6
+#      uri: http://microservices-config-service:8280
7
+      uri: http://localhost:8280

+ 2
- 3
spring-project-back/clean-archi-business-service-project/src/main/java/fr/natan/cleanarchitectureprojectservice/infranstructure/ports/input/feignclients/services/CompanyServiceProxy.java View File

3
 import fr.natan.cleanarchitectureprojectservice.infranstructure.ports.input.feignclients.entities.CompanyModel;
3
 import fr.natan.cleanarchitectureprojectservice.infranstructure.ports.input.feignclients.entities.CompanyModel;
4
 import fr.natan.cleanarchitectureprojectservice.infranstructure.ports.input.feignclientsfallback.CompanySeviceProxyFallback;
4
 import fr.natan.cleanarchitectureprojectservice.infranstructure.ports.input.feignclientsfallback.CompanySeviceProxyFallback;
5
 import org.springframework.cloud.openfeign.FeignClient;
5
 import org.springframework.cloud.openfeign.FeignClient;
6
+import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.PathVariable;
7
 import org.springframework.web.bind.annotation.PathVariable;
7
-import org.springframework.web.bind.annotation.RequestMapping;
8
-import org.springframework.web.bind.annotation.RequestMethod;
9
 
8
 
10
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-COMPANY", fallback = CompanySeviceProxyFallback.class)
9
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-COMPANY", fallback = CompanySeviceProxyFallback.class)
11
 public interface CompanyServiceProxy {
10
 public interface CompanyServiceProxy {
12
-    @RequestMapping(value = "/companies/{companyID}", method = RequestMethod.GET)
11
+    @GetMapping(value = "/companies/{companyID}")
13
     CompanyModel getCompanyByID(@PathVariable(name = "companyID") String companyID);
12
     CompanyModel getCompanyByID(@PathVariable(name = "companyID") String companyID);
14
 }
13
 }
15
 
14
 

+ 2
- 3
spring-project-back/clean-archi-business-service-project/src/main/java/fr/natan/cleanarchitectureprojectservice/infranstructure/ports/input/feignclients/services/EmployeeServiceProxy.java View File

3
 import fr.natan.cleanarchitectureprojectservice.infranstructure.ports.input.feignclients.entities.EmployeeModel;
3
 import fr.natan.cleanarchitectureprojectservice.infranstructure.ports.input.feignclients.entities.EmployeeModel;
4
 import fr.natan.cleanarchitectureprojectservice.infranstructure.ports.input.feignclientsfallback.EmployeeSeviceProxyFallback;
4
 import fr.natan.cleanarchitectureprojectservice.infranstructure.ports.input.feignclientsfallback.EmployeeSeviceProxyFallback;
5
 import org.springframework.cloud.openfeign.FeignClient;
5
 import org.springframework.cloud.openfeign.FeignClient;
6
+import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.PathVariable;
7
 import org.springframework.web.bind.annotation.PathVariable;
7
-import org.springframework.web.bind.annotation.RequestMapping;
8
-import org.springframework.web.bind.annotation.RequestMethod;
9
 
8
 
10
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-EMPLOYEE", fallback = EmployeeSeviceProxyFallback.class)
9
 @FeignClient(name = "CLEAN-ARCHI-BUSINESS-SERVICE-EMPLOYEE", fallback = EmployeeSeviceProxyFallback.class)
11
 public interface EmployeeServiceProxy {
10
 public interface EmployeeServiceProxy {
12
-    @RequestMapping(value = "/employees/{employeeID}", method = RequestMethod.GET)
11
+    @GetMapping(value = "/employees/{employeeID}")
13
     EmployeeModel getEmployeeByID(@PathVariable(name = "employeeID") String employeeID);
12
     EmployeeModel getEmployeeByID(@PathVariable(name = "employeeID") String employeeID);
14
 }
13
 }

+ 2
- 2
spring-project-back/clean-archi-business-service-project/src/main/resources/bootstrap.yml View File

3
     name: clean-archi-business-service-project
3
     name: clean-archi-business-service-project
4
   cloud:
4
   cloud:
5
     config:
5
     config:
6
-      uri: http://microservices-config-service:8280
7
-#      uri: http://localhost:8280
6
+#      uri: http://microservices-config-service:8280
7
+      uri: http://localhost:8280

+ 2
- 2
spring-project-back/microservices-registration-service/src/main/resources/bootstrap.yml View File

4
   cloud:
4
   cloud:
5
     config:
5
     config:
6
       uri:
6
       uri:
7
-#        - http://localhost:8280
8
-        - http://microservices-config-service:8280
7
+        - http://localhost:8280
8
+#        - http://microservices-config-service:8280

Powered by TurnKey Linux.