IPTE-165: Clean Code

Author: mairKi

src/main/java/de/doubleslash/keeptime/REST_API/DTO/WorkDTO.java

@@ -1,6 +1,5 @@
 package de.doubleslash.keeptime.REST_API.DTO;
 
-
 import java.time.LocalDateTime;
 
 public class WorkDTO {
@@ -18,7 +17,6 @@ public WorkDTO(long id, LocalDateTime startTime, LocalDateTime endTime, ProjectD
       this.notes = notes;
    }
 
-
    public long getId() {
       return id;
    }

src/main/java/de/doubleslash/keeptime/REST_API/mapper/ColorMapper.java

@@ -7,24 +7,16 @@
 @Mapper
 public interface ColorMapper {
    default ColorDTO colorToColorDTO(Color color) {
-
       if (color == null) {
          return null;
       }
-      System.out.println(color.getRed());
-      System.out.println(color.getGreen());
-      System.out.println(color.getBlue());
-
-      System.out.println("-------------------------------");
 
       ColorDTO colorDTO = new ColorDTO();
       colorDTO.setRed(Color.RED.getRed());
       colorDTO.setGreen(color.getGreen());
       colorDTO.setBlue(color.getBlue());
       colorDTO.setOpacity(color.getOpacity());
-      System.out.println(colorDTO.getRed());
-      System.out.println(colorDTO.getGreen());
-      System.out.println(colorDTO.getBlue());
+
       return colorDTO;
    }
 

src/main/java/de/doubleslash/keeptime/REST_API/mapper/ProjectMapper.java

@@ -1,4 +1,5 @@
 package de.doubleslash.keeptime.REST_API.mapper;
+
 import de.doubleslash.keeptime.REST_API.ProjectColorDTO;
 import de.doubleslash.keeptime.model.Project;
 import org.mapstruct.Mapper;
@@ -8,6 +9,8 @@
 public interface ProjectMapper {
 
    ProjectMapper INSTANCE = Mappers.getMapper(ProjectMapper.class);
+
    ProjectColorDTO projectToProjectDTO(Project project);
+
    Project projectDTOToProject(ProjectColorDTO projectColorDTO);
 }

src/main/java/de/doubleslash/keeptime/REST_API/mapper/WorkMapper.java

@@ -1,14 +1,12 @@
 package de.doubleslash.keeptime.REST_API.mapper;
 
-
 import de.doubleslash.keeptime.REST_API.DTO.WorkDTO;
 import de.doubleslash.keeptime.model.Work;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
 @Mapper
 public interface WorkMapper {
-
    WorkMapper INSTANCE = Mappers.getMapper(WorkMapper.class);
 
    WorkDTO workToWorkDTO(Work work);

src/main/java/de/doubleslash/keeptime/model/Authorities.java

@@ -16,16 +16,12 @@ public class Authorities {
    @Column(name = "AUTHORITY")
    private String authority;
 
-
-
    public void setAuthority(final String authority) {
       this.authority = authority;
    }
 
    public void setUserName(final String userName) {
       this.userName = userName;
-
-
    }
 
    public String getAuthority() {

src/main/java/de/doubleslash/keeptime/model/Project.java

@@ -11,10 +11,7 @@
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.PositiveOrZero;
 
-import com.fasterxml.jackson.annotation.JsonSetter;
-
 import de.doubleslash.keeptime.model.persistenceconverter.ColorConverter;
-import de.doubleslash.keeptime.model.persistenceconverter.ColorGuiConverter;
 import javafx.scene.paint.Color;
 
 @Entity
@@ -72,17 +69,10 @@ public Color getColor() {
       return color;
    }
 
-
-
    public void setColor(Color color) {
       this.color = color;
    }
 
-   @JsonSetter
-   public void setColor(java.awt.Color color) {
-      this.color = new Color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
-   }
-
    public boolean isWork() {
       return isWork;
    }

src/main/java/de/doubleslash/keeptime/model/Settings.java

@@ -29,7 +29,7 @@
 
 /**
  * Object holding settings
- * 
+ *
  * @author nmutter
  */
 @Entity
@@ -73,7 +73,8 @@ public class Settings {
 
    private boolean confirmClose;
 
-   public Settings() {}
+   public Settings() {
+   }
 
    public Settings(final Color hoverBackgroundColor, final Color hoverFontColor, final Color defaultBackgroundColor,
          final Color defaultFontColor, final Color taskBarColor, final boolean useHotkey,
@@ -96,7 +97,6 @@ public Settings(final Color hoverBackgroundColor, final Color hoverFontColor, fi
       this.remindIfNotesAreEmpty = remindIfNotesAreEmpty;
       this.remindIfNotesAreEmptyOnlyForWorkEntry = remindIfNotesAreEmptyOnlyForWorkEntry;
       this.confirmClose = confirmClose;
-
    }
 
    public boolean isRemindIfNotesAreEmptyOnlyForWorkEntry() {
@@ -222,5 +222,4 @@ public boolean isRemindIfNotesAreEmpty() {
    public void setRemindIfNotesAreEmpty(final boolean emptyNoteReminder) {
       this.remindIfNotesAreEmpty = emptyNoteReminder;
    }
-
 }

src/main/java/de/doubleslash/keeptime/model/User.java

@@ -6,7 +6,7 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name ="Users")
+@Table(name = "Users")
 public class User {
 
    @Id

src/main/java/de/doubleslash/keeptime/model/Work.java

@@ -26,7 +26,6 @@
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 
 @Entity
@@ -98,5 +97,4 @@ public String toString() {
       return "Work [id=" + id + ", startTime=" + startTime + ", endTime=" + endTime + ", projectName="
             + project.getName() + ", notes=" + notes + "]";
    }
-
 }

src/main/java/de/doubleslash/keeptime/model/persistenceconverter/ColorConverter.java

@@ -21,7 +21,6 @@
 import javafx.scene.paint.Color;
 
 public class ColorConverter implements AttributeConverter<Color, String> {
-
    @Override
    public Color convertToEntityAttribute(final String arg0) {
       try {
@@ -35,14 +34,4 @@ public Color convertToEntityAttribute(final String arg0) {
    public String convertToDatabaseColumn(final Color arg0) {
       return arg0.toString();
    }
-
-
-
-
-
-   // Diese Methode konvertiert einen String in eine Color-Instanz
-   public static Color convertToColor(String colorString) {
-      return Color.web(colorString);
-   }
-
 }