Merge pull request #49 from geranazavr555/master

bloggy: use MariaDB connector, minor changes
Codeforces · Jul 5, 2023 · 436f96d · 436f96d
2 parents 84e1e49 + 8f0bb9d
commit 436f96d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/code/src/main/java/org/nocturne/template/impl/Less.java b/code/src/main/java/org/nocturne/template/impl/Less.java
@@ -22,7 +22,7 @@ public class Less {
     private static File tmpDir;
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
-    public synchronized static String compile(@Nonnull Object source, @Nonnull String lessCode, @Nullable File commonsFile) throws IOException {
+    public static synchronized String compile(@Nonnull Object source, @Nonnull String lessCode, @Nullable File commonsFile) throws IOException {
         long commonsFileLastModified = commonsFile == null ? 0 : commonsFile.lastModified();
         long commonsFileLength = commonsFile == null ? 0 : commonsFile.length();
         String cacheKey = getName(source).trim() + "_" + commonsFileLastModified + "_" + commonsFileLength + "_" + hash(lessCode);

diff --git a/samples/bloggy/pom.xml b/samples/bloggy/pom.xml
@@ -31,20 +31,15 @@
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.26</version>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>3.1.4</version>
         </dependency>
         <dependency>
             <groupId>com.codeforces</groupId>
             <artifactId>commons</artifactId>
             <version>3.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/samples/bloggy/profile.properties b/samples/bloggy/profile.properties
@@ -8,6 +8,6 @@ logging.path=${development.home}/bloggy.log
 timezone=Europe/Moscow
 debug.static-src-path=${development.home}/src/main/webapp
 
-database.url=jdbc:mysql://localhost/bloggy?useUnicode=true&characterSetResults=UTF-8&characterEncoding=UTF-8&serverTimezone=${timezone}
+database.url=jdbc:mariadb://localhost/bloggy?useUnicode=true&characterSetResults=UTF-8&characterEncoding=UTF-8&serverTimezone=${timezone}
 database.user=mysql
-database.password=29970161bba289cf
+database.password=???
diff --git a/samples/bloggy/src/main/java/bloggy/database/ApplicationDataSource.java b/samples/bloggy/src/main/java/bloggy/database/ApplicationDataSource.java
@@ -3,9 +3,9 @@
  */
 package bloggy.database;
 
-import com.mysql.cj.jdbc.MysqlDataSource;
 import org.apache.log4j.Logger;
 import bloggy.exception.ApplicationException;
+import org.mariadb.jdbc.MariaDbDataSource;
 
 import javax.annotation.Nonnull;
 import javax.sql.DataSource;
@@ -37,10 +37,14 @@ private static class DataSourceHolder {
         private static final DataSource INSTANCE;
 
         static {
-            MysqlDataSource instance = new MysqlDataSource();
-            instance.setUrl(PROPERTIES.getProperty("database.url"));
-            instance.setUser(PROPERTIES.getProperty("database.user"));
-            instance.setPassword(PROPERTIES.getProperty("database.password"));
+            MariaDbDataSource instance = new MariaDbDataSource();
+            try {
+                instance.setUrl(PROPERTIES.getProperty("database.url"));
+                instance.setUser(PROPERTIES.getProperty("database.user"));
+                instance.setPassword(PROPERTIES.getProperty("database.password"));
+            } catch (SQLException e) {
+                throw new ApplicationException("Can't initialize database connection", e);
+            }
 
             try (Connection ignored = instance.getConnection()) {
                 logger.info("Database has been initialized, test database connection is OK.");

diff --git a/samples/bloggy/src/main/resources/log4j.properties b/samples/bloggy/src/main/resources/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootCategory=INFO,log_file
+log4j.rootCategory=INFO,stdout,log_file
 log4j.logger.bloggy=INFO
 
 log4j.appender.stdout.Threshold=INFO

diff --git a/samples/bloggy/src/main/webapp/WEB-INF/templates/common.ftl b/samples/bloggy/src/main/webapp/WEB-INF/templates/common.ftl
@@ -46,7 +46,7 @@
     </main>
 </div>
 <footer>
-    <a href="<@link name="IndexPage"/>">Bloggy</a> &copy; 2009-2019 by Mike Mirzayanov
+    <a href="<@link name="IndexPage"/>">Bloggy</a> &copy; 2009-2023 by Mike Mirzayanov
     <div class="time">${now?string('yyyy-MM-dd HH:mm:ss')}</div>
 </footer>
 <script>