Update to Kernsoftware 3.19.2 and modernize with Java 17 features

de.bitctrl.dav.toolset.appanalyzer/build.gradle

@@ -19,7 +19,7 @@ nerzswe {
 //--------------------------------------------------------------------
 // Abhängigkeiten
 //--------------------------------------------------------------------
-String kernsoftware_version = '3.19.0'
+String kernsoftware_version = '3.19.2'
 
 dependencies {
     implementation "de.bsvrz.dav:de.bsvrz.dav.daf:$kernsoftware_version"

de.bitctrl.dav.toolset.appanalyzer/src/main/java/de/bitctrl/dav/toolset/appanalyzer/Exporter.java

@@ -58,74 +58,15 @@
  */
 public class Exporter extends Thread {
 
-	private static class SummaryKey {
-
-		private final String rolle;
-		private final SystemObjectType type;
-		private final AttributeGroup atg;
-		private final Aspect asp;
-
-		SummaryKey(final String rolle, final SystemObjectType type, final AttributeGroup atg, final Aspect asp) {
-			this.rolle = rolle;
-			this.type = type;
-			this.atg = atg;
-			this.asp = asp;
-		}
-
-		@Override
-		public int hashCode() {
-			final int prime = 31;
-			int result = 1;
-			result = (prime * result) + ((asp == null) ? 0 : asp.hashCode());
-			result = (prime * result) + ((atg == null) ? 0 : atg.hashCode());
-			result = (prime * result) + ((rolle == null) ? 0 : rolle.hashCode());
-			result = (prime * result) + ((type == null) ? 0 : type.hashCode());
-			return result;
-		}
-
-		@Override
-		public boolean equals(final Object obj) {
-			if (this == obj) {
-				return true;
-			}
-			if (obj == null) {
-				return false;
-			}
-			if (!(obj instanceof SummaryKey)) {
-				return false;
-			}
-			final SummaryKey other = (SummaryKey) obj;
-			if (asp == null) {
-				if (other.asp != null) {
-					return false;
-				}
-			} else if (!asp.equals(other.asp)) {
-				return false;
-			}
-			if (atg == null) {
-				if (other.atg != null) {
-					return false;
-				}
-			} else if (!atg.equals(other.atg)) {
-				return false;
-			}
-			if (rolle == null) {
-				if (other.rolle != null) {
-					return false;
-				}
-			} else if (!rolle.equals(other.rolle)) {
-				return false;
-			}
-			if (type == null) {
-				if (other.type != null) {
-					return false;
-				}
-			} else if (!type.equals(other.type)) {
-				return false;
-			}
-			return true;
-		}
-
+	/**
+	 * Key for summarizing export data by role, type, attribute group and aspect.
+	 * 
+	 * @param rolle the role
+	 * @param type the system object type
+	 * @param atg the attribute group
+	 * @param asp the aspect
+	 */
+	private record SummaryKey(String rolle, SystemObjectType type, AttributeGroup atg, Aspect asp) {
 	}
 
 	private final Set<SystemObject> exportApplications = new HashSet<>();

de.bitctrl.dav.toolset.appanalyzer/src/main/java/de/bitctrl/dav/toolset/appanalyzer/MainView.java

@@ -94,16 +94,12 @@ public void removeListDataListener(final ListDataListener l) {
 
 		final JButton exportButton = new JButton("Exportiere Anmeldungen");
 		getContentPane().add(exportButton, BorderLayout.SOUTH);
-		exportButton.addActionListener(new ActionListener() {
-
-			@Override
-			public void actionPerformed(final ActionEvent e) {
-				final JFileChooser fileChooser = new JFileChooser();
-				if (fileChooser.showOpenDialog(MainView.this) == JFileChooser.APPROVE_OPTION) {
-					final Exporter exporter = new Exporter(dav, applicationList, fileChooser.getSelectedFile(),
-							onlySummary);
-					exporter.start();
-				}
+		exportButton.addActionListener(e -> {
+			var fileChooser = new JFileChooser();
+			if (fileChooser.showOpenDialog(MainView.this) == JFileChooser.APPROVE_OPTION) {
+				var exporter = new Exporter(dav, applicationList, fileChooser.getSelectedFile(),
+						onlySummary);
+				exporter.start();
 			}
 		});
 	}

de.bitctrl.dav.toolset.archivcheck/build.gradle

@@ -18,7 +18,7 @@ nerzswe {
 //--------------------------------------------------------------------
 // Abhängigkeiten
 //--------------------------------------------------------------------
-String kernsoftware_version = '3.19.0'
+String kernsoftware_version = '3.19.2'
 
 dependencies {
     implementation "de.bsvrz.dav:de.bsvrz.dav.daf:$kernsoftware_version"

de.bitctrl.dav.toolset.archivcheck/src/main/java/de/bitctrl/dav/toolset/archivcheck/AkkumulationKey.java

@@ -26,48 +26,11 @@
 
 package de.bitctrl.dav.toolset.archivcheck;
 
-import java.util.Objects;
-
-class AkkumulationKey {
-
-	private Object atg;
-	private Object asp;
-
-	AkkumulationKey(final Object atg, final Object aspect) {
-		this.atg = atg;
-		this.asp = aspect;
-	}
-
-	@Override
-	public boolean equals(final Object obj) {
-
-		if (this == obj) {
-			return true;
-		}
-		if (obj instanceof AkkumulationKey) {
-			final AkkumulationKey akkKey = (AkkumulationKey) obj;
-			return Objects.equals(asp, akkKey.asp) && Objects.equals(atg, akkKey.atg);
-		}
-
-		return false;
-	}
-
-	public Object getAsp() {
-		return asp;
-	}
-
-	public Object getAtg() {
-		return atg;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(asp, atg);
-	}
-
-	@Override
-	public String toString() {
-		return "AkkumulationKey [atg=" + atg + ", asp=" + asp + "]";
-	}
-
+/**
+ * Key for accumulating archive data by attribute group and aspect.
+ * 
+ * @param atg the attribute group
+ * @param asp the aspect
+ */
+record AkkumulationKey(Object atg, Object asp) {
 }

de.bitctrl.dav.toolset.archivcheck/src/main/java/de/bitctrl/dav/toolset/archivcheck/ArchivSizer.java

@@ -72,7 +72,7 @@ private static class ResultSet {
 		}
 
 		private boolean isValid() {
-			return (this.object instanceof SystemObject) && ((SystemObject) this.object).isValid();
+			return (this.object instanceof SystemObject sysObj) && sysObj.isValid();
 		}
 
 		private boolean isMissed() {
@@ -113,12 +113,12 @@ public void initialize(final ClientDavInterface connection) throws Exception {
 
 		model = connection.getDataModel();
 
-		final File startDir = new File(baseDir);
+		var startDir = new File(baseDir);
 		if (!startDir.isDirectory()) {
 			throw new InvalidArgumentException(baseDir + " ist kein Verzeichnis");
 		}
 
-		final File[] listFiles = startDir.listFiles();
+		var listFiles = startDir.listFiles();
 		if (listFiles != null) {
 			for (final File child : listFiles) {
 				if (child.getName().startsWith(ArchivSizer.OBJ_DIR_PREFIX)) {
@@ -127,12 +127,7 @@ public void initialize(final ClientDavInterface connection) throws Exception {
 			}
 		}
 
-		Collections.sort(results, new Comparator<ResultSet>() {
-			@Override
-			public int compare(final ResultSet o1, final ResultSet o2) {
-				return ((Long) o2.size.getSize()).compareTo(o1.size.getSize());
-			}
-		});
+		Collections.sort(results, (o1, o2) -> ((Long) o2.size.getSize()).compareTo(o1.size.getSize()));
 
 		try (PrintWriter output = new PrintWriter(new FileWriter(outputFile))) {
 			printheader(output);
@@ -153,7 +148,7 @@ public int compare(final ResultSet o1, final ResultSet o2) {
 
 	private void printResult(final PrintWriter output, final ResultSet set) {
 
-		final StringBuffer result = new StringBuffer(200);
+		var result = new StringBuilder(200);
 		if (set.isMissed()) {
 			result.append('-');
 		} else if (!set.isValid()) {
@@ -191,12 +186,12 @@ private void printheader(final PrintWriter output) {
 	}
 
 	private void printAkkResult(final PrintWriter output, final AkkumulationKey key, final SizeSet value) {
-		final StringBuffer result = new StringBuffer(200);
+		var result = new StringBuilder(200);
 		result.append(value.getSetCount());
 		result.append(';');
-		result.append(key.getAtg());
+		result.append(key.atg());
 		result.append(';');
-		result.append(key.getAsp());
+		result.append(key.asp());
 		result.append(';');
 		result.append(value.getSize());
 		result.append(';');

de.bitctrl.dav.toolset.kblister/build.gradle

@@ -19,7 +19,7 @@ nerzswe {
 //--------------------------------------------------------------------
 // Abhängigkeiten
 //--------------------------------------------------------------------
-String kernsoftware_version = '3.19.0'
+String kernsoftware_version = '3.19.2'
 
 dependencies {
     implementation "de.bsvrz.dav:de.bsvrz.dav.daf:$kernsoftware_version"

de.bitctrl.dav.toolset.kblister/src/main/java/de/bitctrl/dav/toolset/kblister/KbLister.java

@@ -71,25 +71,21 @@ public void initialize(final ClientDavInterface connection) throws Exception {
 
 		final DataModel model = connection.getDataModel();
 
-		Set<ConfigurationArea> allKbSortedPerPid = new TreeSet<>(new Comparator<ConfigurationArea>() {
-
-			@Override
-			public int compare(final ConfigurationArea o1, final ConfigurationArea o2) {
-				return o1.getPid().compareTo(o2.getPid());
-			}
-		});
+		var allKbSortedPerPid = new TreeSet<ConfigurationArea>(
+				(o1, o2) -> o1.getPid().compareTo(o2.getPid()));
 
 		for (SystemObject obj : model.getTypeTypeObject().getElements()) {
-			final SystemObjectType type = (SystemObjectType) obj;
-			final TreeSet<ConfigurationArea> kbs = new TreeSet<>(new PidComparator());
+			if (obj instanceof SystemObjectType type) {
+				var kbs = new TreeSet<ConfigurationArea>(new PidComparator());
 
-			for (SystemObject element : type.getElements()) {
-				final ConfigurationArea configurationArea = element.getConfigurationArea();
-				kbs.add(configurationArea);
-				allKbSortedPerPid.add(configurationArea);
-			}
+				for (SystemObject element : type.getElements()) {
+					var configurationArea = element.getConfigurationArea();
+					kbs.add(configurationArea);
+					allKbSortedPerPid.add(configurationArea);
+				}
 
-			results.put(type, kbs);
+				results.put(type, kbs);
+			}
 		}
 
 		for (Entry<SystemObjectType, Set<ConfigurationArea>> result : results.entrySet()) {

de.bitctrl.dav.toolset.parameter.klassufd/build.gradle

@@ -18,7 +18,7 @@ nerzswe {
 //--------------------------------------------------------------------
 // Abhängigkeiten
 //--------------------------------------------------------------------
-String kernsoftware_version = '3.19.0'
+String kernsoftware_version = '3.19.2'
 
 dependencies {
     implementation "de.bsvrz.dav:de.bsvrz.dav.daf:$kernsoftware_version"

de.bitctrl.dav.toolset.parameter.klassufd/src/main/java/de/bitctrl/dav/toolset/parameter/klassufd/UfdsSensorType.java

@@ -87,15 +87,11 @@ public String getAttName() {
 	 * @return das Array
 	 */
 	public double[][] getDefaultStufen() {
-		switch (this) {
-		case NI:
-			return UfdsSensorType.NI_STUFEN;
-		case SW:
-			return UfdsSensorType.SW_STUFEN;
-		case WFD:
-			return UfdsSensorType.WFD_STUFEN;
-		default:
-			return UfdsSensorType.EMPTY;
-		}
+		return switch (this) {
+			case NI -> NI_STUFEN;
+			case SW -> SW_STUFEN;
+			case WFD -> WFD_STUFEN;
+			default -> EMPTY;
+		};
 	}
 }

de.bitctrl.dav.toolset.parameter.mqmarz/build.gradle

@@ -17,7 +17,7 @@ nerzswe {
 //--------------------------------------------------------------------
 // Abhängigkeiten
 //--------------------------------------------------------------------
-String kernsoftware_version = '3.19.0'
+String kernsoftware_version = '3.19.2'
 
 dependencies {
     implementation "de.bsvrz.dav:de.bsvrz.dav.daf:$kernsoftware_version"

de.bitctrl.dav.toolset.swelister/build.gradle

@@ -19,7 +19,7 @@ nerzswe {
 //--------------------------------------------------------------------
 // Abhängigkeiten
 //--------------------------------------------------------------------
-String kernsoftware_version = '3.19.0'
+String kernsoftware_version = '3.19.2'
 
 dependencies {
     implementation "de.bsvrz.dav:de.bsvrz.dav.daf:$kernsoftware_version"

de.bitctrl.dav.toolset.system/build.gradle

@@ -19,7 +19,7 @@ nerzswe {
 //--------------------------------------------------------------------
 // Abhängigkeiten
 //--------------------------------------------------------------------
-String kernsoftware_version = '3.19.0'
+String kernsoftware_version = '3.19.2'
 
 dependencies {
     implementation "de.bsvrz.dav:de.bsvrz.dav.daf:$kernsoftware_version"