From edb4dbd0e5b3db733ec43704727b73fbe543091e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Antonio=20Ram=C3=ADrez=20Galv=C3=A1n?= Date: Thu, 6 Jun 2024 13:33:10 -0600 Subject: [PATCH] Se cambiaron las variables de la URL y la API_KEY a las propiedades de la aplicacion --- .flow-node-tasks.lock | 2 ++ .../com/example/application/api/ApiRedmine.java | 11 +++++++++-- .../com/example/application/api/RedmineClient.java | 11 +++++++++-- .../example/application/api/SecurityConfig.java | 9 --------- .../example/application/api/ServerPrpperties.java | 14 +++++++++++++- .../crearnuevoticket/CrearnuevoTicketView.java | 6 ++++-- .../application/views/tickets/MisTicketsView.java | 5 +++-- src/main/resources/application.properties | 6 ++++++ 8 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 .flow-node-tasks.lock diff --git a/.flow-node-tasks.lock b/.flow-node-tasks.lock new file mode 100644 index 0000000..3aef278 --- /dev/null +++ b/.flow-node-tasks.lock @@ -0,0 +1,2 @@ +19228 + diff --git a/src/main/java/com/example/application/api/ApiRedmine.java b/src/main/java/com/example/application/api/ApiRedmine.java index 0bd57c9..52db0e1 100644 --- a/src/main/java/com/example/application/api/ApiRedmine.java +++ b/src/main/java/com/example/application/api/ApiRedmine.java @@ -12,9 +12,16 @@ import java.util.List; import java.util.Map; public class ApiRedmine { - private static final String REDMINE_URL = "http://localhost:3000"; - private static final String API_KEY = "cf3be6168e66c99892c6212ea0bc64e8ab1c6848"; + //private static final String REDMINE_URL = "http://localhost:3000"; + //private static final String API_KEY = "cf3be6168e66c99892c6212ea0bc64e8ab1c6848"; public static final Gson GSON = new Gson(); + static String REDMINE_URL; + static String API_KEY; + + public ApiRedmine(String redmineurl, String apikey) { + REDMINE_URL = redmineurl; + API_KEY = apikey; + } public static String createIssue(Map issueDetails) { return createIssue(issueDetails, null); diff --git a/src/main/java/com/example/application/api/RedmineClient.java b/src/main/java/com/example/application/api/RedmineClient.java index 9e74062..9a9b8a0 100644 --- a/src/main/java/com/example/application/api/RedmineClient.java +++ b/src/main/java/com/example/application/api/RedmineClient.java @@ -18,9 +18,16 @@ para poder mostrarlo en la vista de visualizacion de tickets*/ public class RedmineClient { - private static final String REDMINE_URL = "http://localhost:3000"; - private static final String API_KEY = "cf3be6168e66c99892c6212ea0bc64e8ab1c6848"; + //private static final String REDMINE_URL = "http://localhost:3000"; + //private static final String API_KEY = "cf3be6168e66c99892c6212ea0bc64e8ab1c6848"; private static final int PAGE_SIZE = 25; + static String REDMINE_URL; + static String API_KEY; + + public RedmineClient(String redmineUrl, String apiKey) { + REDMINE_URL = redmineUrl; + API_KEY = apiKey; + } public List getTickets() { List tickets = new ArrayList<>(); diff --git a/src/main/java/com/example/application/api/SecurityConfig.java b/src/main/java/com/example/application/api/SecurityConfig.java index b9aa18f..1a6c193 100644 --- a/src/main/java/com/example/application/api/SecurityConfig.java +++ b/src/main/java/com/example/application/api/SecurityConfig.java @@ -51,15 +51,6 @@ public class SecurityConfig extends VaadinWebSecurity { } - /*@Bean - UserDetailsManager userDetailsManager() { - return new InMemoryUserDetailsManager( - User.withUsername("marco") - .password("{noop}marco") - .roles("USER") - .build() - ) - }*/ } diff --git a/src/main/java/com/example/application/api/ServerPrpperties.java b/src/main/java/com/example/application/api/ServerPrpperties.java index 8522076..2d4709f 100644 --- a/src/main/java/com/example/application/api/ServerPrpperties.java +++ b/src/main/java/com/example/application/api/ServerPrpperties.java @@ -1,2 +1,14 @@ -package com.example.application.api;public class ServerPrpperties { +package com.example.application.api; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class ServerPrpperties { + + @Value("${redmine.url}") + public String REDMINE_URL; + + @Value("${redmine.api_key}") + public String API_KEY; } diff --git a/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java b/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java index 94ada58..418f0a9 100644 --- a/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java +++ b/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java @@ -1,6 +1,7 @@ package com.example.application.views.crearnuevoticket; import com.example.application.api.ApiRedmine; +import com.example.application.api.ServerPrpperties; import com.example.application.views.MainLayout; import com.nimbusds.jose.shaded.gson.Gson; import com.nimbusds.jose.shaded.gson.JsonObject; @@ -32,10 +33,11 @@ public class CrearnuevoTicketView extends VerticalLayout { private MemoryBuffer buffer; private Upload uploadFile; - public CrearnuevoTicketView() { + public CrearnuevoTicketView(ServerPrpperties prpperties) { + ApiRedmine api = new ApiRedmine(prpperties.REDMINE_URL, prpperties.API_KEY); + // Combo de los tipos de tickets ComboBox tipoTickets = new ComboBox<>("Tipo de ticket"); - ApiRedmine api = new ApiRedmine(); List types = api.getTicketTypes(); tipoTickets.setItems(types); diff --git a/src/main/java/com/example/application/views/tickets/MisTicketsView.java b/src/main/java/com/example/application/views/tickets/MisTicketsView.java index f67c010..d53254c 100644 --- a/src/main/java/com/example/application/views/tickets/MisTicketsView.java +++ b/src/main/java/com/example/application/views/tickets/MisTicketsView.java @@ -1,6 +1,7 @@ package com.example.application.views.tickets; import com.example.application.api.RedmineClient; +import com.example.application.api.ServerPrpperties; import com.example.application.models.Ticket; import com.example.application.views.MainLayout; import com.vaadin.flow.component.grid.Grid; @@ -18,8 +19,8 @@ public class MisTicketsView extends VerticalLayout { private final Grid grid; - public MisTicketsView() { - this.redmineClient = new RedmineClient(); + public MisTicketsView(ServerPrpperties prpperties) { + this.redmineClient = new RedmineClient(prpperties.REDMINE_URL, prpperties.API_KEY); this.grid = new Grid<>(Ticket.class, false); // Definir columnas en el orden deseado diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7a68262..2b907bd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,3 +16,9 @@ urls: ldap://172.16.0.1:389 base: DC=JUMAPACELAYA, DC=GOB, DC=MX username: administrator password: Dr3na%134$4guA + + + +#################################################### +redmine.url=http://localhost:3000 +redmine.api_key=cf3be6168e66c99892c6212ea0bc64e8ab1c6848 \ No newline at end of file