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 2019/02/27 14:51:09 UTC
[myfaces-tobago] branch master updated: clean up deprecated code
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
The following commit(s) were added to refs/heads/master by this push:
new 149fde0 clean up deprecated code
149fde0 is described below
commit 149fde0f7d1dc5c1716b6cc5f5d498bc26510d18
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Feb 27 15:50:55 2019 +0100
clean up deprecated code
---
.../apache/myfaces/tobago/util/BeanComparator.java | 83 ----------------------
.../tobago/util/ValueExpressionComparator.java | 37 ----------
...java => ValueExpressionComparatorUnitTest.java} | 16 +++--
3 files changed, 9 insertions(+), 127 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
deleted file mode 100644
index dc2b907..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.beans.PropertyDescriptor;
-import java.io.Serializable;
-import java.lang.invoke.MethodHandles;
-import java.util.Comparator;
-
-/**
- * @deprecated since 4.4.0. Please use {@link ValueExpressionComparator}.
- */
-@Deprecated
-public class BeanComparator extends ComparatorBase implements Serializable {
-
- private static final long serialVersionUID = -7450094725566090886L;
-
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- private String property;
-
- public BeanComparator(final String property, final Comparator comparator, final boolean reverse) {
- super(reverse, comparator);
- this.property = property;
- }
-
- public boolean equals(final Object param1) {
- if (this == param1) {
- return true;
- }
- if (param1 instanceof BeanComparator) {
- return ((BeanComparator) param1).getProperty().equals(property)
- && super.equals(param1);
- }
- return false;
- }
-
- public int hashCode() {
- int result;
- result = property != null ? property.hashCode() : 0;
- result = 29 * result + super.hashCode();
- return result;
- }
-
- @Override
- public int compare(final Object param1, final Object param2) {
- final Object obj1;
- final Object obj2;
- try {
- obj1 = new PropertyDescriptor(property, param1.getClass(), property, null).getReadMethod().invoke(param1);
- obj2 = new PropertyDescriptor(property, param2.getClass(), property, null).getReadMethod().invoke(param2);
- } catch (final Exception e) {
- LOG.error(e.getMessage(), e);
- return 0;
- }
-
- return internalCompare(obj1, obj2);
- }
-
- public String getProperty() {
- return this.property;
- }
-}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
index 6fcd9af..e9b7c05 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
@@ -38,43 +38,6 @@ public class ValueExpressionComparator extends ComparatorBase {
private ValueExpression valueExpression;
- /**
- * @deprecated since 4.0.0
- */
- @Deprecated
- public ValueExpressionComparator(
- final FacesContext facesContext, final String var, final ValueExpression valueExpression) {
- this.facesContext = facesContext;
- this.var = var;
- this.valueExpression = valueExpression;
- }
-
- /**
- * @deprecated since 4.0.0
- */
- @Deprecated
- public ValueExpressionComparator(
- final FacesContext facesContext, final String var, final ValueExpression valueExpression,
- final boolean reverse) {
- super(reverse);
- this.facesContext = facesContext;
- this.var = var;
- this.valueExpression = valueExpression;
- }
-
- /**
- * @deprecated since 4.0.0
- */
- @Deprecated
- public ValueExpressionComparator(
- final FacesContext facesContext, final String var,
- final ValueExpression valueExpression, final Comparator comparator) {
- super(comparator);
- this.facesContext = facesContext;
- this.var = var;
- this.valueExpression = valueExpression;
- }
-
public ValueExpressionComparator(
final FacesContext facesContext, final String var,
final ValueExpression valueExpression, final boolean reverse, final Comparator comparator) {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/BeanComparatorUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ValueExpressionComparatorUnitTest.java
similarity index 76%
rename from tobago-core/src/test/java/org/apache/myfaces/tobago/util/BeanComparatorUnitTest.java
rename to tobago-core/src/test/java/org/apache/myfaces/tobago/util/ValueExpressionComparatorUnitTest.java
index e7757c0..30bece7 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/BeanComparatorUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ValueExpressionComparatorUnitTest.java
@@ -19,6 +19,8 @@
package org.apache.myfaces.tobago.util;
+import org.apache.myfaces.test.el.MockValueExpression;
+import org.apache.myfaces.tobago.internal.config.AbstractTobagoTestBase;
import org.apache.myfaces.tobago.internal.util.Fruit;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -26,17 +28,15 @@ import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
-/**
- * @deprecated since 4.4.0
- */
-@Deprecated
-public class BeanComparatorUnitTest {
+public class ValueExpressionComparatorUnitTest extends AbstractTobagoTestBase {
@Test
public void testComparingInstancesOfDifferentClasses() {
+
final List<Fruit> original = Fruit.getFreshFruits();
- final BeanComparator ascendingComparator = new BeanComparator("name", null, false);
+ final ValueExpressionComparator ascendingComparator = new ValueExpressionComparator(
+ facesContext, "var", new MockValueExpression("#{var.name}", String.class), false, null);
final List<Fruit> ascending = new ArrayList<>(original);
ascending.sort(ascendingComparator);
@@ -45,7 +45,9 @@ public class BeanComparatorUnitTest {
Assertions.assertEquals(original.get(1), ascending.get(2), "#2");
Assertions.assertEquals(original.get(2), ascending.get(3), "#3");
- final BeanComparator descendingComparator = new BeanComparator("name", null, true);
+ final ValueExpressionComparator descendingComparator = new ValueExpressionComparator(
+ facesContext, "var", new MockValueExpression("#{var.name}", String.class), true, null);
+
final List<Fruit> descending = new ArrayList<>(original);
descending.sort(descendingComparator);