remove mapstruct dependency and run npm upgrade in jobs-ui

Author: Ivan Franchin

jobs-api/pom.xml

@@ -18,7 +18,6 @@
  <properties>
  <java.version>17</java.version>
  <okta-spring.version>3.0.1</okta-spring.version>
- <org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
  <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
  <springdoc-openapi.version>2.0.3</springdoc-openapi.version>
  </properties>
@@ -44,13 +43,6 @@
  <version>${okta-spring.version}</version>
  </dependency>
 
- <!-- Mapstruct -->
- <dependency>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct</artifactId>
- <version>${org.mapstruct.version}</version>
- </dependency>
-
  <!-- SpringDoc OpenApi -->
  <dependency>
  <groupId>org.springdoc</groupId>
@@ -84,29 +76,6 @@
  </excludes>
  </configuration>
  </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <annotationProcessorPaths>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok-mapstruct-binding</artifactId>
- <version>${lombok-mapstruct-binding.version}</version>
- </path>
- <path>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct-processor</artifactId>
- <version>${org.mapstruct.version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
  </plugins>
  </build>
 

jobs-api/src/main/java/com/ivanfranchin/jobsapi/mapper/JobMapper.java

@@ -4,24 +4,12 @@
 import com.ivanfranchin.jobsapi.rest.dto.CreateJobRequest;
 import com.ivanfranchin.jobsapi.rest.dto.JobResponse;
 import com.ivanfranchin.jobsapi.rest.dto.UpdateJobRequest;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValuePropertyMappingStrategy;
 
-@Mapper(
- componentModel = "spring",
- nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE
-)
 public interface JobMapper {
 
  JobResponse toJobResponse(Job job);
 
- @Mapping(target = "id", ignore = true)
- @Mapping(target = "createDate", ignore = true)
  Job toJob(CreateJobRequest createJobRequest);
 
- @Mapping(target = "id", ignore = true)
- @Mapping(target = "createDate", ignore = true)
- void updateJobFromRequest(UpdateJobRequest updateJobRequest, @MappingTarget Job job);
+ void updateJobFromRequest(UpdateJobRequest updateJobRequest, Job job);
 }

jobs-api/src/main/java/com/ivanfranchin/jobsapi/mapper/JobMapperImpl.java

@@ -0,0 +1,42 @@
+package com.ivanfranchin.jobsapi.mapper;
+
+import com.ivanfranchin.jobsapi.model.Job;
+import com.ivanfranchin.jobsapi.rest.dto.CreateJobRequest;
+import com.ivanfranchin.jobsapi.rest.dto.JobResponse;
+import com.ivanfranchin.jobsapi.rest.dto.UpdateJobRequest;
+import org.springframework.stereotype.Service;
+
+@Service
+public class JobMapperImpl implements JobMapper {
+
+ @Override
+ public JobResponse toJobResponse(Job job) {
+ return job == null ?
+ null : new JobResponse(job.getId(), job.getTitle(), job.getCompany(), job.getLogoUrl(), job.getDescription(), job.getCreateDate());
+ }
+
+ @Override
+ public Job toJob(CreateJobRequest createJobRequest) {
+ return new Job(createJobRequest.getTitle(), createJobRequest.getCompany(), createJobRequest.getLogoUrl(), createJobRequest.getDescription());
+ }
+
+ @Override
+ public void updateJobFromRequest(UpdateJobRequest updateJobRequest, Job job) {
+ if (updateJobRequest == null) {
+ return;
+ }
+
+ if (updateJobRequest.getTitle() != null) {
+ job.setTitle(updateJobRequest.getTitle());
+ }
+ if (updateJobRequest.getCompany() != null) {
+ job.setCompany(updateJobRequest.getCompany());
+ }
+ if (updateJobRequest.getLogoUrl() != null) {
+ job.setLogoUrl(updateJobRequest.getLogoUrl());
+ }
+ if (updateJobRequest.getDescription() != null) {
+ job.setDescription(updateJobRequest.getDescription());
+ }
+ }
+}

jobs-api/src/main/java/com/ivanfranchin/jobsapi/model/Job.java

@@ -33,4 +33,11 @@ public class Job {
  public Job() {
  this.createDate = Instant.ofEpochSecond(Instant.now().getEpochSecond()).toString();
  }
+
+ public Job(String title, String company, String logoUrl, String description) {
+ this.title = title;
+ this.company = company;
+ this.logoUrl = logoUrl;
+ this.description = description;
+ }
 }

jobs-api/src/main/java/com/ivanfranchin/jobsapi/runner/DatabaseInitializer.java

@@ -73,7 +73,7 @@ public void run(String... args) {
  "Facebook;https://upload.wikimedia.org/wikipedia/commons/thumb/8/89/Facebook_Logo_%282019%29.svg/500px-Facebook_Logo_%282019%29.svg.png",
  "Yahoo;https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Yahoo%21_%282019%29.svg/420px-Yahoo%21_%282019%29.svg.png",
  "Microsoft;https://upload.wikimedia.org/wikipedia/commons/thumb/9/96/Microsoft_logo_%282012%29.svg/440px-Microsoft_logo_%282012%29.svg.png",
- "Takeaway;https://upload.wikimedia.org/wikipedia/de/1/1d/Takeaway.com_logo.svg",
+ "Just Eat Takeaway;https://upload.wikimedia.org/wikipedia/commons/thumb/d/d6/Just_Eat_Takeaway_Logo_6.2020.svg/2880px-Just_Eat_Takeaway_Logo_6.2020.svg.png",
  "Oracle;https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/Oracle_Logo.svg/440px-Oracle_Logo.svg.png");
  private static final List<String> LOCATIONS = Arrays.asList("Berlin/Germany", "New York City/US", "Porto/Portugal",
  "Sao Paulo/Brazil");