[large]Feature/118

build.gradle

@@ -3,20 +3,25 @@ plugins {
     id 'application'
     id 'jacoco'
     id 'org.sonarqube' version '6.0.0.5145'
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
     id 'org.springframework.boot' version '3.4.1'
     id 'io.spring.dependency-management' version '1.1.7'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.20'
 }
 
 group = 'com.josdem.jmetadata'
-version = '1.4.2'
+version = '1.4.3'
 
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
+kotlin {
+    jvmToolchain(21)
+}
+
 application {
     mainClass = 'com.josdem.jmetadata.Launcher'
 }
@@ -34,6 +39,7 @@ ext {
     mockitoVersion = '3.12.4'
     mockitoInlineVersion = '5.2.0'
     targetDir = "src/main/java/com/josdem/jmetadata"
+    mockitoKotlinVersion = "5.4.0"
 }
 
 configurations {
@@ -56,6 +62,15 @@ spotless {
         removeUnusedImports()
         endWithNewline()
     }
+    kotlin {
+        target fileTree('.') {
+            include 'src/**/*.kt'
+            exclude '/build/**'
+        }
+        ktlint()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
 }
 
 dependencies {
@@ -79,6 +94,7 @@ dependencies {
     testCompileOnly 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     implementation files('lib/last.fm-bindings-0.1.0.jar')
 }
 

src/main/java/com/josdem/jmetadata/helper/ExporterHelper.java

@@ -23,17 +23,18 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import lombok.RequiredArgsConstructor;
 import org.jaudiotagger.audio.exceptions.CannotReadException;
 import org.jaudiotagger.audio.exceptions.ReadOnlyFileException;
 import org.jaudiotagger.tag.TagException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
+@RequiredArgsConstructor
 public class ExporterHelper {
 
-  @Autowired private ImageExporter imageExporter;
-  @Autowired private MetadataExporter metadataExporter;
+  private final ImageExporter imageExporter;
+  private final MetadataExporter metadataExporter;
 
   public ActionResult export(ExportPackage exportPackage)
       throws IOException,

src/main/java/com/josdem/jmetadata/helper/LastFMAlbumHelper.java

@@ -19,9 +19,8 @@
 import com.josdem.jmetadata.Auth;
 import com.josdem.jmetadata.model.GenreTypes;
 import de.umass.lastfm.Album;
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.Collection;
-import java.util.Date;
 import java.util.Iterator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -35,14 +34,13 @@ public Album getAlbum(String artist, String album) {
     return Album.getInfo(artist, album, Auth.KEY);
   }
 
-  public String getYear(Date releaseDate) {
+  public String getYear(LocalDate releaseDate) {
     if (releaseDate == null) {
       return StringUtils.EMPTY;
     }
-    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
-    String year = simpleDateFormat.format(releaseDate);
+    var year = releaseDate.getYear();
     log.info("Year: {}", year);
-    return year;
+    return String.valueOf(year);
   }
 
   public String getGenre(Album album) {

src/main/java/com/josdem/jmetadata/helper/LastFMAuthenticator.java

@@ -18,14 +18,15 @@
 
 import de.umass.lastfm.Session;
 import java.io.IOException;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class LastFMAuthenticator {
 
-  @Autowired private AuthenticatorHelper authenticatorHelper;
+  private final AuthenticatorHelper authenticatorHelper;
 
   public Session login(String username, String password) throws IOException {
     if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {

src/main/java/com/josdem/jmetadata/helper/LastFMTrackHelper.java

@@ -19,7 +19,9 @@
 import de.umass.lastfm.Session;
 import de.umass.lastfm.Track;
 import de.umass.lastfm.scrobble.ScrobbleResult;
+import org.springframework.stereotype.Component;
 
+@Component
 public class LastFMTrackHelper {
 
   public ScrobbleResult scrobble(String artist, String title, int time, Session session) {

src/main/java/com/josdem/jmetadata/helper/MetadataExporter.java

@@ -27,28 +27,29 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jaudiotagger.audio.exceptions.CannotReadException;
 import org.jaudiotagger.audio.exceptions.ReadOnlyFileException;
 import org.jaudiotagger.tag.TagException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class MetadataExporter {
   private static final String NEW_LINE = "\n";
   private static final String DASH = " - ";
   private static final String DOT = ". ";
   private static final String PAR_OPEN = " (";
   private static final String PAR_CLOSE = ")";
   private static final String BY = " by ";
-  private FileUtils fileUtils = new FileUtils();
-  private OutStreamWriter outputStreamWriter = new OutStreamWriter();
 
-  @Autowired private MetadataService metadataService;
-  @Autowired private FormatterService formatter;
+  private final FileUtils fileUtils;
+  private final OutStreamWriter outputStreamWriter;
+  private final MetadataService metadataService;
+  private final FormatterService formatter;
 
   public void export(ExportPackage exportPackage)
       throws IOException,
@@ -59,18 +60,18 @@ public void export(ExportPackage exportPackage)
     File file =
         fileUtils.createFile(
             exportPackage.getRoot(), StringUtils.EMPTY, ApplicationConstants.FILE_EXT);
-    log.info("Exporting metadata to: " + file.getAbsolutePath());
+    log.info("Exporting metadata to: {}", file.getAbsolutePath());
     OutputStream writer = outputStreamWriter.getWriter(file);
     int counter = 1;
-    List<Metadata> metadatas = exportPackage.getMetadataList();
-    if (metadataService.isSameAlbum(metadatas)) {
-      writer.write(metadatas.get(0).getAlbum().getBytes());
+    List<Metadata> metadataList = exportPackage.getMetadataList();
+    if (metadataService.isSameAlbum(metadataList)) {
+      writer.write(metadataList.getFirst().getAlbum().getBytes());
       writer.write(BY.getBytes());
-      writer.write(metadatas.get(0).getArtist().getBytes());
+      writer.write(metadataList.getFirst().getArtist().getBytes());
       writer.write(NEW_LINE.getBytes());
       writer.write(NEW_LINE.getBytes());
     }
-    for (Metadata metadata : metadatas) {
+    for (Metadata metadata : metadataList) {
       writer.write(Integer.toString(counter++).getBytes());
       writer.write(DOT.getBytes());
       writer.write(metadata.getArtist().getBytes());

src/main/java/com/josdem/jmetadata/helper/OutStreamWriter.java

@@ -20,7 +20,9 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
+import org.springframework.stereotype.Component;
 
+@Component
 public class OutStreamWriter {
 
   public OutputStream getWriter(File file) throws FileNotFoundException {

src/main/java/com/josdem/jmetadata/helper/ScrobblerHelper.java

@@ -31,29 +31,30 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.asmatron.messengine.ControlEngine;
 import org.springframework.stereotype.Service;
 
 @Slf4j
-
-/**
- * @understands A class who knows how to send scrobblings
- */
 @Service
+@RequiredArgsConstructor
 public class ScrobblerHelper {
   private static final int ONE_THOUSAND = 1000;
-  private static final int MIN_LENGHT = 240;
+  private static final int MIN_LENGTH = 240;
   private static final int REQUEST_PERIOD = 250;
-  private Map<Metadata, Long> metadataMap = new HashMap<Metadata, Long>();
-  private LastFMTrackHelper lastFMTrackHelper = new LastFMTrackHelper();
-  private ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+  private final Map<Metadata, Long> metadataMap = new HashMap<Metadata, Long>();
   private static final int DELTA = 120;
 
-  private ControlEngine controlEngine;
+  private final LastFMTrackHelper lastFMTrackHelper;
+
+  @Setter private ControlEngine controlEngine;
+
+  private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
 
-  private ActionResult scrobbling(Metadata metadata) throws IOException, InterruptedException {
+  private ActionResult scrobbling(Metadata metadata) throws InterruptedException {
     User currentUser = controlEngine.get(Model.CURRENT_USER);
     if (StringUtils.isEmpty(currentUser.getUsername())) {
       return ActionResult.NOT_LOGGED;
@@ -84,18 +85,14 @@ public ActionResult send(Metadata metadata) throws IOException, InterruptedExcep
     // According to submission rules http://www.last.fm/api/submissions
     if (StringUtils.isNotEmpty(metadata.getArtist())
         && StringUtils.isNotEmpty(metadata.getTitle())
-        && metadata.getLength() > MIN_LENGHT) {
-      long startTime = time - (metadataMap.size() * DELTA);
+        && metadata.getLength() > MIN_LENGTH) {
+      long startTime = time - ((long) metadataMap.size() * DELTA);
       metadataMap.put(metadata, startTime);
       return scrobbling(metadata);
     }
     return ActionResult.NOT_RECORDED;
   }
 
-  public void setControlEngine(ControlEngine controlEngine) {
-    this.controlEngine = controlEngine;
-  }
-
   private class ScrobbleTask implements Callable<ActionResult> {
     private final Metadata metadata;
     private final Session session;
@@ -114,14 +111,13 @@ public ActionResult call() throws Exception {
               metadataMap.get(metadata).intValue(),
               session);
       if (result.isSuccessful() && !result.isIgnored()) {
-        log.debug(
-            metadata.getArtist()
-                + " - "
-                + metadata.getTitle()
-                + " scrobbling to Last.fm was Successful");
+        log.info(
+            "{} - {} scrobbling to Last.fm was Successful",
+            metadata.getArtist(),
+            metadata.getTitle());
         return ActionResult.SENT;
       } else {
-        log.error("Submitting track " + metadata.getTitle() + " to Last.fm failed: " + result);
+        log.error("Submitting track {} to Last.fm failed: {}", metadata.getTitle(), result);
         return ActionResult.ERROR;
       }
     }

src/main/java/com/josdem/jmetadata/service/impl/LastFMCompleteServiceImpl.java

@@ -29,6 +29,8 @@
 import de.umass.lastfm.ImageSize;
 import java.awt.Image;
 import java.io.IOException;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Date;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -117,7 +119,8 @@ private void setYear(Metadata metadata, LastfmAlbum lastfmAlbum) {
     }
     if (release != null) {
       log.info("Year date format: {}", release);
-      lastfmAlbum.setYear(lastfmHelper.getYear(release));
+      var localDate = convertToLocalDateViaInstant(release);
+      lastfmAlbum.setYear(lastfmHelper.getYear(localDate));
       log.info("Year metadata format: {}", lastfmAlbum.getYear());
     } else {
       lastfmAlbum.setYear(StringUtils.EMPTY);
@@ -142,4 +145,8 @@ public ActionResult isSomethingNew(LastfmAlbum lastfmAlbum, Metadata metadata) {
     }
     return ActionResult.NEW;
   }
+
+  private LocalDate convertToLocalDateViaInstant(Date dateToConvert) {
+    return dateToConvert.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+  }
 }