IPTE-165: Pull Request

mairKi · mairKi · commit f94c978dc3bd · 2023-12-06T09:22:04.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct</artifactId>
-      <version>1.6.0.Beta1</version>
+      <version>1.5.5.Final</version>
     </dependency>
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct-processor</artifactId>
-      <version>1.6.0.Beta1</version>
+      <version>1.5.5.Final</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -183,7 +183,7 @@
                 <path>
                   <groupId>org.mapstruct</groupId>
                   <artifactId>mapstruct-processor</artifactId>
-                  <version>1.6.0.Beta1</version>
+                  <version>1.5.5.Final</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ColorDTO.java b/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ColorDTO.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API.DTO;
 
 public class ColorDTO {
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ProjectColorDTO.java b/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ProjectColorDTO.java
@@ -1,6 +1,20 @@
-package de.doubleslash.keeptime.REST_API.DTO;
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import de.doubleslash.keeptime.REST_API.DTO.ColorDTO;
+package de.doubleslash.keeptime.REST_API.DTO;
 
 public class ProjectColorDTO {
    private long id;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ProjectDTO.java b/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ProjectDTO.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API.DTO;
 
 public class ProjectDTO {
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/DTO/WorkDTO.java b/src/main/java/de/doubleslash/keeptime/REST_API/DTO/WorkDTO.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API.DTO;
 
 import java.time.LocalDateTime;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/SecurityConfiguration.java b/src/main/java/de/doubleslash/keeptime/REST_API/SecurityConfiguration.java
@@ -1,10 +1,24 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API;
 
-import org.h2.engine.Session;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/controller/ProjectController.java b/src/main/java/de/doubleslash/keeptime/REST_API/controller/ProjectController.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API.controller;
 
 import de.doubleslash.keeptime.REST_API.DTO.ProjectColorDTO;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/controller/WorksController.java b/src/main/java/de/doubleslash/keeptime/REST_API/controller/WorksController.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API.controller;
 
 import de.doubleslash.keeptime.REST_API.DTO.WorkDTO;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/mapper/ColorMapper.java b/src/main/java/de/doubleslash/keeptime/REST_API/mapper/ColorMapper.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API.mapper;
 
 import de.doubleslash.keeptime.REST_API.DTO.ColorDTO;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/mapper/ProjectMapper.java b/src/main/java/de/doubleslash/keeptime/REST_API/mapper/ProjectMapper.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API.mapper;
 
 import de.doubleslash.keeptime.REST_API.DTO.ProjectColorDTO;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/mapper/WorkMapper.java b/src/main/java/de/doubleslash/keeptime/REST_API/mapper/WorkMapper.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.REST_API.mapper;
 
 import de.doubleslash.keeptime.REST_API.DTO.WorkDTO;
diff --git a/src/main/java/de/doubleslash/keeptime/model/Authorities.java b/src/main/java/de/doubleslash/keeptime/model/Authorities.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.model;
 
 import javax.persistence.Column;
diff --git a/src/main/java/de/doubleslash/keeptime/model/Project.java b/src/main/java/de/doubleslash/keeptime/model/Project.java
@@ -1,3 +1,19 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.model;
 
 import javax.persistence.Column;
diff --git a/src/main/java/de/doubleslash/keeptime/model/repos/AuthoritiesRepository.java b/src/main/java/de/doubleslash/keeptime/model/repos/AuthoritiesRepository.java
@@ -1,3 +1,19 @@
+// Copyright 2023 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.model.repos;
 
 import de.doubleslash.keeptime.model.Authorities;
diff --git a/src/main/java/de/doubleslash/keeptime/view/SettingsController.java b/src/main/java/de/doubleslash/keeptime/view/SettingsController.java
@@ -132,7 +132,6 @@ public class SettingsController {
 
    @FXML
    private Button reportBugButton;
-   private Button changePortButton;
 
    @FXML
    private Region bugIcon;
@@ -167,7 +166,7 @@ public class SettingsController {
    private TextField authName;
 
    @FXML
-   private TextField authPassword;
+   private PasswordField authPassword1;
 
    private ToggleGroup toggleGroup;
 
@@ -562,6 +561,9 @@ public ObservableList<LicenseTableRow> loadLicenseRows() {
       licenseRows.add(new LicenseTableRow("mockito-core", Licenses.MIT));
       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("jackson-databind", Licenses.APACHEV2));
+      licenseRows.add(new LicenseTableRow("javax.xml.bind", Licenses.APACHEV2));
 
       licenseRows.sort(Comparator.comparing(LicenseTableRow::getName));
 
@@ -589,7 +591,7 @@ private void handleApiOff() {
 
    private void handleApiOn() {
       username = authName.getText();
-      password = authPassword.getText();
+      password = authPassword1.getText();
 
       createAndSaveUser(username, password);
 
diff --git a/src/main/resources/layouts/settings.fxml b/src/main/resources/layouts/settings.fxml
@@ -24,6 +24,7 @@
 <?import javafx.scene.control.ColorPicker?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
 <?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
@@ -379,7 +380,6 @@
                         </Label>
                         <Label layoutX="24.0" layoutY="219.0" text="Password:" />
                         <TextField fx:id="authName" layoutX="97.0" layoutY="166.0" prefHeight="26.0" prefWidth="298.0" promptText="User" />
-                        <TextField fx:id="authPassword" layoutX="97.0" layoutY="215.0" prefHeight="26.0" prefWidth="298.0" promptText="1234" />
                         <Label layoutX="24.0" layoutY="70.0" text="Auth" />
                         <Label layoutX="26.0" layoutY="124.0" text="Port:" />
                         <TextField fx:id="authPort" layoutX="97.0" layoutY="120.0" prefHeight="26.0" prefWidth="298.0" promptText="8080" />
@@ -389,6 +389,7 @@
                            </toggleGroup>
                         </RadioButton>
                         <RadioButton fx:id="radioApiOff" layoutX="219.0" layoutY="64.0" mnemonicParsing="false" text="OFF" toggleGroup="$authAPI" />
+                        <PasswordField fx:id="authPassword1" layoutX="97.0" layoutY="215.0" prefHeight="26.0" prefWidth="298.0" />
                      </children></AnchorPane>
                </content>
                <graphic>
