Atualizações gerais

manoelcampos · manoelcampos · commit e81d7055f0d8 · 2025-08-22T09:08:22.000-03:00
diff --git a/estruturais/01-adapter/captcha-adapters-v1/README.adoc b/estruturais/01-adapter/captcha-adapters-v1/README.adoc
@@ -17,3 +17,5 @@ aplicando o padrão de projetos Adapter. As bibliotecas adaptadas são:
 
 - https://github.com/mewebstudio/java-captcha-generator[Java Captcha Generator]
 - https://github.com/logicsquad/nanocaptcha[Nano Captcha]
+
+Você pode ver um vídeo sobre como foi feita esta implementação em https://youtu.be/ToG-RkqFmhI
diff --git a/estruturais/01-adapter/captcha-adapters-v1/pom.xml b/estruturais/01-adapter/captcha-adapters-v1/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
+		<version>3.5.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.github.manoelcampos</groupId>
@@ -14,7 +14,7 @@
 	<name>captcha-adapters</name>
 	<description>Um projeto de exemplo de como adapter bibliotecas de geração offline de captcha</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -30,11 +30,15 @@
 			<version>2.1</version>
 		</dependency>
 
-		<dependency>
+        <!--region Spring Dependencies-->
+        <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -51,6 +55,7 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <!--endregion-->
 	</dependencies>
 
 	<build>
diff --git a/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/AbstractCaptchaAdapter.java b/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/AbstractCaptchaAdapter.java
@@ -1,5 +1,7 @@
 package io.github.manoelcampos.captchaadapters.adapter;
 
+import java.util.Objects;
+
 /**
  * @author Manoel Campos
  */
@@ -8,6 +10,6 @@ abstract class AbstractCaptchaAdapter implements CaptchaAdapter {
 
     @Override
     public String getCodigo() {
-        return codigo == null ? "" : codigo;
+        return Objects.requireNonNullElse(codigo, "");
     }
 }
diff --git a/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/CaptchaAdapter.java b/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/CaptchaAdapter.java
@@ -14,9 +14,9 @@
 public interface CaptchaAdapter {
     byte[] gerar();
 
-    default boolean isValido(final String codigo){
-        // Faz comparação garantindo que não dará NullPointerException em caso algum dos parâmetros seja Null
-        return Objects.equals(codigo, getCodigo());
+    default boolean isValido(String codigo){
+        codigo = Objects.requireNonNullElse(codigo, "");
+        return codigo.equalsIgnoreCase(getCodigo());
     }
 
     String getCodigo();
diff --git a/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/controllers/CaptchaController.java b/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/controllers/CaptchaController.java
@@ -1,6 +1,8 @@
 package io.github.manoelcampos.captchaadapters.controllers;
 
 import io.github.manoelcampos.captchaadapters.adapter.CaptchaAdapter;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,7 +30,7 @@ public byte[] gerar(){
     }
 
     @GetMapping("/confirmar/{codigo}")
-    public boolean confirmar(@PathVariable final String codigo){
+    public boolean confirmar(@PathVariable @Valid @NotNull final String codigo){
         return captcha.isValido(codigo);
     }
 }
diff --git a/estruturais/01-adapter/captcha-adapters-v2-template-method/pom.xml b/estruturais/01-adapter/captcha-adapters-v2-template-method/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
+		<version>3.5.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.github.manoelcampos</groupId>
@@ -14,7 +14,7 @@
 	<name>captcha-adapters-template-method</name>
 	<description>Um projeto de exemplo de como adapter bibliotecas de geração offline de captcha e ainda implementar o padrão template method para remover duplicação de código</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -30,11 +30,15 @@
 			<version>1.5</version>
 		</dependency>
 
-		<dependency>
+        <!--region Spring Dependencies-->
+        <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -51,6 +55,7 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <!--endregion-->
 	</dependencies>
 
 	<build>
diff --git a/estruturais/01-adapter/captcha-adapters-v2-template-method/src/main/java/io/github/manoelcampos/captchaadapters/adapter/CaptchaAdapter.java b/estruturais/01-adapter/captcha-adapters-v2-template-method/src/main/java/io/github/manoelcampos/captchaadapters/adapter/CaptchaAdapter.java
@@ -14,9 +14,9 @@
 public interface CaptchaAdapter {
     byte[] gerar();
 
-    default boolean isValido(final String codigo){
-        // Faz comparação garantindo que não dará NullPointerException em caso algum dos parâmetros seja Null
-        return Objects.equals(codigo, getCodigo());
+    default boolean isValido(String codigo){
+        codigo = Objects.requireNonNullElse(codigo, "");
+        return codigo.equalsIgnoreCase(getCodigo());
     }
 
     String getCodigo();
diff --git a/estruturais/01-adapter/captcha-adapters-v2-template-method/src/main/java/io/github/manoelcampos/captchaadapters/controllers/CaptchaController.java b/estruturais/01-adapter/captcha-adapters-v2-template-method/src/main/java/io/github/manoelcampos/captchaadapters/controllers/CaptchaController.java
@@ -1,6 +1,8 @@
 package io.github.manoelcampos.captchaadapters.controllers;
 
 import io.github.manoelcampos.captchaadapters.adapter.CaptchaAdapter;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +27,7 @@ public byte[] gerar(){
     }
 
     @GetMapping("/confirmar/{codigo}")
-    public boolean confirmar(@PathVariable final String codigo){
+    public boolean confirmar(@PathVariable @Valid @NotNull final String codigo){
         return captcha.isValido(codigo);
     }
 }
diff --git a/estruturais/01-adapter/captcha-v1-sem-adapter/pom.xml b/estruturais/01-adapter/captcha-v1-sem-adapter/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
+		<version>3.5.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.github.manoelcampos</groupId>
@@ -14,7 +14,7 @@
 	<name>captcha-adapters</name>
 	<description>Um projeto de exemplo de como adapter bibliotecas de geração offline de captcha</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -30,11 +30,15 @@
 			<version>2.1</version>
 		</dependency>
 
+        <!--region Spring Dependencies-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -51,6 +55,7 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <!--endregion-->
 	</dependencies>
 
 	<build>
diff --git a/estruturais/01-adapter/captcha-v1-sem-adapter/src/main/java/io/github/manoelcampos/captchaadapters/controllers/CaptchaController.java b/estruturais/01-adapter/captcha-v1-sem-adapter/src/main/java/io/github/manoelcampos/captchaadapters/controllers/CaptchaController.java
@@ -1,7 +1,12 @@
 package io.github.manoelcampos.captchaadapters.controllers;
 
 import com.mewebstudio.captcha.Captcha;
+
+import java.util.Objects;
+
 import com.mewebstudio.captcha.GeneratedCaptcha;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -27,7 +32,7 @@ public byte[] gerar(){
     }
 
     @GetMapping("/confirmar/{codigo}")
-    public boolean confirmar(@PathVariable final String codigo){
-        return generatedCaptcha != null && codigo.equals(generatedCaptcha.getCode());
+    public boolean confirmar(@PathVariable @Valid @NotNull final String codigo){
+        return generatedCaptcha != null && codigo.equalsIgnoreCase(generatedCaptcha.getCode());
     }
 }
diff --git a/exercicios/calculo-desconto/src/main/java/com/manoelcampos/desconto/Venda.java b/exercicios/calculo-desconto/src/main/java/com/manoelcampos/desconto/Venda.java
@@ -19,4 +19,36 @@ public Venda(Cliente cliente, LocalDate data, double valorTotal) {
         this.data = data;
         this.valorTotal = valorTotal;
     }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Cliente getCliente() {
+        return cliente;
+    }
+
+    public void setCliente(Cliente cliente) {
+        this.cliente = cliente;
+    }
+
+    public LocalDate getData() {
+        return data;
+    }
+
+    public void setData(LocalDate data) {
+        this.data = data;
+    }
+
+    public double getValorTotal() {
+        return valorTotal;
+    }
+
+    public void setValorTotal(double valorTotal) {
+        this.valorTotal = valorTotal;
+    }
 }
diff --git a/exercicios/envio-mensagens/README.adoc b/exercicios/envio-mensagens/README.adoc
@@ -23,7 +23,7 @@ No entanto, você não quer ficar escrevendo `if()` em todos os locais onde prec
 
 Faça as alterações necessárias no projeto atual e implemente um padrão para resolver os problemas mencionados.
 
-> O projeto requer JDK 11 ou superior.
+> O projeto requer JDK 21 ou superior.
 
 == Responda
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package io.github.manoelcampos.captchaadapters.adapter;`
`2`	`2`
	`3`	`+import java.util.Objects;`
	`4`	`+`
`3`	`5`	`/**`
`4`	`6`	`* @author Manoel Campos`
`5`	`7`	`*/`
`@@ -8,6 +10,6 @@ abstract class AbstractCaptchaAdapter implements CaptchaAdapter {`
`8`	`10`
`9`	`11`	`@Override`
`10`	`12`	`public String getCodigo() {`
`11`		`- return codigo == null ? "" : codigo;`
	`13`	`+ return Objects.requireNonNullElse(codigo, "");`
`12`	`14`	`}`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package io.github.manoelcampos.captchaadapters.controllers;`
`2`	`2`
`3`	`3`	`import io.github.manoelcampos.captchaadapters.adapter.CaptchaAdapter;`
	`4`	`+import jakarta.validation.Valid;`
	`5`	`+import jakarta.validation.constraints.NotNull;`
`4`	`6`	`import org.springframework.beans.factory.annotation.Autowired;`
`5`	`7`	`import org.springframework.http.MediaType;`
`6`	`8`	`import org.springframework.web.bind.annotation.GetMapping;`
`@@ -28,7 +30,7 @@ public byte[] gerar(){`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`@GetMapping("/confirmar/{codigo}")`
`31`		`- public boolean confirmar(@PathVariable final String codigo){`
	`33`	`+ public boolean confirmar(@PathVariable @Valid @NotNull final String codigo){`
`32`	`34`	`return captcha.isValido(codigo);`
`33`	`35`	`}`
`34`	`36`	`}`