From b86d8132383812613c0d9c0ca70667a14c32f7fb Mon Sep 17 00:00:00 2001 From: FrancoPandolfo Date: Sat, 17 Aug 2024 18:44:45 -0300 Subject: [PATCH] fix package import --- .../application-gateway-java/build.gradle | 8 +++ .../src/main/java/App.java | 62 +------------------ .../src/main/java/models/Asset.Java | 25 ++++---- 3 files changed, 20 insertions(+), 75 deletions(-) diff --git a/asset-transfer-basic/application-gateway-java/build.gradle b/asset-transfer-basic/application-gateway-java/build.gradle index 11bf0583..2c9bb947 100644 --- a/asset-transfer-basic/application-gateway-java/build.gradle +++ b/asset-transfer-basic/application-gateway-java/build.gradle @@ -31,6 +31,14 @@ java { } } +sourceSets { + main { + java { + srcDirs = ['application-gateway-java/src/main/java'] + } + } +} + application { // Define the main class for the application. mainClass = 'App' diff --git a/asset-transfer-basic/application-gateway-java/src/main/java/App.java b/asset-transfer-basic/application-gateway-java/src/main/java/App.java index 64b501a4..e74fe393 100644 --- a/asset-transfer-basic/application-gateway-java/src/main/java/App.java +++ b/asset-transfer-basic/application-gateway-java/src/main/java/App.java @@ -34,67 +34,7 @@ import java.util.concurrent.TimeUnit; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; - -class Asset { - private String id; - private String owner; - private String prescripcionAnteriorId; - private String status; - private LocalDateTime statusChange; - private String prioridad; - private String medicacion; - private String razon; - private String notas; - private String periodoDeTratamiento; - private String instruccionesTratamiento; - private String periodoDeValidez; - private String dniPaciente; - private LocalDate fechaDeAutorizacion; - private int cantidad; - private LocalDate expectedSupplyDuration; - - public Asset(String id, String owner, String prescripcionAnteriorId, String status, LocalDateTime statusChange, - String prioridad, String medicacion, String razon, String notas, String periodoDeTratamiento, - String instruccionesTratamiento, String periodoDeValidez, String dniPaciente, - LocalDate fechaDeAutorizacion, int cantidad, LocalDate expectedSupplyDuration) { - this.id = id; - this.owner = owner; - this.prescripcionAnteriorId = prescripcionAnteriorId; - this.status = status; - this.statusChange = statusChange; - this.prioridad = prioridad; - this.medicacion = medicacion; - this.razon = razon; - this.notas = notas; - this.periodoDeTratamiento = periodoDeTratamiento; - this.instruccionesTratamiento = instruccionesTratamiento; - this.periodoDeValidez = periodoDeValidez; - this.dniPaciente = dniPaciente; - this.fechaDeAutorizacion = fechaDeAutorizacion; - this.cantidad = cantidad; - this.expectedSupplyDuration = expectedSupplyDuration; - } - - // Getters - public String getId() { return id; } - public String getOwner() { return owner; } - public String getPrescripcionAnteriorId() { return prescripcionAnteriorId; } - public String getStatus() { return status; } - public LocalDateTime getStatusChange() { return statusChange; } - public String getPrioridad() { return prioridad; } - public String getMedicacion() { return medicacion; } - public String getRazon() { return razon; } - public String getNotas() { return notas; } - public String getPeriodoDeTratamiento() { return periodoDeTratamiento; } - public String getInstruccionesTratamiento() { return instruccionesTratamiento; } - public String getPeriodoDeValidez() { return periodoDeValidez; } - public String getDniPaciente() { return dniPaciente; } - public LocalDate getFechaDeAutorizacion() { return fechaDeAutorizacion; } - public int getCantidad() { return cantidad; } - public LocalDate getExpectedSupplyDuration() { return expectedSupplyDuration; } -} - - +import models.Asset; public final class App { private static final String MSP_ID = System.getenv().getOrDefault("MSP_ID", "Org1MSP"); diff --git a/asset-transfer-basic/application-gateway-java/src/main/java/models/Asset.Java b/asset-transfer-basic/application-gateway-java/src/main/java/models/Asset.Java index 6dcc25a7..79ce933b 100644 --- a/asset-transfer-basic/application-gateway-java/src/main/java/models/Asset.Java +++ b/asset-transfer-basic/application-gateway-java/src/main/java/models/Asset.Java @@ -1,13 +1,11 @@ -/* package models; - class Asset { private String id; private String owner; private String prescripcionAnteriorId; private String status; - private String statusChange; + private LocalDateTime statusChange; private String prioridad; private String medicacion; private String razon; @@ -16,14 +14,14 @@ class Asset { private String instruccionesTratamiento; private String periodoDeValidez; private String dniPaciente; - private String fechaDeAutorizacion; - private String cantidad; - private String expectedSupplyDuration; + private LocalDate fechaDeAutorizacion; + private int cantidad; + private LocalDate expectedSupplyDuration; - public Asset(String id, String owner, String prescripcionAnteriorId, String status, String statusChange, + public Asset(String id, String owner, String prescripcionAnteriorId, String status, LocalDateTime statusChange, String prioridad, String medicacion, String razon, String notas, String periodoDeTratamiento, String instruccionesTratamiento, String periodoDeValidez, String dniPaciente, - String fechaDeAutorizacion, String cantidad, String expectedSupplyDuration) { + LocalDate fechaDeAutorizacion, int cantidad, LocalDate expectedSupplyDuration) { this.id = id; this.owner = owner; this.prescripcionAnteriorId = prescripcionAnteriorId; @@ -47,7 +45,7 @@ class Asset { public String getOwner() { return owner; } public String getPrescripcionAnteriorId() { return prescripcionAnteriorId; } public String getStatus() { return status; } - public String getStatusChange() { return statusChange; } + public LocalDateTime getStatusChange() { return statusChange; } public String getPrioridad() { return prioridad; } public String getMedicacion() { return medicacion; } public String getRazon() { return razon; } @@ -56,8 +54,7 @@ class Asset { public String getInstruccionesTratamiento() { return instruccionesTratamiento; } public String getPeriodoDeValidez() { return periodoDeValidez; } public String getDniPaciente() { return dniPaciente; } - public String getFechaDeAutorizacion() { return fechaDeAutorizacion; } - public String getCantidad() { return cantidad; } - public String getExpectedSupplyDuration() { return expectedSupplyDuration; } -} -*/ \ No newline at end of file + public LocalDate getFechaDeAutorizacion() { return fechaDeAutorizacion; } + public int getCantidad() { return cantidad; } + public LocalDate getExpectedSupplyDuration() { return expectedSupplyDuration; } +} \ No newline at end of file