You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/09/20 14:27:24 UTC
[myfaces-tobago] 04/07: TOBAGO-1795: Set Java Source to Java 8 *
simplifications
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 9541a6339cc568c47877dbf8174819b6721d756e
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Sep 20 15:58:45 2017 +0200
TOBAGO-1795: Set Java Source to Java 8
* simplifications
---
.../org/apache/myfaces/tobago/context/Markup.java | 22 ++++++++++-------
.../internal/component/AbstractUIMessages.java | 17 ++++---------
.../tobago/internal/config/TobagoConfigSorter.java | 3 +--
.../example/demo/SheetSortingController.java | 28 +++-------------------
.../tobago/apt/processor/AbstractGenerator.java | 8 +------
.../apt/processor/CheckstyleConfigGenerator.java | 8 +------
.../tobago/apt/processor/FacesConfigGenerator.java | 16 ++-----------
.../tobago/apt/processor/TaglibGenerator.java | 8 +------
8 files changed, 26 insertions(+), 84 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
index 44f70e1..029cadc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
@@ -19,15 +19,13 @@
package org.apache.myfaces.tobago.context;
-import org.apache.commons.collections4.iterators.EmptyIterator;
-import org.apache.commons.collections4.iterators.ObjectArrayIterator;
-import org.apache.commons.collections4.iterators.SingletonIterator;
import org.apache.myfaces.tobago.internal.util.ArrayUtils;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -96,13 +94,19 @@ public final class Markup implements Serializable, Iterable<String> {
public static final Markup RIGHT = valueOf("right");
public static final Markup SECONDS = valueOf("seconds");
public static final Markup SELECTED = valueOf("selected");
- /** @deprecated since 3.0.4 */
+ /**
+ * @deprecated since 3.0.4
+ */
@Deprecated
public static final Markup SHEET_SELECT_ALL = valueOf("sheetSelectAll");
- /** @deprecated since 3.0.4 */
+ /**
+ * @deprecated since 3.0.4
+ */
@Deprecated
public static final Markup SHEET_DESELECT_ALL = valueOf("sheetDeselectAll");
- /** @deprecated since 3.0.4 */
+ /**
+ * @deprecated since 3.0.4
+ */
@Deprecated
public static final Markup SHEET_TOGGLE_ALL = valueOf("sheetToggleAll");
public static final Markup SMALL = valueOf("small");
@@ -210,12 +214,12 @@ public final class Markup implements Serializable, Iterable<String> {
@Override
public Iterator<String> iterator() {
if (value != null) {
- return new SingletonIterator(value);
+ return Collections.singleton(value).iterator();
}
if (values != null) {
- return new ObjectArrayIterator(values);
+ return Arrays.asList(values).iterator();
}
- return EmptyIterator.INSTANCE;
+ return Collections.emptyIterator();
}
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
index c620411..d50f7c2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.commons.collections4.iterators.SingletonIterator;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.layout.OrderBy;
@@ -27,7 +26,6 @@ import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -41,9 +39,9 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
final Iterator clientIds;
if (isGlobalOnly()) {
- clientIds = new SingletonIterator(null);
+ clientIds = Collections.singleton(null).iterator();
} else if (getFor() != null) {
- clientIds = new SingletonIterator(getFor());
+ clientIds = Collections.singleton(getFor()).iterator();
} else {
clientIds = facesContext.getClientIdsWithMessages();
}
@@ -52,8 +50,8 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
// todo
if (OrderBy.severity == getOrderBy()) {
- // sort
- Collections.sort(messages, new ItemComparator());
+ messages.sort((d1, d2)
+ -> d2.getFacesMessage().getSeverity().getOrdinal() - d1.getFacesMessage().getSeverity().getOrdinal());
}
return messages;
}
@@ -107,13 +105,6 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
}
}
- public static class ItemComparator implements Comparator<Item> {
- @Override
- public int compare(final Item item1, final Item item2) {
- return item2.getFacesMessage().getSeverity().getOrdinal() - item1.getFacesMessage().getSeverity().getOrdinal();
- }
- }
-
public abstract FacesMessage.Severity getMinSeverity();
public abstract FacesMessage.Severity getMaxSeverity();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
index 54d4a0f..a93571e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
@@ -27,7 +27,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -267,7 +266,7 @@ public class TobagoConfigSorter implements Comparator<TobagoConfigFragment> {
}
protected void sort0() {
- Collections.sort(list, this);
+ list.sort(this);
}
private boolean isInRelation(final TobagoConfigFragment lower, final TobagoConfigFragment higher) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
index 92132cc..bed5417 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
@@ -56,36 +56,14 @@ public class SheetSortingController extends SheetController implements Serializa
LOG.info("Sorting column '{}'", columnId);
- Comparator<SolarObject> comparator = null;
-
if ("customColumnName".equals(columnId)) {
- comparator = new Comparator<SolarObject>() {
- @Override
- public int compare(final SolarObject o1, final SolarObject o2) {
- return o1.getName().compareToIgnoreCase(o2.getName());
- }
- };
+ list.sort(Comparator.comparing(SolarObject::getName, String.CASE_INSENSITIVE_ORDER));
} else if ("customColumnPeriod".equals(columnId)) {
- comparator = new Comparator<SolarObject>() {
- @Override
- public int compare(final SolarObject o1, final SolarObject o2) {
- Double period1 = Math.abs(o1.getPeriod());
- Double period2 = Math.abs(o2.getPeriod());
- return period1.compareTo(period2);
- }
- };
+ list.sort(Comparator.comparing(d -> Math.abs(d.getPeriod())));
} else if ("customColumnYear".equals(columnId)) {
- comparator = new Comparator<SolarObject>() {
- @Override
- public int compare(final SolarObject o1, final SolarObject o2) {
- Integer discoverYear1 = o1.getDiscoverYear() != null ? o1.getDiscoverYear() : 0;
- Integer discoverYear2 = o2.getDiscoverYear() != null ? o2.getDiscoverYear() : 0;
- return discoverYear1.compareTo(discoverYear2);
- }
- };
+ list.sort(Comparator.comparing(d -> d.getDiscoverYear() != null ? d.getDiscoverYear() : 0));
}
- Collections.sort(list, comparator);
if (!sheetState.isAscending()) {
Collections.reverse(list);
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java
index 87aa0fa..eb404cf 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java
@@ -31,7 +31,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
@@ -76,12 +75,7 @@ public abstract class AbstractGenerator extends AbstractProcessor {
}
}
- Collections.sort(types, new Comparator<TypeElement>() {
- @Override
- public int compare(final TypeElement d1, final TypeElement d2) {
- return d1.getSimpleName().toString().compareTo(d2.getSimpleName().toString());
- }
- });
+ types.sort(Comparator.comparing(d -> d.getSimpleName().toString()));
configure();
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
index 46a7c1e..f4bad93 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
@@ -52,7 +52,6 @@ import javax.xml.transform.stream.StreamResult;
import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
@@ -279,12 +278,7 @@ public class CheckstyleConfigGenerator extends AbstractGenerator {
private List<? extends javax.lang.model.element.Element> getAllMembers(final TypeElement type) {
final List<? extends javax.lang.model.element.Element> members
= new ArrayList<javax.lang.model.element.Element>(processingEnv.getElementUtils().getAllMembers(type));
- Collections.sort(members, new Comparator<javax.lang.model.element.Element>() {
- @Override
- public int compare(final javax.lang.model.element.Element d1, final javax.lang.model.element.Element d2) {
- return d1.getSimpleName().toString().compareTo(d2.getSimpleName().toString());
- }
- });
+ members.sort(Comparator.comparing(d -> d.getSimpleName().toString()));
return members;
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
index ca7b233..e06142c 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
@@ -605,23 +605,11 @@ public class FacesConfigGenerator extends AbstractGenerator {
final List<org.jdom2.Element> properties = new ArrayList<org.jdom2.Element>();
addAttributes(typeElement, attributes, properties, namespace);
if (!attributes.isEmpty()) {
- Collections.sort(attributes, new Comparator<org.jdom2.Element>() {
- @Override
- public int compare(final org.jdom2.Element d1, final org.jdom2.Element d2) {
- return d1.getChildText(ATTRIBUTE_NAME, namespace).compareTo(
- d2.getChildText(ATTRIBUTE_NAME, namespace));
- }
- });
+ attributes.sort(Comparator.comparing(d -> d.getChildText(ATTRIBUTE_NAME, namespace)));
element.addContent(attributes);
}
if (!properties.isEmpty()) {
- Collections.sort(properties, new Comparator<org.jdom2.Element>() {
- @Override
- public int compare(final org.jdom2.Element d1, final org.jdom2.Element d2) {
- return d1.getChildText(PROPERTY_NAME, namespace).compareTo(
- d2.getChildText(PROPERTY_NAME, namespace));
- }
- });
+ properties.sort(Comparator.comparing(d -> d.getChildText(PROPERTY_NAME, namespace)));
element.addContent(properties);
}
element.addContent(createElementExtension(typeElement, componentTag, namespace));
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
index 1fbf8f2..46b4bd2 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
@@ -56,7 +56,6 @@ import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
@@ -388,12 +387,7 @@ public class TaglibGenerator extends AbstractGenerator {
private List<? extends javax.lang.model.element.Element> getAllMembers(final TypeElement type) {
final List<? extends javax.lang.model.element.Element> members
= new ArrayList<javax.lang.model.element.Element>(processingEnv.getElementUtils().getAllMembers(type));
- Collections.sort(members, new Comparator<javax.lang.model.element.Element>() {
- @Override
- public int compare(final javax.lang.model.element.Element d1, final javax.lang.model.element.Element d2) {
- return d1.getSimpleName().toString().compareTo(d2.getSimpleName().toString());
- }
- });
+ members.sort(Comparator.comparing(d -> d.getSimpleName().toString()));
return members;
}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.