From 24bcb90396081a71ecb4561c900c5623e9ba6836 Mon Sep 17 00:00:00 2001
From: Manoel Campos <manoelcampos@gmail.com>
Date: Mon, 10 Feb 2025 11:14:40 -0300
Subject: [PATCH] Atualiza projetos captcha

Signed-off-by: Manoel Campos <manoelcampos@gmail.com>
---
 estruturais/01-adapter/captcha-adapters-v1/pom.xml    |  2 +-
 .../adapter/CaptchaGeneratorAdapter.java              |  4 ----
 .../captchaadapters/adapter/NanoCaptchaAdapter.java   |  6 +++---
 .../controllers/CaptchaController.java                | 11 +++++++----
 estruturais/01-adapter/captcha-v1-sem-adapter/pom.xml |  2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/estruturais/01-adapter/captcha-adapters-v1/pom.xml b/estruturais/01-adapter/captcha-adapters-v1/pom.xml
index b241afc39..aee10be71 100644
--- a/estruturais/01-adapter/captcha-adapters-v1/pom.xml
+++ b/estruturais/01-adapter/captcha-adapters-v1/pom.xml
@@ -27,7 +27,7 @@
 			<!-- https://github.com/logicsquad/nanocaptcha -->
 			<groupId>net.logicsquad</groupId>
 			<artifactId>nanocaptcha</artifactId>
-			<version>1.5</version>
+			<version>2.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/CaptchaGeneratorAdapter.java b/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/CaptchaGeneratorAdapter.java
index 48529a4b9..e8f636d47 100644
--- a/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/CaptchaGeneratorAdapter.java
+++ b/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/CaptchaGeneratorAdapter.java
@@ -1,15 +1,11 @@
 package io.github.manoelcampos.captchaadapters.adapter;
 
 import com.mewebstudio.captcha.Captcha;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.annotation.SessionScope;
 
 /**
  * @author Manoel Campos
  * @see <a href="https://github.com/mewebstudio/java-captcha-generator">Captcha Generator</a>
  */
-@SessionScope
-@Component
 public class CaptchaGeneratorAdapter extends AbstractCaptchaAdapter {
 
     @Override
diff --git a/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/NanoCaptchaAdapter.java b/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/NanoCaptchaAdapter.java
index 86c3e833e..21e77e8bb 100644
--- a/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/NanoCaptchaAdapter.java
+++ b/estruturais/01-adapter/captcha-adapters-v1/src/main/java/io/github/manoelcampos/captchaadapters/adapter/NanoCaptchaAdapter.java
@@ -1,18 +1,18 @@
 package io.github.manoelcampos.captchaadapters.adapter;
 
 import net.logicsquad.nanocaptcha.image.ImageCaptcha;
-import org.springframework.web.context.annotation.SessionScope;
+import org.springframework.stereotype.Component;
 
 /**
  * @author Manoel Campos
  * @see <a href="https://github.com/logicsquad/nanocaptcha">Nano Captcha</a>
  */
-@SessionScope
+@Component
 public class NanoCaptchaAdapter extends AbstractCaptchaAdapter {
 
     @Override
     public byte[] gerar() {
-        final var captcha = new ImageCaptcha.Builder(200, 50).addContent().build();
+        final var captcha = ImageCaptcha.create();
         this.codigo = captcha.getContent();
         return bufferedImageToByteArray(captcha.getImage());
     }
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
index 09c193ee3..6edb06955 100644
--- 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,9 +1,12 @@
 package io.github.manoelcampos.captchaadapters.controllers;
 
 import io.github.manoelcampos.captchaadapters.adapter.CaptchaAdapter;
-import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.annotation.SessionScope;
 
 /**
@@ -12,9 +15,9 @@
 @RestController
 @RequestMapping("/captcha")
 @SessionScope
-@AllArgsConstructor
 public class CaptchaController {
-    private final CaptchaAdapter captcha;
+    @Autowired
+    private CaptchaAdapter captcha;
 
     @GetMapping(value = "/gerar", produces = MediaType.IMAGE_PNG_VALUE)
     public byte[] gerar(){
diff --git a/estruturais/01-adapter/captcha-v1-sem-adapter/pom.xml b/estruturais/01-adapter/captcha-v1-sem-adapter/pom.xml
index 0468cd23d..6d77710a8 100644
--- a/estruturais/01-adapter/captcha-v1-sem-adapter/pom.xml
+++ b/estruturais/01-adapter/captcha-v1-sem-adapter/pom.xml
@@ -27,7 +27,7 @@
 			<!-- https://github.com/logicsquad/nanocaptcha -->
 			<groupId>net.logicsquad</groupId>
 			<artifactId>nanocaptcha</artifactId>
-			<version>1.5</version>
+			<version>2.1</version>
 		</dependency>
 
 		<dependency>