fix some issues noted by SonarQube

walpurr · walpurr · commit 88f22c2342cb · 2025-07-13T15:19:25.000+05:00
diff --git a/app/src/main/java/hexlet/code/controller/UrlChecksController.java b/app/src/main/java/hexlet/code/controller/UrlChecksController.java
@@ -15,6 +15,11 @@
 import java.sql.SQLException;
 
 public final class UrlChecksController {
+
+    private UrlChecksController() {
+        throw new AssertionError("Util class cannot be instantiated");
+    }
+
     public static void create(Context ctx) throws SQLException {
 
         var urlId = ctx.pathParamAsClass("id", Long.class).get();
diff --git a/app/src/main/java/hexlet/code/controller/UrlsController.java b/app/src/main/java/hexlet/code/controller/UrlsController.java
@@ -18,6 +18,10 @@
 
 public final class UrlsController {
 
+    private UrlsController() {
+        throw new AssertionError("Util class cannot be instantiated");
+    }
+
     public static void index(Context ctx) throws SQLException {
         var urls = UrlRepository.getEntities();
         var latestChecks = UrlCheckRepository.getLatestChecks();
@@ -43,7 +47,7 @@ public static void show(Context ctx) throws SQLException {
 
     public static void create(Context ctx) throws SQLException {
 
-        var inputUrl = ctx.formParam("url");
+        var inputUrl = ctx.formParamAsClass("url", String.class).getOrThrow(NotFoundResponse::new);
         URI parsedUrl;
         try {
             parsedUrl = new URI(inputUrl);
diff --git a/app/src/main/java/hexlet/code/dto/BasePage.java b/app/src/main/java/hexlet/code/dto/BasePage.java
@@ -5,7 +5,7 @@
 
 @Getter
 @Setter
-public class BasePage {
+public abstract class BasePage {
     private String flash;
     private String flashType;
 }
diff --git a/app/src/main/java/hexlet/code/repository/BaseRepository.java b/app/src/main/java/hexlet/code/repository/BaseRepository.java
@@ -2,6 +2,6 @@
 
 import com.zaxxer.hikari.HikariDataSource;
 
-public class BaseRepository {
+public abstract class BaseRepository {
     public static HikariDataSource dataSource;
 }
diff --git a/app/src/main/java/hexlet/code/repository/UrlCheckRepository.java b/app/src/main/java/hexlet/code/repository/UrlCheckRepository.java
@@ -13,6 +13,10 @@
 
 public final class UrlCheckRepository extends BaseRepository {
 
+    private UrlCheckRepository() {
+        throw new AssertionError("Util class cannot be instantiated");
+    }
+
     public static void save(UrlCheck check) throws SQLException {
         var sql = """
             INSERT INTO url_checks
@@ -40,29 +44,6 @@ public static void save(UrlCheck check) throws SQLException {
         }
     }
 
-//    public static Optional<UrlCheck> find(Long id) throws SQLException {
-//        var sql = "SELECT * FROM url_checks WHERE id = ?";
-//        try (
-//            var conn = dataSource.getConnection();
-//            var stmt = conn.prepareStatement(sql)
-//        ) {
-//            stmt.setLong(1, id);
-//
-//            var rs = stmt.executeQuery();
-//            if (rs.next()) {
-//                var check = UrlCheck.builder()
-//                    .id(id)
-//                    .statusCode(rs.getInt("status_code"))
-//                    .urlId(rs.getLong("url_id"))
-//                    .createdAt(rs.getTimestamp("created_at"))
-//                    .build();
-//                return Optional.of(check);
-//            } else {
-//                return Optional.empty();
-//            }
-//        }
-//    }
-
     public static List<UrlCheck> findByUrlId(Long urlId) throws SQLException {
         var sql = "SELECT * FROM url_checks WHERE url_id = ? ORDER BY id";
         try (
@@ -117,29 +98,4 @@ SELECT DISTINCT ON (url_id) *
             return result;
         }
     }
-
-//    public static List<UrlCheck> getEntities() throws SQLException {
-//        var sql = "SELECT * FROM url_checks";
-//        try (
-//            var conn = dataSource.getConnection();
-//            var stmt = conn.prepareStatement(sql)
-//        ) {
-//            var rs = stmt.executeQuery();
-//            var result = new ArrayList<UrlCheck>();
-//            while (rs.next()) {
-//                var check = UrlCheck.builder()
-//                    .id(rs.getLong("id"))
-//                    .statusCode(rs.getInt("status_code"))
-//                    .title(rs.getString("title"))
-//                    .h1(rs.getString("h1"))
-//                    .description(rs.getString("description"))
-//                    .urlId(rs.getLong("url_id"))
-//                    .createdAt(rs.getTimestamp("created_at").toLocalDateTime())
-//                    .build();
-//                result.add(check);
-//            }
-//
-//            return result;
-//        }
-//    }
 }
diff --git a/app/src/main/java/hexlet/code/repository/UrlRepository.java b/app/src/main/java/hexlet/code/repository/UrlRepository.java
@@ -12,6 +12,10 @@
 
 public final class UrlRepository extends BaseRepository {
 
+    private UrlRepository() {
+        throw new AssertionError("Util class cannot be instantiated");
+    }
+
     public static void save(Url url) throws SQLException {
         var sql = "INSERT INTO urls (name, created_at) VALUES (?, ?)";
         try (var conn = dataSource.getConnection();
diff --git a/app/src/main/java/hexlet/code/util/NamedRoutes.java b/app/src/main/java/hexlet/code/util/NamedRoutes.java
@@ -2,6 +2,10 @@
 
 public final class NamedRoutes {
 
+    private NamedRoutes() {
+        throw new AssertionError("Util class cannot be instantiated");
+    }
+
     public static String rootPath() {
         return "/";
     }
diff --git a/app/src/test/java/hexlet/code/AppTest.java b/app/src/test/java/hexlet/code/AppTest.java
@@ -32,10 +32,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public final class AppTest {
+final class AppTest {
     private Javalin app;
     private Context ctx;
-    private static MockWebServer server;
+    private static MockWebServer mockWebServer;
     private String rawUrl;
 
     private static Document html;
@@ -44,7 +44,7 @@ public final class AppTest {
     private static String description = "description example";
 
     @BeforeAll
-    public static void mockHtml() {
+    static void mockHtml() {
         title = "title example";
         h1 = "h1 example";
         description = "description example";
@@ -61,25 +61,25 @@ public static void mockHtml() {
     }
 
     @BeforeEach
-    public void setUp() throws SQLException, IOException {
-        server = new MockWebServer();
+    void setUp() throws SQLException, IOException {
+        mockWebServer = new MockWebServer();
         var response = new MockResponse(200, new Headers.Builder().build(), html.toString());
-        server.enqueue(response);
-        server.start();
+        mockWebServer.enqueue(response);
+        mockWebServer.start();
 
-        rawUrl = server.url("/").toString();
+        rawUrl = mockWebServer.url("/").toString();
 
         app = App.getApp();
         ctx = mock(Context.class);
     }
 
     @AfterAll
-    public static void tearDown() {
-        server.close();
+    static void tearDown() {
+        mockWebServer.close();
     }
 
     @Test
-    public void testMainPage() {
+    void testMainPage() {
         JavalinTest.test(app, (server, client) -> {
             var response = client.get(NamedRoutes.rootPath());
             assertEquals(200, response.code());
@@ -88,7 +88,7 @@ public void testMainPage() {
     }
 
     @Test
-    public void testUrlsPage() {
+    void testUrlsPage() {
         JavalinTest.test(app, (server, client) -> {
             var response = client.get(NamedRoutes.urlsPath());
             assertEquals(200, response.code());
@@ -97,7 +97,7 @@ public void testUrlsPage() {
     }
 
     @Test
-    public void testUrlPage() {
+    void testUrlPage() {
         JavalinTest.test(app, (server, client) -> {
 
             var url1 = new Url("https://one.com");
@@ -118,15 +118,15 @@ public void testUrlPage() {
     }
 
     @Test
-    public void testUrlNotFound() {
+    void testUrlNotFound() {
         JavalinTest.test(app, (server, client) -> {
             var response = client.get(NamedRoutes.urlPath("1"));
             assertEquals(404, response.code());
         });
     }
 
     @Test
-    public void testUrlDuplicate() {
+    void testUrlDuplicate() {
         JavalinTest.test(app, (server, client) -> {
             when(ctx.formParam("url")).thenReturn(rawUrl);
 
@@ -143,7 +143,7 @@ public void testUrlDuplicate() {
     }
 
     @Test
-    public void testUrlIncorrect() {
+    void testUrlIncorrect() {
         JavalinTest.test(app, (server, client) -> {
             when(ctx.formParam("url")).thenReturn(" " + rawUrl);
             assertDoesNotThrow(() -> UrlsController.create(ctx));
@@ -154,7 +154,7 @@ public void testUrlIncorrect() {
     }
 
     @Test
-    public void testPostUrl() {
+    void testPostUrl() {
         JavalinTest.test(app, (server, client) -> {
             var requestBody = "url=" + rawUrl;
             try (var postResponse = client.post(NamedRoutes.urlsPath(), requestBody)) {
@@ -170,7 +170,7 @@ public void testPostUrl() {
     }
 
     @Test
-    public void testPostUrlCheck() {
+    void testPostUrlCheck() {
         JavalinTest.test(app, (server, client) -> {
             var parsedUrl = new URI(rawUrl);
             var urlName = UrlsController.normalizeUrlName(parsedUrl);

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`@Getter`
`7`	`7`	`@Setter`
`8`		`-public class BasePage {`
	`8`	`+public abstract class BasePage {`
`9`	`9`	`private String flash;`
`10`	`10`	`private String flashType;`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`import com.zaxxer.hikari.HikariDataSource;`
`4`	`4`
`5`		`-public class BaseRepository {`
	`5`	`+public abstract class BaseRepository {`
`6`	`6`	`public static HikariDataSource dataSource;`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@`
`2`	`2`
`3`	`3`	`public final class NamedRoutes {`
`4`	`4`
	`5`	`+ private NamedRoutes() {`
	`6`	`+ throw new AssertionError("Util class cannot be instantiated");`
	`7`	`+ }`
	`8`	`+`
`5`	`9`	`public static String rootPath() {`
`6`	`10`	`return "/";`
`7`	`11`	`}`