Rifattorizzati i parametri di configurazione degli endpoint di perseo

archetipo · Jan 29, 2019 · 469d9be · 469d9be
1 parent 29e7b2d
commit 469d9be
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 96 deletions.
diff --git a/app/synch/perseoconsumers/PerseoApis.java → ...synch/perseoconsumers/AnagraficaApis.java b/app/synch/perseoconsumers/PerseoApis.java → ...synch/perseoconsumers/AnagraficaApis.java
@@ -4,29 +4,23 @@
 
 import play.Play;
 
-public class PerseoApis {
-
-  private static final String PERSEO_BASE_URL = "perseo.base";
-  private static final String PERSEO_USER = "perseo.user";
-  private static final String PERSEO_PASS = "perseo.pass";
-  private static final String OFFICES_ENDPOINT = "perseo.rest.departments";
-  private static final String OFFICE_ENDPOINT = "perseo.rest.departmentbyperseoid";
-  private static final String INSTITUTE_ENDPOINT = "perseo.rest.institutebyperseoid";
-  private static final String ALL_DEPARTMENT_CONTRACTS_FOR_EPAS_ENDPOINT =
-      "perseo.rest.allcontractsindepartmentforepas";
-  private static final String ALL_CONTRACTS_FOR_EPAS_ENDPOINT =
-      "perseo.rest.allcontractsforepas";
-  private static final String CONTRACT_FOR_EPAS_ENDPOINT =
-      "perseo.rest.contractforepasbyperseoid";
-  private static final String ALL_DEPARTMENT_PEOPLE_FOR_EPAS_ENDPOINT =
-      "perseo.rest.alldepartmentpeopleforepas";
-  private static final String ALL_PEOPLE_FOR_EPAS_ENDPOINT =
-      "perseo.rest.allpeopleforepas";
-  private static final String PERSON_FOR_EPAS_ENDPOINT =
-      "perseo.rest.personforepasbyperseoid";
-  private static final String ALL_ROLES_ENDPOINT = "perseo.rest.allrolesforepas";
-  private static final String OFFICE_BADGES = "endpoint.officebadges";
-  private static final String PERSON_BADGE = "endpoint.personbadge";
+public class AnagraficaApis {
+
+  private static final String PERSEO_BASE_URL = "anagrafica.base";
+  private static final String PERSEO_USER = "anagrafica.user";
+  private static final String PERSEO_PASS = "anagrafica.pass";
+  private static final String OFFICES_ENDPOINT = "anagrafica.offices";
+  private static final String OFFICE_ENDPOINT = "anagrafica.office";
+  private static final String INSTITUTE_ENDPOINT = "anagrafica.institute";
+  private static final String CONTRACTS_IN_OFFICE = "anagrafica.contractsinoffice";
+  private static final String CONTRACTS = "anagrafica.contracts";
+  private static final String CONTRACT = "anagrafica.contract";
+  private static final String PEOPLE_IN_OFFICE = "anagrafica.peopleinoffice";
+  private static final String PEOPLE = "anagrafica.people";
+  private static final String PERSON_FOR_EPAS_ENDPOINT = "anagrafica.person";
+  private static final String ALL_ROLES_ENDPOINT = "anagrafica.roles";
+  private static final String OFFICE_BADGES = "anagrafica.badgesinoffice";
+  private static final String PERSON_BADGE = "anagrafica.badge";
 
   private static String getPerseoBaseUrl() throws NoSuchFieldException {
     if (Strings.isNullOrEmpty(Play.configuration.getProperty(PERSEO_BASE_URL))) {
@@ -63,25 +57,25 @@ public static String getInstituteEndpoint() throws NoSuchFieldException {
 
   public static String getAllContractsForEpasEndpoint() throws NoSuchFieldException {
     return getPerseoBaseUrl()
-        + Play.configuration.getProperty(ALL_CONTRACTS_FOR_EPAS_ENDPOINT);
+        + Play.configuration.getProperty(CONTRACTS);
   }
 
   public static String getAllDepartmentContractsForEpasEndpoint() throws NoSuchFieldException {
     return getPerseoBaseUrl()
-        + Play.configuration.getProperty(ALL_DEPARTMENT_CONTRACTS_FOR_EPAS_ENDPOINT);
+        + Play.configuration.getProperty(CONTRACTS_IN_OFFICE);
   }
 
   public static String getContractForEpasEndpoint() throws NoSuchFieldException {
-    return getPerseoBaseUrl() + Play.configuration.getProperty(CONTRACT_FOR_EPAS_ENDPOINT);
+    return getPerseoBaseUrl() + Play.configuration.getProperty(CONTRACT);
   }
 
   public static String getAllDepartmentPeopleForEpasEndpoint() throws NoSuchFieldException {
     return getPerseoBaseUrl()
-        + Play.configuration.getProperty(ALL_DEPARTMENT_PEOPLE_FOR_EPAS_ENDPOINT);
+        + Play.configuration.getProperty(PEOPLE_IN_OFFICE);
   }
 
-  public static String getAllPeopleForEpasEndpoint() throws NoSuchFieldException {
-    return getPerseoBaseUrl() + Play.configuration.getProperty(ALL_PEOPLE_FOR_EPAS_ENDPOINT);
+  public static String getPeople() throws NoSuchFieldException {
+    return getPerseoBaseUrl() + Play.configuration.getProperty(PEOPLE);
   }
 
   public static String getPersonForEpasEndpoint() throws NoSuchFieldException {

diff --git a/app/synch/perseoconsumers/contracts/ContractPerseoConsumer.java b/app/synch/perseoconsumers/contracts/ContractPerseoConsumer.java
@@ -36,7 +36,7 @@
 import play.libs.WS;
 import play.libs.WS.HttpResponse;
 
-import synch.perseoconsumers.PerseoApis;
+import synch.perseoconsumers.AnagraficaApis;
 
 @Slf4j
 public class ContractPerseoConsumer {
@@ -69,9 +69,9 @@ private ListenableFuture<PerseoContract> perseoContractByPerseoId(Long perseoCon
     final String pass;
 
     try {
-      url = PerseoApis.getContractForEpasEndpoint() + perseoContractId;
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      url = AnagraficaApis.getContractForEpasEndpoint() + perseoContractId;
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);
@@ -119,12 +119,12 @@ private ListenableFuture<List<PerseoContract>> perseoContracts(
 
     try {
       if (departmentPerseoId.isPresent()) {
-        url = PerseoApis.getAllDepartmentContractsForEpasEndpoint() + departmentPerseoId.get();
+        url = AnagraficaApis.getAllDepartmentContractsForEpasEndpoint() + departmentPerseoId.get();
       } else {
-        url = PerseoApis.getAllContractsForEpasEndpoint();
+        url = AnagraficaApis.getAllContractsForEpasEndpoint();
       }
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);

diff --git a/app/synch/perseoconsumers/office/OfficePerseoConsumer.java b/app/synch/perseoconsumers/office/OfficePerseoConsumer.java
@@ -26,7 +26,7 @@
 import play.libs.WS;
 import play.libs.WS.HttpResponse;
 
-import synch.perseoconsumers.PerseoApis;
+import synch.perseoconsumers.AnagraficaApis;
 
 @Slf4j
 public class OfficePerseoConsumer {
@@ -42,9 +42,9 @@ private ListenableFuture<List<PerseoOffice>> perseoOffices() {
     final String pass;
 
     try {
-      url = PerseoApis.getOfficesEndpoint();
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      url = AnagraficaApis.getOfficesEndpoint();
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);
@@ -92,9 +92,9 @@ private ListenableFuture<PerseoOffice> perseoOfficeByPerseoId(Long perseoId) {
     final String pass;
 
     try {
-      url = PerseoApis.getOfficeEndpoint() + perseoId;
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      url = AnagraficaApis.getOfficeEndpoint() + perseoId;
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);
@@ -139,9 +139,9 @@ private ListenableFuture<PerseoInstitute> perseoInstituteByPerseoId(Long perseoI
     final String pass;
 
     try {
-      url = PerseoApis.getInstituteEndpoint() + perseoId;
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      url = AnagraficaApis.getInstituteEndpoint() + perseoId;
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);

diff --git a/app/synch/perseoconsumers/people/PeoplePerseoConsumer.java b/app/synch/perseoconsumers/people/PeoplePerseoConsumer.java
@@ -14,17 +14,15 @@
 import com.google.inject.Inject;
 import dao.QualificationDao;
 import helpers.rest.ApiRequestException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import lombok.extern.slf4j.Slf4j;
-import models.Office;
 import models.Person;
 import models.Qualification;
 import play.libs.WS;
 import play.libs.WS.HttpResponse;
-import synch.perseoconsumers.PerseoApis;
+import synch.perseoconsumers.AnagraficaApis;
 
 @Slf4j
 public class PeoplePerseoConsumer {
@@ -47,9 +45,9 @@ private ListenableFuture<PerseoPerson> perseoPerson(Long perseoId) {
     final String pass;
 
     try {
-      url = PerseoApis.getPersonForEpasEndpoint() + perseoId;
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      url = AnagraficaApis.getPersonForEpasEndpoint() + perseoId;
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);
@@ -97,12 +95,12 @@ private ListenableFuture<List<PerseoPerson>> perseoPeople(Optional<Long> departm
 
     try {
       if (departmentPerseoId.isPresent()) {
-        url = PerseoApis.getAllDepartmentPeopleForEpasEndpoint() + departmentPerseoId.get();
+        url = AnagraficaApis.getAllDepartmentPeopleForEpasEndpoint() + departmentPerseoId.get();
       } else {
-        url = PerseoApis.getAllPeopleForEpasEndpoint();
+        url = AnagraficaApis.getPeople();
       }
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);
@@ -253,9 +251,9 @@ public ListenableFuture<PersonBadge> getPersonBadge(Long personId) {
     final String pass;
 
     try {
-      url = PerseoApis.getPersonBadge() + personId;
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      url = AnagraficaApis.getPersonBadge() + personId;
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);
@@ -296,9 +294,9 @@ public ListenableFuture<List<PersonBadge>> getOfficeBadges(Long departmentPerseo
     final String pass;
 
     try {
-      url = PerseoApis.getDepartmentsBadges() + departmentPerseoId;
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      url = AnagraficaApis.getDepartmentsBadges() + departmentPerseoId;
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);

diff --git a/app/synch/perseoconsumers/roles/RolePerseoConsumer.java b/app/synch/perseoconsumers/roles/RolePerseoConsumer.java
@@ -36,7 +36,7 @@
 import play.libs.WS;
 import play.libs.WS.HttpResponse;
 
-import synch.perseoconsumers.PerseoApis;
+import synch.perseoconsumers.AnagraficaApis;
 
 @Slf4j
 public class RolePerseoConsumer {
@@ -74,9 +74,9 @@ private ListenableFuture<List<PerseoRole>> perseoRoles() {
     final String pass;
 
     try {
-      url = PerseoApis.getAllRolesEpasEndpoint();
-      user = PerseoApis.getPerseoUser();
-      pass = PerseoApis.getPerseoPass();
+      url = AnagraficaApis.getAllRolesEpasEndpoint();
+      user = AnagraficaApis.getPerseoUser();
+      pass = AnagraficaApis.getPerseoPass();
     } catch (NoSuchFieldException ex) {
       final String error = String.format("Parametro necessario non trovato: %s", ex.getMessage());
       log.error(error);

diff --git a/conf/application.conf b/conf/application.conf
@@ -249,19 +249,19 @@ application.baseUrl=http://localhost:9000/
 XForwardedSupport=all
 
 # Perseo endpoint
-perseo.base=                             https://perseo.devel.iit.cnr.it
-perseo.rest.personforepasbyperseoid=     /rest/people/getpersonbyperseoid?perseoId=
-perseo.rest.allpeopleforepas=            /rest/people/allpeopleforepas
-perseo.rest.alldepartmentpeopleforepas=  /rest/people/alldepartmentpeopleforepas?perseoId=
-perseo.rest.departments=                 /rest/departments/list
-perseo.rest.departmentbyperseoid=        /rest/departments/getdepartmentbyperseoid?perseoId=
-perseo.rest.institutebyperseoid=         /rest/departments/getinstitutebyperseoid?perseoId=
-
-perseo.rest.allcontractsforepas =             /rest/contracts/allcontractsforepas
-perseo.rest.allcontractsindepartmentforepas = /rest/contracts/allcontractsindepartmentforepas?perseoId=
-perseo.rest.contractforepasbyperseoid=        /rest/contracts/getcontractbyperseoid?perseoId=
-
-perseo.rest.allrolesforepas=             /rest/roles/allrolesforepas
+anagrafica.base=               https://perseo.devel.iit.cnr.it
+anagrafica.person=             /rest/people/getpersonbyperseoid?perseoId=
+anagrafica.people=             /rest/people/allpeopleforepas
+anagrafica.peopleinoffice=     /rest/people/alldepartmentpeopleforepas?perseoId=
+anagrafica.offices=            /rest/departments/list
+anagrafica.office=             /rest/departments/getdepartmentbyperseoid?perseoId=
+anagrafica.institute=          /rest/departments/getinstitutebyperseoid?perseoId=
+anagrafica.contracts=          /rest/contracts/allcontractsforepas
+anagrafica.contractsinoffice=  /rest/contracts/allcontractsindepartmentforepas?perseoId=
+anagrafica.contract=           /rest/contracts/getcontractbyperseoid?perseoId=
+anagrafica.roles=              /rest/roles/allrolesforepas
+anagrafica.badgesinoffice=
+anagrafica.badge=
 
 # Attestati Api
 attestati.base=http://as2dock.si.cnr.it

diff --git a/conf/dev.conf b/conf/dev.conf
@@ -47,9 +47,9 @@ url_to_presence=http://attestati-rm.devel.iit.cnr.it/attestati/
 rest.protime.user=protime
 rest.protime.password=protime
 
-perseo.base=http://localhost:9001
-perseo.user=app.epas
-perseo.pass=zUYuX7@£
+anagrafica.base=http://localhost:9001
+anagrafica.user=app.epas
+anagrafica.pass=zUYuX7@£
 
 #Other rest information
 attestati.base=http://sprint-attestati.test.si.cnr.it