You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2022/01/10 14:04:16 UTC
[turbine-fulcrum-intake] branch master updated (4fa60ae -> f98e9c7)
This is an automated email from the ASF dual-hosted git repository.
gk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git.
from 4fa60ae Update parent poms
new 52fe854 Remove duplicate custom/skin setting (since Turbone Parent 10
new b823906 Update: Use Java 8 streams and Method refs, update .gitignore
new f98e9c7 Update Turbine Parent 11
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
src/java/org/apache/fulcrum/intake/model/AppData.java | 14 +++++---------
src/java/org/apache/fulcrum/intake/model/Group.java | 9 +++------
.../apache/fulcrum/intake/validator/FieldReference.java | 11 ++++-------
src/site/site.xml | 13 +------------
5 files changed, 14 insertions(+), 35 deletions(-)
[turbine-fulcrum-intake] 03/03: Update Turbine Parent 11
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git
commit f98e9c755bb4fae51caa278d8593d1f6b5e31804
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Mon Jan 10 14:25:37 2022 +0100
Update Turbine Parent 11
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e45bf3d..df5615c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>9</version>
+ <version>11</version>
<relativePath/>
</parent>
[turbine-fulcrum-intake] 01/03: Remove duplicate custom/skin setting (since Turbone Parent 10
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git
commit 52fe854fa4278111658f2af56885215f8d6a9ada
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Tue Dec 14 11:43:19 2021 +0100
Remove duplicate custom/skin setting (since Turbone Parent 10
---
src/site/site.xml | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/site/site.xml b/src/site/site.xml
index 3508561..6575469 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,11 +19,6 @@
-->
<project name="Fulcrum Intake">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.9</version>
- </skin>
<body>
<menu name="Overview">
@@ -31,11 +26,5 @@
<item name="Howto" href="/howto.html"/>
</menu>
</body>
-
- <custom>
- <fluidoSkin>
- <topBarEnabled>false</topBarEnabled>
- <sideBarEnabled>true</sideBarEnabled>
- </fluidoSkin>
- </custom>
+
</project>
[turbine-fulcrum-intake] 02/03: Update: Use Java 8 streams and Method refs, update .gitignore
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git
commit b8239065d339de78534ce53831cc31f5964c3b47
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Tue Dec 14 12:06:38 2021 +0100
Update: Use Java 8 streams and Method refs, update .gitignore
---
src/java/org/apache/fulcrum/intake/model/AppData.java | 14 +++++---------
src/java/org/apache/fulcrum/intake/model/Group.java | 9 +++------
.../apache/fulcrum/intake/validator/FieldReference.java | 11 ++++-------
3 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/src/java/org/apache/fulcrum/intake/model/AppData.java b/src/java/org/apache/fulcrum/intake/model/AppData.java
index 4a21b49..cfd199c 100644
--- a/src/java/org/apache/fulcrum/intake/model/AppData.java
+++ b/src/java/org/apache/fulcrum/intake/model/AppData.java
@@ -21,6 +21,7 @@ package org.apache.fulcrum.intake.model;
import java.io.Serializable;
import java.util.List;
+import java.util.stream.Collectors;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -191,14 +192,9 @@ public class AppData implements Serializable
@Override
public String toString()
{
- StringBuilder result = new StringBuilder();
-
- result.append("<input-data>\n");
- for (Group group : groups)
- {
- result.append(group);
- }
- result.append("</input-data>");
- return result.toString();
+ return groups.stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining("", "<input-data>\n",
+ "</input-data>"));
}
}
diff --git a/src/java/org/apache/fulcrum/intake/model/Group.java b/src/java/org/apache/fulcrum/intake/model/Group.java
index 03bda97..91db443 100644
--- a/src/java/org/apache/fulcrum/intake/model/Group.java
+++ b/src/java/org/apache/fulcrum/intake/model/Group.java
@@ -680,12 +680,9 @@ public class Group implements Serializable, LogEnabled
}
// map fields by their mapToObject
- List<Field<?>> tmpFields = mapToObjectFieldLists.get(field.getMapToObject());
- if (tmpFields == null)
- {
- tmpFields = new ArrayList<Field<?>>(fields.size());
- mapToObjectFieldLists.put(field.getMapToObject(), tmpFields);
- }
+ List<Field<?>> tmpFields = mapToObjectFieldLists.computeIfAbsent(
+ field.getMapToObject(),
+ k -> new ArrayList<Field<?>>(fields.size()));
tmpFields.add(field);
}
diff --git a/src/java/org/apache/fulcrum/intake/validator/FieldReference.java b/src/java/org/apache/fulcrum/intake/validator/FieldReference.java
index 8813fc1..de4633d 100644
--- a/src/java/org/apache/fulcrum/intake/validator/FieldReference.java
+++ b/src/java/org/apache/fulcrum/intake/validator/FieldReference.java
@@ -19,6 +19,7 @@ package org.apache.fulcrum.intake.validator;
* under the License.
*/
+import java.util.Arrays;
import java.util.List;
import org.apache.fulcrum.intake.IntakeException;
@@ -92,13 +93,9 @@ public class FieldReference
{
if (string != null)
{
- for (Comparison c : Comparison.values())
- {
- if (string.equals(c.text))
- {
- return c;
- }
- }
+ return Arrays.stream(Comparison.values())
+ .filter(c -> string.equals(c.text)).findFirst()
+ .orElse(null);
}
return null;