You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2023/03/08 10:51:48 UTC
[myfaces] branch main updated: unused class
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new bc52be42d unused class
bc52be42d is described below
commit bc52be42d3b869adc18fcd73a767f83271f52a64
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Wed Mar 8 11:51:40 2023 +0100
unused class
---
.../myfaces/el/resolver/CompositeELResolver.java | 130 ---------------------
.../apache/myfaces/el/CompositeELResolverTest.java | 103 ----------------
2 files changed, 233 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeELResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeELResolver.java
deleted file mode 100644
index 9a1e0f3dd..000000000
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeELResolver.java
+++ /dev/null
@@ -1,130 +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.el.resolver;
-
-import java.beans.FeatureDescriptor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import jakarta.el.ELContext;
-import jakarta.el.ELResolver;
-
-/**
- * @author Mathias Broekelmann (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class CompositeELResolver extends jakarta.el.CompositeELResolver
-{
- private Collection<ELResolver> _elResolvers;
-
- @Override
- public Iterator<FeatureDescriptor> getFeatureDescriptors(final ELContext context, final Object base)
- {
- Collection<ELResolver> resolvers = _elResolvers;
- if (resolvers == null)
- {
- resolvers = Collections.emptyList();
- }
-
- return new CompositeIterator(context, base, resolvers.iterator());
- }
-
- /**
- * @param elResolver
- */
- @Override
- public final synchronized void add(final ELResolver elResolver)
- {
- super.add(elResolver);
-
- if (_elResolvers == null)
- {
- _elResolvers = new ArrayList<>();
- }
-
- _elResolvers.add(elResolver);
- }
-
- private static class CompositeIterator implements Iterator<FeatureDescriptor>
- {
- private final ELContext _context;
- private final Object _base;
- private final Iterator<ELResolver> _elResolvers;
-
- private FeatureDescriptor _nextFD;
- private Iterator<FeatureDescriptor> _currentFDIter;
-
- public CompositeIterator(final ELContext context, final Object base, final Iterator<ELResolver> elResolvers)
- {
- _context = context;
- _base = base;
- _elResolvers = elResolvers;
- }
-
- @Override
- public boolean hasNext()
- {
- if (_nextFD != null)
- {
- return true;
- }
- if (_currentFDIter != null)
- {
- while (_nextFD == null && _currentFDIter.hasNext())
- {
- _nextFD = _currentFDIter.next();
- }
- }
- if (_nextFD == null)
- {
- if (_elResolvers.hasNext())
- {
- _currentFDIter = _elResolvers.next().getFeatureDescriptors(_context, _base);
- }
- else
- {
- return false;
- }
- }
- return hasNext();
- }
-
- @Override
- public FeatureDescriptor next()
- {
- if (!hasNext())
- {
- throw new NoSuchElementException();
- }
- FeatureDescriptor next = _nextFD;
- _nextFD = null;
- return next;
- }
-
- @Override
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
-
- }
-}
diff --git a/impl/src/test/java/org/apache/myfaces/el/CompositeELResolverTest.java b/impl/src/test/java/org/apache/myfaces/el/CompositeELResolverTest.java
deleted file mode 100644
index 2b7a90940..000000000
--- a/impl/src/test/java/org/apache/myfaces/el/CompositeELResolverTest.java
+++ /dev/null
@@ -1,103 +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.el;
-
-import org.apache.myfaces.el.resolver.CompositeELResolver;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-
-import java.beans.FeatureDescriptor;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import jakarta.el.ELContext;
-import jakarta.el.ELResolver;
-
-import org.easymock.IAnswer;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Mathias Broekelmann (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class CompositeELResolverTest
-{
- private IMocksControl _mocksControl;
- private ELContext _elContext;
- private CompositeELResolver _testImpl;
-
- @BeforeEach
- public void setup()
- {
- _mocksControl = EasyMock.createControl();
- _elContext = _mocksControl.createMock(ELContext.class);
- _testImpl = new CompositeELResolver();
- }
-
- @Test
- public void testFeatureDescriptorsIterator()
- {
- ELResolver notnullFDResolver = _mocksControl.createMock(ELResolver.class);
- ELResolver emptyFDResolver = _mocksControl.createMock(ELResolver.class);
- Object base = new Object();
-
- _testImpl.add(notnullFDResolver);
- _testImpl.add(emptyFDResolver);
- _testImpl.add(notnullFDResolver);
-
- final List<FeatureDescriptor> fds = new ArrayList<FeatureDescriptor>();
- fds.add(new FeatureDescriptor());
- fds.add(null);
- fds.add(new FeatureDescriptor());
- fds.add(null);
- expect(notnullFDResolver.getFeatureDescriptors(eq(_elContext), eq(base))).andAnswer(
- new IAnswer<Iterator<FeatureDescriptor>>()
- {
- public Iterator<FeatureDescriptor> answer() throws Throwable
- {
- return fds.iterator();
- }
- }).anyTimes();
-
- List<FeatureDescriptor> emptyList = Collections.emptyList();
- expect(emptyFDResolver.getFeatureDescriptors(eq(_elContext), eq(base))).andReturn(emptyList.iterator());
-
- _mocksControl.replay();
-
- Iterator<FeatureDescriptor> descriptors = _testImpl.getFeatureDescriptors(_elContext, base);
-
- Assertions.assertNotNull(descriptors);
- Assertions.assertEquals(true, descriptors.hasNext());
- Assertions.assertEquals(fds.get(0), descriptors.next());
- Assertions.assertEquals(true, descriptors.hasNext());
- Assertions.assertEquals(fds.get(2), descriptors.next());
- Assertions.assertEquals(true, descriptors.hasNext());
- Assertions.assertEquals(fds.get(0), descriptors.next());
- Assertions.assertEquals(true, descriptors.hasNext());
- Assertions.assertEquals(fds.get(2), descriptors.next());
- Assertions.assertEquals(false, descriptors.hasNext());
-
- }
-}