diff --git a/java-custom-validation/src/main/java/com/froyo/AppCustomValidation.java b/java-custom-validation/src/main/java/com/froyo/AppCustomValidation.java index ee8b551..a2ad8a7 100644 --- a/java-custom-validation/src/main/java/com/froyo/AppCustomValidation.java +++ b/java-custom-validation/src/main/java/com/froyo/AppCustomValidation.java @@ -1,7 +1,7 @@ package com.froyo; import com.froyo.model.dto.TripDTO; -import lombok.extern.java.Log; +import java.util.logging.Logger; public class AppCustomValidation { diff --git a/java-custom-validation/src/main/java/com/froyo/model/dto/TripDTO.java b/java-custom-validation/src/main/java/com/froyo/model/dto/TripDTO.java index bcd7c42..d8bf120 100644 --- a/java-custom-validation/src/main/java/com/froyo/model/dto/TripDTO.java +++ b/java-custom-validation/src/main/java/com/froyo/model/dto/TripDTO.java @@ -1,17 +1,28 @@ package com.froyo.model.dto; import com.froyo.customvalidation.constraints.AirlineConstraint; -import lombok.AllArgsConstructor; -import lombok.Data; - import jakarta.validation.constraints.NotNull; -@AllArgsConstructor -@Data public class TripDTO { @NotNull @AirlineConstraint private String airline; + public TripDTO(String airline) { + this.airline = airline; + } + + public String getAirline() { + return airline; + } + + public void setAirline(String airline) { + this.airline = airline; + } + + @Override + public String toString() { + return "TripDTO(airline=" + this.airline + ")"; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoFamiliar.java b/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoFamiliar.java index be64578..ede61d6 100644 --- a/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoFamiliar.java +++ b/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoFamiliar.java @@ -1,14 +1,8 @@ package designpatterns.behavioral.command; -import lombok.AllArgsConstructor; -import lombok.Getter; - import java.math.BigDecimal; -@Getter -@AllArgsConstructor public class SaldoFamiliar { - private BigDecimal saldo; public void ingreso(BigDecimal monto) { @@ -21,4 +15,13 @@ public void gasto(BigDecimal monto) { System.out.println("gasto: " + this.saldo); } + @java.lang.SuppressWarnings("all") + public BigDecimal getSaldo() { + return this.saldo; + } + + @java.lang.SuppressWarnings("all") + public SaldoFamiliar(final BigDecimal saldo) { + this.saldo = saldo; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoGastoServiceImpl.java b/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoGastoServiceImpl.java index 2f456db..b7f5f09 100644 --- a/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoGastoServiceImpl.java +++ b/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoGastoServiceImpl.java @@ -1,12 +1,8 @@ package designpatterns.behavioral.command; -import lombok.AllArgsConstructor; - import java.math.BigDecimal; -@AllArgsConstructor public class SaldoGastoServiceImpl implements SaldoFamiliarService { - private SaldoFamiliar saldoFamiliar; private BigDecimal monto; @@ -14,4 +10,9 @@ public void execute() { this.saldoFamiliar.gasto(this.monto); } + @java.lang.SuppressWarnings("all") + public SaldoGastoServiceImpl(final SaldoFamiliar saldoFamiliar, final BigDecimal monto) { + this.saldoFamiliar = saldoFamiliar; + this.monto = monto; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoIngresoServiceImpl.java b/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoIngresoServiceImpl.java index 4b3b8ee..327b456 100644 --- a/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoIngresoServiceImpl.java +++ b/java-design-patterns/src/main/java/designpatterns/behavioral/command/SaldoIngresoServiceImpl.java @@ -1,12 +1,8 @@ package designpatterns.behavioral.command; -import lombok.AllArgsConstructor; - import java.math.BigDecimal; -@AllArgsConstructor public class SaldoIngresoServiceImpl implements SaldoFamiliarService { - private SaldoFamiliar saldoFamiliar; private BigDecimal monto; @@ -14,4 +10,9 @@ public void execute() { this.saldoFamiliar.ingreso(this.monto); } + @java.lang.SuppressWarnings("all") + public SaldoIngresoServiceImpl(final SaldoFamiliar saldoFamiliar, final BigDecimal monto) { + this.saldoFamiliar = saldoFamiliar; + this.monto = monto; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Juego.java b/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Juego.java index 413eaf7..e0124c7 100644 --- a/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Juego.java +++ b/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Juego.java @@ -1,13 +1,18 @@ package designpatterns.behavioral.memento; -import lombok.AllArgsConstructor; -import lombok.ToString; - -@ToString -@AllArgsConstructor public class Juego { - private String nombre; private int checkpoint; + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "Juego(nombre=" + this.nombre + ", checkpoint=" + this.checkpoint + ")"; + } + + @java.lang.SuppressWarnings("all") + public Juego(final String nombre, final int checkpoint) { + this.nombre = nombre; + this.checkpoint = checkpoint; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Memento.java b/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Memento.java index daf6913..5bffef9 100644 --- a/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Memento.java +++ b/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Memento.java @@ -1,12 +1,15 @@ package designpatterns.behavioral.memento; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor public class Memento { - private Juego estado; + @java.lang.SuppressWarnings("all") + public Juego getEstado() { + return this.estado; + } + + @java.lang.SuppressWarnings("all") + public Memento(final Juego estado) { + this.estado = estado; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Originator.java b/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Originator.java index fd8ae99..cb6a873 100644 --- a/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Originator.java +++ b/java-design-patterns/src/main/java/designpatterns/behavioral/memento/Originator.java @@ -1,10 +1,6 @@ package designpatterns.behavioral.memento; -import lombok.Data; - -@Data public class Originator { - private Juego estado; public Memento guardar() { @@ -15,4 +11,51 @@ public void restaurar(Memento m) { this.estado = m.getEstado(); } + @java.lang.SuppressWarnings("all") + public Originator() { + } + + @java.lang.SuppressWarnings("all") + public Juego getEstado() { + return this.estado; + } + + @java.lang.SuppressWarnings("all") + public void setEstado(final Juego estado) { + this.estado = estado; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof Originator)) return false; + final Originator other = (Originator) o; + if (!other.canEqual((java.lang.Object) this)) return false; + final java.lang.Object this$estado = this.getEstado(); + final java.lang.Object other$estado = other.getEstado(); + if (this$estado == null ? other$estado != null : !this$estado.equals(other$estado)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof Originator; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final java.lang.Object $estado = this.getEstado(); + result = result * PRIME + ($estado == null ? 43 : $estado.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "Originator(estado=" + this.getEstado() + ")"; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/behavioral/strategy/AppDesignPatternStrategy1.java b/java-design-patterns/src/main/java/designpatterns/behavioral/strategy/AppDesignPatternStrategy1.java index cc57a72..878bb8d 100644 --- a/java-design-patterns/src/main/java/designpatterns/behavioral/strategy/AppDesignPatternStrategy1.java +++ b/java-design-patterns/src/main/java/designpatterns/behavioral/strategy/AppDesignPatternStrategy1.java @@ -1,38 +1,32 @@ package designpatterns.behavioral.strategy; -import lombok.NonNull; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.commons.text.WordUtils; - public class AppDesignPatternStrategy1 { - public static void main(String[] args) throws Exception { - ContextVendedorNivel contextVendedorNivel = new ContextVendedorNivel(new VendedorNivel1()); System.out.println(contextVendedorNivel.profitFromSale(50)); - String tipoDeVendedorFromDatabase = "VENDEDOR_NIVEL_1"; String tipoDeVendedorParsed = parseTipoDeVendedorLikeNameClass(tipoDeVendedorFromDatabase); final Class clazz = ClassUtils.getClass("designpatterns.behavioral.strategy." + tipoDeVendedorParsed); // Object profitFromSale = MethodUtils.invokeStaticMethod(clazz, "profitFromSale", 50); - Object vendedorNivelTest = clazz.getDeclaredConstructor().newInstance(); Object profitFromSaleInvoke = MethodUtils.invokeMethod(vendedorNivelTest, "profitFromSale", 50); System.out.println(profitFromSaleInvoke); - //like ...this way ContextVendedorNivel contextVendedorNivelTest2 = new ContextVendedorNivel((StrategyVendedor) vendedorNivelTest); System.out.println(contextVendedorNivelTest2.profitFromSale(50)); - } - private static String parseTipoDeVendedorLikeNameClass(@NonNull String tipoVendedor) { + private static String parseTipoDeVendedorLikeNameClass(String tipoVendedor) { + if (tipoVendedor == null) { + throw new java.lang.NullPointerException("tipoVendedor is marked non-null but is null"); + } return StringUtils.replaceEach( // - WordUtils.capitalizeFully(tipoVendedor, new char[]{'_'}), // - new String[]{"_"}, new String[]{StringUtils.EMPTY}); + WordUtils.capitalizeFully(tipoVendedor, new char[] {'_'}), // + new String[] {"_"}, new String[] {StringUtils.EMPTY}); } - } diff --git a/java-design-patterns/src/main/java/designpatterns/behavioral/strategy/ContextVendedorNivel.java b/java-design-patterns/src/main/java/designpatterns/behavioral/strategy/ContextVendedorNivel.java index aaf48e2..39b1594 100644 --- a/java-design-patterns/src/main/java/designpatterns/behavioral/strategy/ContextVendedorNivel.java +++ b/java-design-patterns/src/main/java/designpatterns/behavioral/strategy/ContextVendedorNivel.java @@ -1,16 +1,16 @@ package designpatterns.behavioral.strategy; -import lombok.AllArgsConstructor; - import java.math.BigDecimal; -@AllArgsConstructor public class ContextVendedorNivel { - private StrategyVendedor strategyVendedor; - public BigDecimal profitFromSale(int cantidadDeProductoVendido){ + public BigDecimal profitFromSale(int cantidadDeProductoVendido) { return strategyVendedor.profitFromSale(cantidadDeProductoVendido); } + @java.lang.SuppressWarnings("all") + public ContextVendedorNivel(final StrategyVendedor strategyVendedor) { + this.strategyVendedor = strategyVendedor; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/AppCreational.java b/java-design-patterns/src/main/java/designpatterns/creational/AppCreational.java index d614e73..33da3de 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/AppCreational.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/AppCreational.java @@ -8,41 +8,34 @@ import designpatterns.creational.prototype.Employee; import designpatterns.creational.prototype.EmployeeAddress; import designpatterns.creational.singleton.DatabaseConfig; -import lombok.extern.java.Log; - import java.io.IOException; - import static designpatterns.creational.abstractfactory.ConnectionType.*; /** * {@link https://www.journaldev.com/1827/java-design-patterns-example-tutorial} */ -@Log public class AppCreational { + @java.lang.SuppressWarnings("all") + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(AppCreational.class.getName()); public static void main(String[] args) throws IOException { - //Singleton Pattern ---------------------------------- DatabaseConfig databaseConfigSingleton = DatabaseConfig.getInstance(); log.info(databaseConfigSingleton.toString()); - //Factory Method ---------------------------------- ViewRequestFactory factory = new ViewRequestFactory(); ViewRequest viewRequest = factory.getViewRequest("two"); viewRequest.executeProcess(); - //Factory Pattern ---------------------------------- DBConnection dbConnectionMysql = (DBConnection) FactoryDBConnection.getInstance(MYSQL); log.info(dbConnectionMysql.connect()); DBConnection dbConnectionPostgresSQL = (DBConnection) FactoryDBConnection.getInstance(POSTGRESQL); log.info(dbConnectionPostgresSQL.connect()); - //Abstract Factory Pattern ---------------------------------- DBConfig dbConfigMySQL = FactoryDBConnection.getInstance(MYSQL); log.info(dbConfigMySQL.connect()); DBConfig dbConfigRest = FactoryDBConnection.getInstance(REST); log.info(dbConfigRest.connect()); - //Prototype Pattern ---------------------------------- EmployeeAddress empAddress = new EmployeeAddress("22", "Avenue Street", "Dallas"); Employee emp = new Employee("David", 32, empAddress); @@ -55,8 +48,5 @@ public static void main(String[] args) throws IOException { System.out.println(emp == empClone); log.info("Original Employee Object: " + emp); log.info("Cloned Employee Object: " + empClone); - - } - } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/abstractfactory/DBConnection.java b/java-design-patterns/src/main/java/designpatterns/creational/abstractfactory/DBConnection.java index 8df3d9e..6d0ec3f 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/abstractfactory/DBConnection.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/abstractfactory/DBConnection.java @@ -1,10 +1,6 @@ package designpatterns.creational.abstractfactory; -import lombok.ToString; - -@ToString public abstract class DBConnection extends DBConfig { - private String url; private String port; private String user; @@ -23,4 +19,9 @@ public String connect() { return ":: DBConnection - connected ::"; } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "DBConnection(url=" + this.url + ", port=" + this.port + ", user=" + this.user + ", pass=" + this.pass + ")"; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/abstractfactory/FactoryDBConnection.java b/java-design-patterns/src/main/java/designpatterns/creational/abstractfactory/FactoryDBConnection.java index f954b7d..81b6dd0 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/abstractfactory/FactoryDBConnection.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/abstractfactory/FactoryDBConnection.java @@ -1,16 +1,21 @@ package designpatterns.creational.abstractfactory; -import lombok.experimental.UtilityClass; - -@UtilityClass -public class FactoryDBConnection { - +public final class FactoryDBConnection { public static DBConfig getInstance(ConnectionType connectionType) { switch (connectionType) { - case MYSQL: return new DBConnectionMySQL(); - case POSTGRESQL: return new DBConnectionPostgreSQL(); - case REST: return new DBRest(); - default: return null; + case MYSQL: + return new DBConnectionMySQL(); + case POSTGRESQL: + return new DBConnectionPostgreSQL(); + case REST: + return new DBRest(); + default: + return null; } } + + @java.lang.SuppressWarnings("all") + private FactoryDBConnection() { + throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); + } } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestOne.java b/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestOne.java index 9ab5032..a280924 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestOne.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestOne.java @@ -1,13 +1,11 @@ package designpatterns.creational.factorymethod; -import lombok.extern.java.Log; - -@Log public class ViewRequestOne implements ViewRequest { + @java.lang.SuppressWarnings("all") + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(ViewRequestOne.class.getName()); @Override public void executeProcess() { log.info("---> executeProcess() - one "); } - } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestThree.java b/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestThree.java index 6183103..b7e53d0 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestThree.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestThree.java @@ -1,13 +1,11 @@ package designpatterns.creational.factorymethod; -import lombok.extern.java.Log; - -@Log public class ViewRequestThree implements ViewRequest { + @java.lang.SuppressWarnings("all") + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(ViewRequestThree.class.getName()); @Override public void executeProcess() { log.info("---> executeProcess() - three "); } - } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestTwo.java b/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestTwo.java index 3103d9b..2a4dbb0 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestTwo.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/factorymethod/ViewRequestTwo.java @@ -1,13 +1,11 @@ package designpatterns.creational.factorymethod; -import lombok.extern.java.Log; - -@Log public class ViewRequestTwo implements ViewRequest { + @java.lang.SuppressWarnings("all") + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(ViewRequestTwo.class.getName()); @Override public void executeProcess() { - log.info("---> executeProcess() - two "); + log.info("---> executeProcess() - two "); } - } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/prototype/Employee.java b/java-design-patterns/src/main/java/designpatterns/creational/prototype/Employee.java index ba93af7..a813be2 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/prototype/Employee.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/prototype/Employee.java @@ -1,10 +1,6 @@ package designpatterns.creational.prototype; -import lombok.Data; - -@Data public class Employee implements Cloneable { - private String name; private Integer age; private EmployeeAddress address; @@ -18,17 +14,82 @@ public Employee(String name, Integer age, EmployeeAddress address) { @Override public Object clone() throws CloneNotSupportedException { Employee employee = (Employee) super.clone(); - //deep copy - employee.setAddress( - new EmployeeAddress( - this.getAddress().getHouseNo(), - this.getAddress().getStreet(), - this.getAddress().getCity()) - ); + employee.setAddress(new EmployeeAddress(this.getAddress().getHouseNo(), this.getAddress().getStreet(), this.getAddress().getCity())); return employee; + } + + @java.lang.SuppressWarnings("all") + public String getName() { + return this.name; + } + @java.lang.SuppressWarnings("all") + public Integer getAge() { + return this.age; } + @java.lang.SuppressWarnings("all") + public EmployeeAddress getAddress() { + return this.address; + } + + @java.lang.SuppressWarnings("all") + public void setName(final String name) { + this.name = name; + } + @java.lang.SuppressWarnings("all") + public void setAge(final Integer age) { + this.age = age; + } + + @java.lang.SuppressWarnings("all") + public void setAddress(final EmployeeAddress address) { + this.address = address; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof Employee)) return false; + final Employee other = (Employee) o; + if (!other.canEqual((java.lang.Object) this)) return false; + final java.lang.Object this$age = this.getAge(); + final java.lang.Object other$age = other.getAge(); + if (this$age == null ? other$age != null : !this$age.equals(other$age)) return false; + final java.lang.Object this$name = this.getName(); + final java.lang.Object other$name = other.getName(); + if (this$name == null ? other$name != null : !this$name.equals(other$name)) return false; + final java.lang.Object this$address = this.getAddress(); + final java.lang.Object other$address = other.getAddress(); + if (this$address == null ? other$address != null : !this$address.equals(other$address)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof Employee; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final java.lang.Object $age = this.getAge(); + result = result * PRIME + ($age == null ? 43 : $age.hashCode()); + final java.lang.Object $name = this.getName(); + result = result * PRIME + ($name == null ? 43 : $name.hashCode()); + final java.lang.Object $address = this.getAddress(); + result = result * PRIME + ($address == null ? 43 : $address.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "Employee(name=" + this.getName() + ", age=" + this.getAge() + ", address=" + this.getAddress() + ")"; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/prototype/EmployeeAddress.java b/java-design-patterns/src/main/java/designpatterns/creational/prototype/EmployeeAddress.java index d76fad4..3d6d3f0 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/prototype/EmployeeAddress.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/prototype/EmployeeAddress.java @@ -1,12 +1,6 @@ package designpatterns.creational.prototype; -import lombok.Getter; -import lombok.ToString; - -@Getter -@ToString public class EmployeeAddress { - private String houseNo; private String street; private String city; @@ -18,4 +12,24 @@ public EmployeeAddress(String houseNo, String street, String city) { this.city = city; } + @java.lang.SuppressWarnings("all") + public String getHouseNo() { + return this.houseNo; + } + + @java.lang.SuppressWarnings("all") + public String getStreet() { + return this.street; + } + + @java.lang.SuppressWarnings("all") + public String getCity() { + return this.city; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "EmployeeAddress(houseNo=" + this.getHouseNo() + ", street=" + this.getStreet() + ", city=" + this.getCity() + ")"; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/creational/singleton/DatabaseConfig.java b/java-design-patterns/src/main/java/designpatterns/creational/singleton/DatabaseConfig.java index 42255d5..0c12fe3 100644 --- a/java-design-patterns/src/main/java/designpatterns/creational/singleton/DatabaseConfig.java +++ b/java-design-patterns/src/main/java/designpatterns/creational/singleton/DatabaseConfig.java @@ -1,18 +1,10 @@ package designpatterns.creational.singleton; -import lombok.Getter; -import lombok.ToString; - import java.io.Serializable; -@Getter -@ToString public class DatabaseConfig implements Serializable { - private static final long serialVersionUID = 3374603135957280336L; - private static DatabaseConfig instance; - private String url; private String port; private String user; @@ -32,4 +24,29 @@ public static DatabaseConfig getInstance() { return instance; } + @java.lang.SuppressWarnings("all") + public String getUrl() { + return this.url; + } + + @java.lang.SuppressWarnings("all") + public String getPort() { + return this.port; + } + + @java.lang.SuppressWarnings("all") + public String getUser() { + return this.user; + } + + @java.lang.SuppressWarnings("all") + public String getPass() { + return this.pass; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "DatabaseConfig(url=" + this.getUrl() + ", port=" + this.getPort() + ", user=" + this.getUser() + ", pass=" + this.getPass() + ")"; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/structural/AppStructural.java b/java-design-patterns/src/main/java/designpatterns/structural/AppStructural.java index 00fc7b4..385b612 100644 --- a/java-design-patterns/src/main/java/designpatterns/structural/AppStructural.java +++ b/java-design-patterns/src/main/java/designpatterns/structural/AppStructural.java @@ -5,32 +5,26 @@ import designpatterns.structural.facade.FachadaServiceImpl; import designpatterns.structural.proxy.CuentaBancaria; import designpatterns.structural.proxy.CuentaServiceProxy; -import lombok.extern.java.Log; - import java.io.IOException; import java.math.BigDecimal; -@Log public class AppStructural { + @java.lang.SuppressWarnings("all") + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(AppStructural.class.getName()); public static void main(String[] args) throws IOException { - // Facade pattern ------------------------------- FachadaServiceImpl fachadaServiceImpl = new FachadaServiceImpl(); String result = fachadaServiceImpl.buscar(new FachadaRequest("25/12/2019", "28/12/2018", "Guadalajara", "Vallarta")); log.info(result); - // Decorator pattern ------------------------------- Cuenta cuenta = new Cuenta(1L, "Froy"); CuentaService cuentaService1 = new CuentaAhorroServiceImpl(); cuentaService1.abrirCuenta(cuenta); - CuentaService cuentaService2 = new CuentaCorrienteServiceImpl(); cuentaService2.abrirCuenta(cuenta); - CuentaService cuentaService3 = new BlindajeDecorador(new CuentaCorrienteServiceImpl()); cuentaService3.abrirCuenta(cuenta); - // Proxy pattern ------------------------------- CuentaBancaria cuentaBancaria = new CuentaBancaria(25L, "Froy", BigDecimal.TEN); designpatterns.structural.proxy.CuentaService cuentaService = new CuentaServiceProxy(); @@ -39,7 +33,5 @@ public static void main(String[] args) throws IOException { cuentaService.mostrar(cuentaBancaria); cuentaService.retirar(cuentaBancaria, new BigDecimal("35")); cuentaService.mostrar(cuentaBancaria); - } - } diff --git a/java-design-patterns/src/main/java/designpatterns/structural/decorator/Cuenta.java b/java-design-patterns/src/main/java/designpatterns/structural/decorator/Cuenta.java index f9e8b8f..836f931 100644 --- a/java-design-patterns/src/main/java/designpatterns/structural/decorator/Cuenta.java +++ b/java-design-patterns/src/main/java/designpatterns/structural/decorator/Cuenta.java @@ -1,13 +1,18 @@ package designpatterns.structural.decorator; -import lombok.AllArgsConstructor; -import lombok.ToString; - -@ToString -@AllArgsConstructor public class Cuenta { - private Long id; private String name; + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "Cuenta(id=" + this.id + ", name=" + this.name + ")"; + } + + @java.lang.SuppressWarnings("all") + public Cuenta(final Long id, final String name) { + this.id = id; + this.name = name; + } } diff --git a/java-design-patterns/src/main/java/designpatterns/structural/proxy/CuentaBancaria.java b/java-design-patterns/src/main/java/designpatterns/structural/proxy/CuentaBancaria.java index da48018..d5b9b59 100644 --- a/java-design-patterns/src/main/java/designpatterns/structural/proxy/CuentaBancaria.java +++ b/java-design-patterns/src/main/java/designpatterns/structural/proxy/CuentaBancaria.java @@ -1,16 +1,90 @@ package designpatterns.structural.proxy; -import lombok.AllArgsConstructor; -import lombok.Data; - import java.math.BigDecimal; -@Data -@AllArgsConstructor public class CuentaBancaria { - private Long idCuenta; private String nombre; private BigDecimal saldo; + @java.lang.SuppressWarnings("all") + public Long getIdCuenta() { + return this.idCuenta; + } + + @java.lang.SuppressWarnings("all") + public String getNombre() { + return this.nombre; + } + + @java.lang.SuppressWarnings("all") + public BigDecimal getSaldo() { + return this.saldo; + } + + @java.lang.SuppressWarnings("all") + public void setIdCuenta(final Long idCuenta) { + this.idCuenta = idCuenta; + } + + @java.lang.SuppressWarnings("all") + public void setNombre(final String nombre) { + this.nombre = nombre; + } + + @java.lang.SuppressWarnings("all") + public void setSaldo(final BigDecimal saldo) { + this.saldo = saldo; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof CuentaBancaria)) return false; + final CuentaBancaria other = (CuentaBancaria) o; + if (!other.canEqual((java.lang.Object) this)) return false; + final java.lang.Object this$idCuenta = this.getIdCuenta(); + final java.lang.Object other$idCuenta = other.getIdCuenta(); + if (this$idCuenta == null ? other$idCuenta != null : !this$idCuenta.equals(other$idCuenta)) return false; + final java.lang.Object this$nombre = this.getNombre(); + final java.lang.Object other$nombre = other.getNombre(); + if (this$nombre == null ? other$nombre != null : !this$nombre.equals(other$nombre)) return false; + final java.lang.Object this$saldo = this.getSaldo(); + final java.lang.Object other$saldo = other.getSaldo(); + if (this$saldo == null ? other$saldo != null : !this$saldo.equals(other$saldo)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof CuentaBancaria; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final java.lang.Object $idCuenta = this.getIdCuenta(); + result = result * PRIME + ($idCuenta == null ? 43 : $idCuenta.hashCode()); + final java.lang.Object $nombre = this.getNombre(); + result = result * PRIME + ($nombre == null ? 43 : $nombre.hashCode()); + final java.lang.Object $saldo = this.getSaldo(); + result = result * PRIME + ($saldo == null ? 43 : $saldo.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "CuentaBancaria(idCuenta=" + this.getIdCuenta() + ", nombre=" + this.getNombre() + ", saldo=" + this.getSaldo() + ")"; + } + + @java.lang.SuppressWarnings("all") + public CuentaBancaria(final Long idCuenta, final String nombre, final BigDecimal saldo) { + this.idCuenta = idCuenta; + this.nombre = nombre; + this.saldo = saldo; + } } diff --git a/java-ejercicios/src/main/java/enums/EnumTest.java b/java-ejercicios/src/main/java/enums/EnumTest.java index a907481..9ff6c6c 100644 --- a/java-ejercicios/src/main/java/enums/EnumTest.java +++ b/java-ejercicios/src/main/java/enums/EnumTest.java @@ -1,25 +1,10 @@ package enums; -import lombok.AllArgsConstructor; - import java.util.EnumSet; -@AllArgsConstructor public enum EnumTest { - - ENUM_TEST1(1), - ENUM_TEST2(2), - ENUM_TEST3(3), - ENUM_TEST4(4), - ENUM_TEST5(5), - ENUM_TEST6(6), - ENUM_TEST7(7), - ENUM_TEST8(8), - ENUM_TEST9(9), - ENUM_TEST10(10); - + ENUM_TEST1(1), ENUM_TEST2(2), ENUM_TEST3(3), ENUM_TEST4(4), ENUM_TEST5(5), ENUM_TEST6(6), ENUM_TEST7(7), ENUM_TEST8(8), ENUM_TEST9(9), ENUM_TEST10(10); private int value; - private static final EnumSet TEST_6_7 = EnumSet.of(ENUM_TEST6, ENUM_TEST7); public static boolean is6or7(EnumTest value) { @@ -27,9 +12,13 @@ public static boolean is6or7(EnumTest value) { } public static void method(EnumSet eset) { - if(eset.containsAll(EnumSet.of(EnumTest.ENUM_TEST1, EnumTest.ENUM_TEST2))) { - // do something. + if (eset.containsAll(EnumSet.of(EnumTest.ENUM_TEST1, EnumTest.ENUM_TEST2))) { } + // do something. } + @java.lang.SuppressWarnings("all") + private EnumTest(final int value) { + this.value = value; + } } diff --git a/java-ejercicios/src/main/java/junit/things/ModelA.java b/java-ejercicios/src/main/java/junit/things/ModelA.java index 059b18a..9ef14d5 100644 --- a/java-ejercicios/src/main/java/junit/things/ModelA.java +++ b/java-ejercicios/src/main/java/junit/things/ModelA.java @@ -1,13 +1,11 @@ package junit.things; -import lombok.extern.java.Log; -import lombok.extern.slf4j.Slf4j; -@Log public class ModelA { + @java.lang.SuppressWarnings("all") + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(ModelA.class.getName()); - public void elMetodo(){ + public void elMetodo() { log.info("@@@ elMetodo() :: ModelA :: "); } - } diff --git a/java-ejercicios/src/main/java/quick/AppQuick.java b/java-ejercicios/src/main/java/quick/AppQuick.java index db3e0bf..cff5614 100644 --- a/java-ejercicios/src/main/java/quick/AppQuick.java +++ b/java-ejercicios/src/main/java/quick/AppQuick.java @@ -1,12 +1,10 @@ package quick; -import lombok.extern.java.Log; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.text.RandomStringGenerator; - import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; @@ -17,12 +15,12 @@ import java.security.spec.KeySpec; import java.text.ParseException; import java.util.*; - import static org.apache.commons.text.CharacterPredicates.DIGITS; import static org.apache.commons.text.CharacterPredicates.LETTERS; -@Log public class AppQuick { + @java.lang.SuppressWarnings("all") + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(AppQuick.class.getName()); public static void main(String[] args) throws Exception { //whenIsEncryptedAndDecrypted_thenDecryptedEqualsOriginal(); @@ -30,165 +28,120 @@ public static void main(String[] args) throws Exception { } public static void whenIsEncryptedAndDecrypted_thenDecryptedEqualsOriginal() throws Exception { - //https://www.baeldung.com/java-secure-random byte[] salt = new byte[32]; - SecureRandom random = SecureRandom.getInstance("SHA1PRNG"); //apply Default algorithm -> SHA1PRNG random.nextBytes(salt); //apply random to salt variable. - //TODO: PBEKeySpec -> https://stackoverrun.com/es/q/1527120 KeySpec spec = new PBEKeySpec("passwordm".toCharArray(), salt, 65536, 256); // AES-256 SecretKeyFactory f = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); byte[] key = f.generateSecret(spec).getEncoded(); - Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); SecretKey secretKey = new SecretKeySpec(key, "AES"); - cipher.init(Cipher.ENCRYPT_MODE, secretKey); byte[] encryptedMessageBytes = cipher.doFinal("$Xolos197204".getBytes()); - Base64.Encoder encoder = Base64.getEncoder(); String base64Encoder = encoder.encodeToString(encryptedMessageBytes); System.out.println(base64Encoder); - Base64.Decoder decoder = Base64.getDecoder(); - cipher.init(Cipher.DECRYPT_MODE, secretKey); byte[] decryptedMessageBytes = cipher.doFinal(decoder.decode(base64Encoder)); System.out.println(new String(decryptedMessageBytes)); - - } - public static void quick9(){ + public static void quick9() { String[] headers = null; - - for(String header : headers){ + for (String header : headers) { System.out.println(header); } } - public static void quick10(){ + public static void quick10() { System.out.println(NumberUtils.isCreatable("2.33")); System.out.println(NumberUtils.isDigits("2.33")); System.out.println(NumberUtils.isParsable("2.33")); - System.out.println(NumberUtils.isCreatable("2.33f")); System.out.println(NumberUtils.isDigits("2.33f")); System.out.println(NumberUtils.isParsable("2.33f")); - System.out.println(NumberUtils.isCreatable("-2.33")); System.out.println(NumberUtils.isDigits("-2.33")); System.out.println(NumberUtils.isParsable("-2.33")); - System.out.println(NumberUtils.isCreatable("a")); System.out.println(NumberUtils.isDigits("a")); System.out.println(NumberUtils.isParsable("a")); - System.out.println(NumberUtils.isCreatable("")); System.out.println(NumberUtils.isDigits("")); System.out.println(NumberUtils.isParsable("")); - System.out.println(NumberUtils.isCreatable(null)); System.out.println(NumberUtils.isDigits(null)); System.out.println(NumberUtils.isParsable(null)); - System.out.println(NumberUtils.isCreatable("0")); System.out.println(NumberUtils.isDigits("0")); System.out.println(NumberUtils.isParsable("0")); - } - public static void quick8(){ + public static void quick8() { System.out.println(RandomStringUtils.randomAlphanumeric(4)); - - String returnStr = new RandomStringGenerator.Builder() // - .withinRange('0', 'z') // - .filteredBy(LETTERS,DIGITS) - .build() - .generate(4); - + String returnStr = // + // + new RandomStringGenerator.Builder().withinRange('0', 'z').filteredBy(LETTERS, DIGITS).build().generate(4); System.out.println(returnStr); - } - public static void quick7(){ - - Map map = new HashMap<>(); - map.put("1","uno"); + public static void quick7() { + Map map = new HashMap<>(); + map.put("1", "uno"); // map.put("2","dos"); - map.put("3","tres"); + map.put("3", "tres"); // map.put("4","cuatro"); - List listString = new ArrayList<>(map.keySet()); - List listInteger = new ArrayList<>(); listInteger.add("11"); listInteger.add("22"); listInteger.add("33"); listInteger.add("44"); - System.out.println(listInteger); System.out.println(listInteger.stream().sorted()); - Collections.reverse(listString); - for(String index : listString){ + for (String index : listString) { listInteger.remove(Integer.valueOf(index)); } - listInteger.remove(1); - System.out.println(listInteger); - - List list = Arrays.asList("node", "java", "c++", "react", "javascript"); String result = list.stream().reduce((first, second) -> second).orElse("no last element"); System.out.println(result); - } - public static void quick6(){ - + public static void quick6() { BigDecimal bigDecimalA = new BigDecimal(50); BigDecimal bigDecimalB = new BigDecimal(49); - System.out.println(bigDecimalA.compareTo(bigDecimalB) > 0); - Persona persona = new Persona(); persona.setNombre("Loco"); System.out.println(Optional.ofNullable(persona).map(Persona::getNombre).orElse("Chato")); - } - public static void quick5(){ + public static void quick5() { Integer psnId = null; - - Map map = new HashMap<>(); - map.put("psnId",psnId); - + Map map = new HashMap<>(); + map.put("psnId", psnId); System.out.println(map.get("psnId")); - System.out.println(map); } - public static void quick4(){ - + public static void quick4() { // Integer valorA = Integer.valueOf("1"); Integer valorA = null; // int valorA = 1; // Long valorA = 1L; Integer valorB = 1; - //System.out.println(valorA != valorB); //System.out.println(valorA.equals(valorB)); NPE - System.out.println(!Objects.equals(valorA,valorB)); - - - + System.out.println(!Objects.equals(valorA, valorB)); } - public static void quick3(){ + public static void quick3() { List listString = null; System.out.println(listString.isEmpty()); } @@ -198,10 +151,8 @@ public void quick2() { } public void quick1() { - String inputMask = "MM/dd/yyyy"; String stringData = "05/25/2020 12:13"; - try { stringData = StringUtils.substring(stringData, 0, inputMask.length()); Date date = DateUtils.parseDateStrictly(stringData, inputMask); @@ -209,9 +160,9 @@ public void quick1() { } catch (ParseException pe) { pe.printStackTrace(); } - } + static class Persona { private String nombre; @@ -223,5 +174,4 @@ public void setNombre(String nombre) { this.nombre = nombre; } } - } diff --git a/java-ejercicios/src/main/java/quick/OptionalTest.java b/java-ejercicios/src/main/java/quick/OptionalTest.java index a5c4eaf..54019f9 100644 --- a/java-ejercicios/src/main/java/quick/OptionalTest.java +++ b/java-ejercicios/src/main/java/quick/OptionalTest.java @@ -1,58 +1,113 @@ package quick; -import lombok.AllArgsConstructor; -import lombok.Data; - import java.util.Optional; public class OptionalTest { - public static void main(String[] args) { quickTest2(); } - @Data + static class Player { private Short status; + + @java.lang.SuppressWarnings("all") + public Player() { + } + + @java.lang.SuppressWarnings("all") + public Short getStatus() { + return this.status; + } + + @java.lang.SuppressWarnings("all") + public void setStatus(final Short status) { + this.status = status; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof OptionalTest.Player)) return false; + final OptionalTest.Player other = (OptionalTest.Player) o; + if (!other.canEqual((java.lang.Object) this)) return false; + final java.lang.Object this$status = this.getStatus(); + final java.lang.Object other$status = other.getStatus(); + if (this$status == null ? other$status != null : !this$status.equals(other$status)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof OptionalTest.Player; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final java.lang.Object $status = this.getStatus(); + result = result * PRIME + ($status == null ? 43 : $status.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "OptionalTest.Player(status=" + this.getStatus() + ")"; + } } - @AllArgsConstructor + static class House { Optional room; public Optional getRoom() { return room; } + + @java.lang.SuppressWarnings("all") + public House(final Optional room) { + this.room = room; + } } - @AllArgsConstructor + static class Room { Optional table; public Optional
getTable() { return table; } + + @java.lang.SuppressWarnings("all") + public Room(final Optional
table) { + this.table = table; + } } - @AllArgsConstructor + static class Table { String colour; public String getColour() { return colour; } + + @java.lang.SuppressWarnings("all") + public Table(final String colour) { + this.colour = colour; + } } private static void quickTest2() { //Player player = null; Player player = new Player(); player.setStatus(new Short("6")); - - Short statusCode = Optional.ofNullable(player) - .map(Player::getStatus).orElse(new Short("3")); - + Short statusCode = Optional.ofNullable(player).map(Player::getStatus).orElse(new Short("3")); System.out.println(statusCode); - } private static void quickTest1() { @@ -62,23 +117,14 @@ private static void quickTest1() { // .filter(e -> e.getColour() == "black") // .isPresent(); // System.out.println(isBlueTable); - Table tableNULL = null; Table tableEMPTY = new Table(""); Table tableOK = new Table("Froylán Aguilar"); - Room roomOK = new Room(Optional.of(tableNULL)); House houseOK = new House(Optional.of(roomOK)); House houseNULL = null; - // String tableColour = Optional.ofNullable(houseNULL) - String tableColour = Optional.ofNullable(houseNULL) - .flatMap(House::getRoom) - .flatMap(Room::getTable) - .map(Table::getColour) - .orElse("black"); - + String tableColour = Optional.ofNullable(houseNULL).flatMap(House::getRoom).flatMap(Room::getTable).map(Table::getColour).orElse("black"); System.out.println(tableColour); } - } diff --git a/java-ejercicios/src/main/java/quick/optional/Engine.java b/java-ejercicios/src/main/java/quick/optional/Engine.java index 6f95b0c..68ac045 100644 --- a/java-ejercicios/src/main/java/quick/optional/Engine.java +++ b/java-ejercicios/src/main/java/quick/optional/Engine.java @@ -1,12 +1,55 @@ package quick.optional; -import lombok.Data; - import java.util.Optional; -@Data public class Engine { - private Optional velocityMonitor; + @java.lang.SuppressWarnings("all") + public Engine() { + } + + @java.lang.SuppressWarnings("all") + public Optional getVelocityMonitor() { + return this.velocityMonitor; + } + + @java.lang.SuppressWarnings("all") + public void setVelocityMonitor(final Optional velocityMonitor) { + this.velocityMonitor = velocityMonitor; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof Engine)) return false; + final Engine other = (Engine) o; + if (!other.canEqual((java.lang.Object) this)) return false; + final java.lang.Object this$velocityMonitor = this.getVelocityMonitor(); + final java.lang.Object other$velocityMonitor = other.getVelocityMonitor(); + if (this$velocityMonitor == null ? other$velocityMonitor != null : !this$velocityMonitor.equals(other$velocityMonitor)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof Engine; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final java.lang.Object $velocityMonitor = this.getVelocityMonitor(); + result = result * PRIME + ($velocityMonitor == null ? 43 : $velocityMonitor.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "Engine(velocityMonitor=" + this.getVelocityMonitor() + ")"; + } } diff --git a/java-ejercicios/src/main/java/quick/optional/Spaceship.java b/java-ejercicios/src/main/java/quick/optional/Spaceship.java index 05714c0..9be0f5a 100644 --- a/java-ejercicios/src/main/java/quick/optional/Spaceship.java +++ b/java-ejercicios/src/main/java/quick/optional/Spaceship.java @@ -1,13 +1,71 @@ package quick.optional; -import lombok.Data; - import java.util.Optional; -@Data public class Spaceship { - private Optional engine; private String pilot; + @java.lang.SuppressWarnings("all") + public Spaceship() { + } + + @java.lang.SuppressWarnings("all") + public Optional getEngine() { + return this.engine; + } + + @java.lang.SuppressWarnings("all") + public String getPilot() { + return this.pilot; + } + + @java.lang.SuppressWarnings("all") + public void setEngine(final Optional engine) { + this.engine = engine; + } + + @java.lang.SuppressWarnings("all") + public void setPilot(final String pilot) { + this.pilot = pilot; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof Spaceship)) return false; + final Spaceship other = (Spaceship) o; + if (!other.canEqual((java.lang.Object) this)) return false; + final java.lang.Object this$engine = this.getEngine(); + final java.lang.Object other$engine = other.getEngine(); + if (this$engine == null ? other$engine != null : !this$engine.equals(other$engine)) return false; + final java.lang.Object this$pilot = this.getPilot(); + final java.lang.Object other$pilot = other.getPilot(); + if (this$pilot == null ? other$pilot != null : !this$pilot.equals(other$pilot)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof Spaceship; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final java.lang.Object $engine = this.getEngine(); + result = result * PRIME + ($engine == null ? 43 : $engine.hashCode()); + final java.lang.Object $pilot = this.getPilot(); + result = result * PRIME + ($pilot == null ? 43 : $pilot.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "Spaceship(engine=" + this.getEngine() + ", pilot=" + this.getPilot() + ")"; + } } diff --git a/java-ejercicios/src/main/java/quick/optional/Velocity.java b/java-ejercicios/src/main/java/quick/optional/Velocity.java index 562b092..7394aab 100644 --- a/java-ejercicios/src/main/java/quick/optional/Velocity.java +++ b/java-ejercicios/src/main/java/quick/optional/Velocity.java @@ -1,10 +1,53 @@ package quick.optional; -import lombok.Data; - -@Data public class Velocity { - private String data; + @java.lang.SuppressWarnings("all") + public Velocity() { + } + + @java.lang.SuppressWarnings("all") + public String getData() { + return this.data; + } + + @java.lang.SuppressWarnings("all") + public void setData(final String data) { + this.data = data; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof Velocity)) return false; + final Velocity other = (Velocity) o; + if (!other.canEqual((java.lang.Object) this)) return false; + final java.lang.Object this$data = this.getData(); + final java.lang.Object other$data = other.getData(); + if (this$data == null ? other$data != null : !this$data.equals(other$data)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof Velocity; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final java.lang.Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "Velocity(data=" + this.getData() + ")"; + } } diff --git a/java-ejercicios/src/main/java/quick/optional/VelocityMonitor.java b/java-ejercicios/src/main/java/quick/optional/VelocityMonitor.java index facf845..87296f2 100644 --- a/java-ejercicios/src/main/java/quick/optional/VelocityMonitor.java +++ b/java-ejercicios/src/main/java/quick/optional/VelocityMonitor.java @@ -1,10 +1,53 @@ package quick.optional; -import lombok.Data; - -@Data public class VelocityMonitor { - private Velocity velocity; + @java.lang.SuppressWarnings("all") + public VelocityMonitor() { + } + + @java.lang.SuppressWarnings("all") + public Velocity getVelocity() { + return this.velocity; + } + + @java.lang.SuppressWarnings("all") + public void setVelocity(final Velocity velocity) { + this.velocity = velocity; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof VelocityMonitor)) return false; + final VelocityMonitor other = (VelocityMonitor) o; + if (!other.canEqual((java.lang.Object) this)) return false; + final java.lang.Object this$velocity = this.getVelocity(); + final java.lang.Object other$velocity = other.getVelocity(); + if (this$velocity == null ? other$velocity != null : !this$velocity.equals(other$velocity)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof VelocityMonitor; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final java.lang.Object $velocity = this.getVelocity(); + result = result * PRIME + ($velocity == null ? 43 : $velocity.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "VelocityMonitor(velocity=" + this.getVelocity() + ")"; + } } diff --git a/java-ejercicios/src/main/java/todo/ejemplo1/AppEstudiante.java b/java-ejercicios/src/main/java/todo/ejemplo1/AppEstudiante.java index a4a4a0a..ac1ae0f 100644 --- a/java-ejercicios/src/main/java/todo/ejemplo1/AppEstudiante.java +++ b/java-ejercicios/src/main/java/todo/ejemplo1/AppEstudiante.java @@ -1,18 +1,15 @@ package todo.ejemplo1; -import lombok.extern.java.Log; import org.apache.commons.lang3.StringUtils; -@Log public class AppEstudiante { + @java.lang.SuppressWarnings("all") + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(AppEstudiante.class.getName()); public static void main(String[] args) { - - - log.info( "" + StringUtils.isAnyBlank(null,null)); //true - log.info( "" + StringUtils.isAnyBlank("d"," ")); //true - log.info( "" + StringUtils.isAnyBlank("d"," e ")); //false - + log.info("" + StringUtils.isAnyBlank(null, null)); //true + log.info("" + StringUtils.isAnyBlank("d", " ")); //true + log.info("" + StringUtils.isAnyBlank("d", " e ")); //false /* * Métodos de referencia, solo funcionan con interfaces funcionales * y estos métodos de referencia no se le pasan parametros. @@ -20,9 +17,6 @@ public static void main(String[] args) { * */ IEstudiante ie = Estudiante::new; Estudiante estudiante = ie.crear(); - System.out.print(estudiante); - } - } diff --git a/java-ejercicios/src/main/java/todo/ejemplo1/Estudiante.java b/java-ejercicios/src/main/java/todo/ejemplo1/Estudiante.java index 1a913f5..39b1234 100644 --- a/java-ejercicios/src/main/java/todo/ejemplo1/Estudiante.java +++ b/java-ejercicios/src/main/java/todo/ejemplo1/Estudiante.java @@ -1,12 +1,8 @@ package todo.ejemplo1; -import lombok.Data; - import java.util.ArrayList; -@Data public class Estudiante { - private ArrayList scores; private double average; public static String ATRIBUTO_ESTATICO = "ESTATICO1"; @@ -23,4 +19,60 @@ public Estudiante() { computeAverage(); } + @java.lang.SuppressWarnings("all") + public ArrayList getScores() { + return this.scores; + } + + @java.lang.SuppressWarnings("all") + public double getAverage() { + return this.average; + } + + @java.lang.SuppressWarnings("all") + public void setScores(final ArrayList scores) { + this.scores = scores; + } + + @java.lang.SuppressWarnings("all") + public void setAverage(final double average) { + this.average = average; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof Estudiante)) return false; + final Estudiante other = (Estudiante) o; + if (!other.canEqual((java.lang.Object) this)) return false; + if (java.lang.Double.compare(this.getAverage(), other.getAverage()) != 0) return false; + final java.lang.Object this$scores = this.getScores(); + final java.lang.Object other$scores = other.getScores(); + if (this$scores == null ? other$scores != null : !this$scores.equals(other$scores)) return false; + return true; + } + + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof Estudiante; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + final long $average = java.lang.Double.doubleToLongBits(this.getAverage()); + result = result * PRIME + (int) ($average >>> 32 ^ $average); + final java.lang.Object $scores = this.getScores(); + result = result * PRIME + ($scores == null ? 43 : $scores.hashCode()); + return result; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "Estudiante(scores=" + this.getScores() + ", average=" + this.getAverage() + ")"; + } } diff --git a/java-ejercicios/src/test/java/euler/ProjectEulerServiceImplTest.java b/java-ejercicios/src/test/java/euler/ProjectEulerServiceImplTest.java index 2bf4149..1968dc6 100644 --- a/java-ejercicios/src/test/java/euler/ProjectEulerServiceImplTest.java +++ b/java-ejercicios/src/test/java/euler/ProjectEulerServiceImplTest.java @@ -1,6 +1,6 @@ package euler; -import lombok.extern.java.Log; +import java.util.logging.Logger; import org.junit.jupiter.api.*; import java.util.List; @@ -8,8 +8,9 @@ import static org.junit.jupiter.api.Assertions.*; @Tag("euler") -@Log + class ProjectEulerServiceImplTest { + private static final Logger log = Logger.getLogger(ProjectEulerServiceImplTest.class.getName()); private ProjectEulerService service; diff --git a/java-ejercicios/src/test/java/money/CurrencyUnitTest.java b/java-ejercicios/src/test/java/money/CurrencyUnitTest.java index 61da7de..ed04497 100644 --- a/java-ejercicios/src/test/java/money/CurrencyUnitTest.java +++ b/java-ejercicios/src/test/java/money/CurrencyUnitTest.java @@ -1,6 +1,6 @@ package money; -import lombok.extern.java.Log; +import java.util.logging.Logger; import org.javamoney.moneta.FastMoney; import org.javamoney.moneta.Money; import org.junit.jupiter.api.Test; @@ -13,8 +13,9 @@ import static org.junit.jupiter.api.Assertions.*; -@Log + public class CurrencyUnitTest { + private static final Logger log = Logger.getLogger(CurrencyUnitTest.class.getName()); @Test public void givenCurrencyCode_whenString_thanExist() { diff --git a/java-junit5/src/main/java/com/froyo/Fruit.java b/java-junit5/src/main/java/com/froyo/Fruit.java index 2982fcf..ed5fa4c 100644 --- a/java-junit5/src/main/java/com/froyo/Fruit.java +++ b/java-junit5/src/main/java/com/froyo/Fruit.java @@ -1,16 +1,43 @@ package com.froyo; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.ToString; - -@Data -@AllArgsConstructor -@ToString public class Fruit { long id; String name; String country; + public Fruit(long id, String name, String country) { + this.id = id; + this.name = name; + this.country = country; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + @Override + public String toString() { + return "Fruit(id=" + id + ", name=" + name + ", country=" + country + ")"; + } } diff --git a/java-junit5/src/main/java/com/froyo/junit5/Address.java b/java-junit5/src/main/java/com/froyo/junit5/Address.java index fb1e589..778627b 100644 --- a/java-junit5/src/main/java/com/froyo/junit5/Address.java +++ b/java-junit5/src/main/java/com/froyo/junit5/Address.java @@ -1,8 +1,5 @@ package com.froyo.junit5; -import lombok.Data; - -@Data public class Address { private String firstName; @@ -12,4 +9,20 @@ public Address(String firstName, String lastName) { this.firstName = firstName; this.lastName = lastName; } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } } diff --git a/java-junit5/src/main/java/com/froyo/mockitotest/LoginController.java b/java-junit5/src/main/java/com/froyo/mockitotest/LoginController.java index cb253c1..6738518 100644 --- a/java-junit5/src/main/java/com/froyo/mockitotest/LoginController.java +++ b/java-junit5/src/main/java/com/froyo/mockitotest/LoginController.java @@ -1,11 +1,12 @@ package com.froyo.mockitotest; -import lombok.extern.java.Log; +import java.util.logging.Logger; import javax.security.auth.login.LoginException; -@Log + public class LoginController { + private static final Logger log = Logger.getLogger(LoginController.class.getName()); public LoginService loginService = new LoginService(); diff --git a/java-junit5/src/main/java/com/froyo/mockitotest/UserForm.java b/java-junit5/src/main/java/com/froyo/mockitotest/UserForm.java index 9567433..a069f69 100644 --- a/java-junit5/src/main/java/com/froyo/mockitotest/UserForm.java +++ b/java-junit5/src/main/java/com/froyo/mockitotest/UserForm.java @@ -1,13 +1,28 @@ package com.froyo.mockitotest; -import lombok.AllArgsConstructor; -import lombok.Data; - -@Data -@AllArgsConstructor public class UserForm { public String username; public String password; + public UserForm(String username, String password) { + this.username = username; + this.password = password; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } } diff --git a/java-junit5/src/test/java/com/froyo/junit5/codevalues/PaisEnumTest.java b/java-junit5/src/test/java/com/froyo/junit5/codevalues/PaisEnumTest.java index 7218184..6776a68 100644 --- a/java-junit5/src/test/java/com/froyo/junit5/codevalues/PaisEnumTest.java +++ b/java-junit5/src/test/java/com/froyo/junit5/codevalues/PaisEnumTest.java @@ -1,6 +1,5 @@ package com.froyo.junit5.codevalues; -import lombok.extern.java.Log; import org.junit.jupiter.api.Test; import static com.froyo.junit5.codevalues.PaisEnum.ESTADOS_UNIDOS; @@ -8,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -@Log + class PaisEnumTest { @Test diff --git a/java-junit5/src/test/java/com/froyo/junit5/parameterizedTests/MethodSourceObjectsParameterizedTest.java b/java-junit5/src/test/java/com/froyo/junit5/parameterizedTests/MethodSourceObjectsParameterizedTest.java index 2a3d0be..e722eea 100644 --- a/java-junit5/src/test/java/com/froyo/junit5/parameterizedTests/MethodSourceObjectsParameterizedTest.java +++ b/java-junit5/src/test/java/com/froyo/junit5/parameterizedTests/MethodSourceObjectsParameterizedTest.java @@ -1,7 +1,5 @@ package com.froyo.junit5.parameterizedTests; -import lombok.AllArgsConstructor; -import lombok.Data; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -20,15 +18,38 @@ static Stream personProvider() { @ParameterizedTest @MethodSource("personProvider") void testWithPersonProvider(Person argument) { - System.out.println("Parameterized test with (Person) argument: " + argument); + System.out.println("Parameterized test with (Person) argument: " + argument); assertNotNull(argument); } - @Data - @AllArgsConstructor static class Person { String name; String surname; - } + Person(String name, String surname) { + this.name = name; + this.surname = surname; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSurname() { + return surname; + } + + public void setSurname(String surname) { + this.surname = surname; + } + + @Override + public String toString() { + return "Person(name=" + name + ", surname=" + surname + ")"; + } + } } diff --git a/java-junit5/src/test/java/com/froyo/junit5/parameterizedTests/OwnerTest.java b/java-junit5/src/test/java/com/froyo/junit5/parameterizedTests/OwnerTest.java index 3e93df6..f81a031 100644 --- a/java-junit5/src/test/java/com/froyo/junit5/parameterizedTests/OwnerTest.java +++ b/java-junit5/src/test/java/com/froyo/junit5/parameterizedTests/OwnerTest.java @@ -1,12 +1,11 @@ package com.froyo.junit5.parameterizedTests; -import lombok.extern.java.Log; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -@Log + public class OwnerTest { @DisplayName("Values Source Test - ") diff --git a/pom.xml b/pom.xml index 2c8c141..a1be73d 100644 --- a/pom.xml +++ b/pom.xml @@ -46,12 +46,6 @@ - - org.projectlombok - lombok - ${lombok.version} - provided - org.apache.commons commons-lang3 @@ -116,7 +110,6 @@ 3.3.3 2.2 - 1.18.38 3.10 1.8 2.0.0.Final