IPTE-165: Code Refatoring include getUser

(cherry picked from commit c96359b)

Author: mairKi

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

@@ -18,6 +18,7 @@
 
 import java.util.Comparator;
 
+import de.doubleslash.keeptime.model.repos.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;

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

@@ -31,6 +31,10 @@ public void setEnabled(final boolean enabled) {
    }
 
    public String getUserName() {
-      return userName;
+      if (userName != null) {
+         return userName;
+      } else {
+         return "No username set";
+      }
    }
 }

src/main/java/de/doubleslash/keeptime/model/repos/UserRepository.java

@@ -7,4 +7,5 @@
 @Repository
 public interface UserRepository extends JpaRepository<User, String> {
    User findByUserName(String username);
+
 }

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -25,6 +25,7 @@
 import java.sql.SQLException;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -63,6 +64,8 @@
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Stage;
 
+import javax.print.attribute.standard.PrinterURI;
+
 @Component
 public class SettingsController {
 
@@ -212,17 +215,27 @@ public class SettingsController {
    @FXML
    private Label labelUsername;
 
-   User user = new User();
+   User user;
 
    @Autowired
    ViewController mainscreen;
 
    @Autowired
    public SettingsController(final Model model, final Controller controller,
-         ApplicationProperties applicationProperties) {
+         ApplicationProperties applicationProperties, final UserRepository userRepository) {
       this.model = model;
       this.controller = controller;
       this.applicationProperties = applicationProperties;
+      this.userRepository = userRepository;
+      this.YYY();
+
+   }
+
+   private void YYY() {
+      final List<User> users = userRepository.findAll();
+      if (!users.isEmpty()) {
+         user = users.get(0);
+      }
    }
 
    @FXML
@@ -267,9 +280,7 @@ private void initialize() {
                radioApiOn.setSelected(true);
                radioApiOff.setSelected(false);
                String port = properties.getProperty("server.port");
-//               String username = properties.getProperty(user.getUserName());
-//               System.err.println("'"+user.getUserName()+"'");
-               String username = properties.getProperty("authUsername");
+               authName.setText(user.getUserName());
                if (port != null) {
                   authPort.setText(port);
                }
@@ -285,7 +296,6 @@ private void initialize() {
          e.printStackTrace();
       }
 
-
       LOG.debug("saveButton.setOnAction");
 
       saveButton.setOnAction(ae -> {
@@ -602,8 +612,16 @@ public ObservableList<LicenseTableRow> loadLicenseRows() {
       licenseRows.add(new LicenseTableRow("h2", Licenses.EPLV1));
       licenseRows.add(new LicenseTableRow("Font Awesome Icons", Licenses.CC_4_0));
       licenseRows.add(new LicenseTableRow("mapstruct", Licenses.APACHEV2));
+      licenseRows.add(new LicenseTableRow("mapstruct-processor", Licenses.APACHEV2));
       licenseRows.add(new LicenseTableRow("jackson-databind", Licenses.APACHEV2));
       licenseRows.add(new LicenseTableRow("javax.xml.bind", Licenses.APACHEV2));
+      licenseRows.add(new LicenseTableRow("spring-boot-starter-web", Licenses.APACHEV2));//gleich
+      licenseRows.add(new LicenseTableRow("spring-boot-starter-validation", Licenses.APACHEV2));//gleich
+      licenseRows.add(new LicenseTableRow("spring-boot-starter-security", Licenses.APACHEV2));//gleich
+      //      licenseRows.add(new LicenseTableRow("org.springframework.boot", Licenses.APACHEV2));
+      //      licenseRows.add(new LicenseTableRow("jaxb-api", Licenses.);//CDDL 1.1
+      licenseRows.add(new LicenseTableRow("jacoco-maven-plugin", Licenses.EPLV1));//EPL 2.0
+      licenseRows.add(new LicenseTableRow("maven-compiler-plugin", Licenses.APACHEV2));
 
       licenseRows.sort(Comparator.comparing(LicenseTableRow::getName));
 

src/main/java/de/doubleslash/keeptime/view/ViewController.java

@@ -301,7 +301,6 @@ private void initialize() {
                   .bind(Bindings.createStringBinding(
                         () -> DateFormatter.secondsToHHMMSS(activeWorkSecondsProperty.get()),
                         activeWorkSecondsProperty));
-
       // update ui each second
       new Interval(1).registerCallBack(() -> {
          final LocalDateTime now = LocalDateTime.now();