Merge branch 'eugenp:master' into master

Author: wynnteo

core-java-modules/core-java-string-algorithms-5/src/main/java/com/baeldung/uniqueint/StringToUniqueInt.java

@@ -38,12 +38,12 @@ public static int toIntByMD5(String value) {
     }
 
     public static int toIntByLookup(String value) {
-        var found = lookupMap.get(value);
+        Integer found = lookupMap.get(value);
         if (found != null) {
             return found;
         }
 
-        var intValue = counter.incrementAndGet();
+        Integer intValue = counter.incrementAndGet();
         lookupMap.put(value, intValue);
         return intValue;
     }

core-java-modules/core-java-swing/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>core-java-swing</artifactId>
     <packaging>jar</packaging>
@@ -19,4 +19,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+    </build>
+
 </project>

core-java-modules/core-java-swing/src/main/java/com/baeldung/clipboard/AwtClipboard.java

@@ -0,0 +1,39 @@
+package com.baeldung.clipboard;
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.awt.datatransfer.DataFlavor;
+
+public class AwtClipboard {
+
+    public static void main(String[] args) throws IOException, UnsupportedFlavorException {
+        String textToCopy = "Baeldung helps developers explore the Java ecosystem and simply be better engineers.";
+        copyToClipboard(textToCopy);
+
+        String textCopied = copyFromClipboard();
+        if (textCopied != null) {
+            System.out.println(textCopied);
+        }
+    }
+
+    public static void copyToClipboard(String text) {
+        Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
+        StringSelection data = new StringSelection(text);
+        cb.setContents(data, null);
+    }
+
+    public static String copyFromClipboard() throws UnsupportedFlavorException, IOException {
+        Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
+        Transferable transferable = cb.getContents(null);
+        if (transferable.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+            String data = (String) transferable.getTransferData(DataFlavor.stringFlavor);
+            return data;
+        }
+        System.out.println("Couldn't get data from the clipboard");
+        return null;
+    }
+}

logging-modules/logback/pom.xml

@@ -24,6 +24,12 @@
             <artifactId>logback-classic</artifactId>
             <version>${logback.version}</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-core -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback.contrib</groupId>
             <artifactId>logback-json-classic</artifactId>
@@ -109,10 +115,10 @@
         <docx4j.version>3.3.5</docx4j.version>
         <angus.mail.version>2.0.1</angus.mail.version>
         <angus.activation.version>2.0.0</angus.activation.version>
-        <logback.version>1.5.6</logback.version>
+        <logback.version>1.5.18</logback.version>
         <slf4j.version>2.1.0-alpha1</slf4j.version>
         <janino.version>3.1.12</janino.version>
         <logstash.version>8.0</logstash.version>
     </properties>
 
-</project>
+</project>

logging-modules/logback/src/test/java/com/baeldung/logback/ConditionalLoggingUnitTest.java

@@ -47,20 +47,4 @@ public void whenSystemPropertyIsPresent_thenReturnFileLogger() throws IOExceptio
         String logOutput = FileUtils.readFileToString(new File("conditional.log"));
         assertTrue(logOutput.contains("test prod log"));
     }
-
-    @Test
-    public void whenMatchedWithEvaluatorFilter_thenReturnFilteredLogs() throws IOException {
-        logger = (Logger) LoggerFactory.getLogger(ConditionalLoggingUnitTest.class);
-        
-        logger.info("normal log");
-        logger.info("billing details: XXXX");
-        String normalLog = FileUtils.readFileToString(new File("conditional.log"));
-        assertTrue(normalLog.contains("normal log"));
-        assertTrue(normalLog.contains("billing details: XXXX"));
-        
-        String filteredLog = FileUtils.readFileToString(new File("filtered.log"));
-        assertTrue(filteredLog.contains("test prod log"));
-        assertFalse(filteredLog.contains("billing details: XXXX"));
-    }
-
 }

mapstruct-2/pom.xml

@@ -25,6 +25,18 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>     
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>mapstruct-2</finalName>
@@ -60,6 +72,7 @@
     <properties>
         <org.mapstruct.version>1.6.3</org.mapstruct.version>
         <lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
+        <springframework.version>6.2.1</springframework.version>
     </properties>
 
 </project>

mapstruct-2/src/main/java/com/baeldung/dto/MediaDto.java

@@ -0,0 +1,37 @@
+package com.baeldung.dto;
+
+public class MediaDto {
+
+    private Long id;
+
+    private String title;
+
+    public MediaDto(Long id, String title) {
+        this.id = id;
+        this.title = title;
+    }
+
+    public MediaDto() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public String toString() {
+        return "MediaDto{" + "id=" + id + ", title='" + title + '\'' + '}';
+    }
+}

mapstruct-2/src/main/java/com/baeldung/entity/Media.java

@@ -0,0 +1,37 @@
+package com.baeldung.entity;
+
+public class Media {
+
+    private Long id;
+
+    private String title;
+
+    public Media(Long id, String title) {
+        this.id = id;
+        this.title = title;
+    }
+
+    public Media() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public String toString() {
+        return "Media{" + "id=" + id + ", title='" + title + '\'' + '}';
+    }
+}

mapstruct-2/src/main/java/com/baeldung/mapper/MediaMapper.java

@@ -0,0 +1,15 @@
+package com.baeldung.mapper;
+
+import org.mapstruct.Mapper;
+
+import com.baeldung.dto.MediaDto;
+import com.baeldung.entity.Media;
+
+@Mapper
+public interface MediaMapper {
+
+    MediaDto toDto(Media media);
+
+    Media toEntity(MediaDto mediaDto);
+
+}

mapstruct-2/src/main/java/com/baeldung/service/MediaService.java

@@ -0,0 +1,26 @@
+package com.baeldung.service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.baeldung.dto.MediaDto;
+import com.baeldung.entity.Media;
+import com.baeldung.mapper.MediaMapper;
+
+public class MediaService {
+
+    final Logger logger = LoggerFactory.getLogger(MediaService.class);
+
+    private final MediaMapper mediaMapper;
+
+    public MediaService(MediaMapper mediaMapper) {
+        this.mediaMapper = mediaMapper;
+    }
+
+    public Media persistMedia(MediaDto mediaDto) {
+        Media media = mediaMapper.toEntity(mediaDto);
+        logger.info("Persist media: {}", media);
+        return media;
+    }
+
+}