Make ProblemSummaryNode record

eclipse-platform · Apr 2, 2024 · bd8c70a · bd8c70a
1 parent fb3d945
commit bd8c70a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 30 deletions.
diff --git a/....releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java b/....releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2022 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2024 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -279,12 +279,12 @@ private LogDocumentNode process(final Document document) {
         if (nodeList.getLength() == 1) {
             final Node problemSummaryNode = nodeList.item(0);
             final NamedNodeMap problemSummaryMap = problemSummaryNode.getAttributes();
-            final ProblemSummaryNode summaryNode = new ProblemSummaryNode();
+			final ProblemSummaryNode summaryNode = new ProblemSummaryNode(
+					Integer.parseInt(problemSummaryMap.getNamedItem("problems").getNodeValue()),
+					Integer.parseInt(problemSummaryMap.getNamedItem("errors").getNodeValue()),
+					Integer.parseInt(problemSummaryMap.getNamedItem("warnings").getNodeValue()),
+					Integer.parseInt(problemSummaryMap.getNamedItem("infos").getNodeValue()));
             documentNode.setProblemSummary(summaryNode);
-            summaryNode.numberOfProblems = Integer.parseInt(problemSummaryMap.getNamedItem("problems").getNodeValue()); //$NON-NLS-1$
-            summaryNode.numberOfErrors = Integer.parseInt(problemSummaryMap.getNamedItem("errors").getNodeValue()); //$NON-NLS-1$
-            summaryNode.numberOfWarnings = Integer.parseInt(problemSummaryMap.getNamedItem("warnings").getNodeValue()); //$NON-NLS-1$
-            summaryNode.numberOfInfos = Integer.parseInt(problemSummaryMap.getNamedItem("infos").getNodeValue()); //$NON-NLS-1$
         }
 
         nodeList = document.getElementsByTagName("problems"); //$NON-NLS-1$

diff --git a/...ld.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/AbstractDOMConverter.java b/...ld.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/AbstractDOMConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2020 IBM Corporation and others.
+ * Copyright (c) 2006, 2024 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -69,7 +69,7 @@ public void dump(final int formatVersion, final Map<String, String> options, fin
     private void dumpVersion2(final Map<String, String> options, final LogDocumentNode documentNode) {
         final String fileName = options.get(Converter.OUTPUT_FILE_NAME);
         final ProblemSummaryNode summaryNode = documentNode.getSummaryNode();
-        if ((summaryNode == null) || (summaryNode.numberOfProblems == 0)) {
+		if ((summaryNode == null) || (summaryNode.numberOfProblems() == 0)) {
             return;
         }
         try (final Writer writer = new BufferedWriter(new FileWriter(fileName))){
@@ -83,10 +83,10 @@ private void dumpVersion2(final Map<String, String> options, final LogDocumentNo
             final ProblemSummaryNode problemSummaryNode = summaryNode;
             writeTopAnchor(writer);
             String pattern = messages.getString("problem.summary"); //$NON-NLS-1$
-            writer.write(MessageFormat.format(pattern, Integer.toString(problemSummaryNode.numberOfProblems),
-					Integer.toString(problemSummaryNode.numberOfErrors),
-					Integer.toString(problemSummaryNode.numberOfWarnings),
-					Integer.toString(problemSummaryNode.numberOfInfos)));
+			writer.write(MessageFormat.format(pattern, Integer.toString(problemSummaryNode.numberOfProblems()),
+					Integer.toString(problemSummaryNode.numberOfErrors()),
+					Integer.toString(problemSummaryNode.numberOfWarnings()),
+					Integer.toString(problemSummaryNode.numberOfInfos())));
 
             writeAnchorsReferences(writer);
             final ProblemsNode[] problemsNodes = documentNode.getProblems();

diff --git a/...uild.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/ProblemSummaryNode.java b/...uild.tools.convert/src/org/eclipse/releng/build/tools/convert/dom/ProblemSummaryNode.java
@@ -1,29 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2017 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2024 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors: IBM Corporation - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.releng.build.tools.convert.dom;
 
-public class ProblemSummaryNode {
+public record ProblemSummaryNode(int numberOfProblems, int numberOfErrors, int numberOfWarnings, int numberOfInfos) {
 
-    public int numberOfProblems;
-    public int numberOfErrors;
-    public int numberOfWarnings;
-    public int numberOfInfos;
-
-    @Override
-    public String toString() {
-        final StringBuilder buffer = new StringBuilder();
-        buffer.append("problems : ") //$NON-NLS-1$
-                .append(numberOfProblems).append(" errors : ") //$NON-NLS-1$
-                .append(numberOfErrors).append(" warnings : ") //$NON-NLS-1$
-                .append(numberOfWarnings).append(" infos : ") //$NON_NLS-1$
-                .append(numberOfInfos);
-        return buffer.toString();
-    }
+	@Override
+	public String toString() {
+		final StringBuilder buffer = new StringBuilder();
+		buffer.append("problems : ") //$NON-NLS-1$
+				.append(numberOfProblems).append(" errors : ") //$NON-NLS-1$
+				.append(numberOfErrors).append(" warnings : ") //$NON-NLS-1$
+				.append(numberOfWarnings).append(" infos : ") // $NON_NLS-1$
+				.append(numberOfInfos);
+		return buffer.toString();
+	}
 }