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 2015/10/28 12:08:18 UTC
svn commit: r1710992 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: application/
cdi/util/ config/annotation/ context/servlet/ renderkit/ renderkit/html/
resource/ util/ view/facelets/compiler/ view/facelets/el/
view/facelets/impl/ vie...
Author: tandraschko
Date: Wed Oct 28 11:08:17 2015
New Revision: 1710992
URL: http://svn.apache.org/viewvc?rev=1710992&view=rev
Log:
MYFACES-3063 findbugs performance rules
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/DefaultResourceLibraryContractsProvider.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java Wed Oct 28 11:08:17 2015
@@ -997,7 +997,7 @@ public class NavigationHandlerImpl
{
if (viewId != null)
{
- index = viewId.lastIndexOf(".");
+ index = viewId.lastIndexOf('.');
if (index != -1)
{
@@ -1018,7 +1018,7 @@ public class NavigationHandlerImpl
String tempViewId = getNavigationHandlerSupport().calculateViewId(facesContext);
if (tempViewId != null)
{
- index = tempViewId.lastIndexOf(".");
+ index = tempViewId.lastIndexOf('.');
if(index != -1)
{
viewIdToTest.append(tempViewId.substring (index));
@@ -1045,7 +1045,7 @@ public class NavigationHandlerImpl
index = -1;
if( viewId != null )
{
- index = viewId.lastIndexOf ("/");
+ index = viewId.lastIndexOf('/');
}
if (index == -1)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java Wed Oct 28 11:08:17 2015
@@ -24,8 +24,6 @@ import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
import java.util.Set;
/**
@@ -230,11 +228,13 @@ public final class BeanProvider
return getContextualReference(type, getBeanManager(), bean);
}*/
+ /*
private static <T> T getContextualReference(Class<T> type, BeanManager beanManager, Bean<?> bean)
{
//noinspection unchecked
return getContextualReference(type, beanManager, new HashSet<Bean<?>>((Collection) Arrays.asList(bean)));
}
+ */
/**
* <p>Get a list of Contextual References by type independent of the qualifier
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java Wed Oct 28 11:08:17 2015
@@ -320,7 +320,7 @@ public class AnnotationConfigurator
// first character lowercase.
beanName = clazz.getName();
- index = beanName.lastIndexOf(".");
+ index = beanName.lastIndexOf('.');
if (index != -1)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Wed Oct 28 11:08:17 2015
@@ -67,8 +67,8 @@ public final class ServletExternalContex
private static final Logger log = Logger.getLogger(ServletExternalContextImpl.class.getName());
private static final String URL_PARAM_SEPERATOR="&";
- private static final String URL_QUERY_SEPERATOR="?";
- private static final String URL_FRAGMENT_SEPERATOR="#";
+ private static final char URL_QUERY_SEPERATOR='?';
+ private static final char URL_FRAGMENT_SEPERATOR='#';
private static final String URL_NAME_VALUE_PAIR_SEPERATOR="=";
private ServletRequest _servletRequest;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java Wed Oct 28 11:08:17 2015
@@ -794,7 +794,7 @@ public final class ErrorPageWriter
SortedMap<String, Object> sortedMap = new TreeMap<String, Object>(vars);
for (Map.Entry<String, Object> entry : sortedMap.entrySet())
{
- String key = entry.getKey().toString();
+ String key = entry.getKey();
if (key.indexOf('.') == -1)
{
writer.write("<tr><td>");
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java Wed Oct 28 11:08:17 2015
@@ -256,11 +256,11 @@ public class HtmlAjaxBehaviorRenderer ex
List<String> parameterList = new ArrayList<String>(paramSize + 2);
if (executes != null)
{
- parameterList.add(executes.toString());
+ parameterList.add(executes);
}
if (render != null)
{
- parameterList.add(render.toString());
+ parameterList.add(render);
}
if (onError != null)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Wed Oct 28 11:08:17 2015
@@ -401,14 +401,6 @@ public class HtmlRenderKitImpl extends R
{
return new MyFacesResponseStream(outputStream);
}
-
- private void checkNull(Object value, String valueLabel)
- {
- if (value == null)
- {
- throw new NullPointerException(valueLabel + " is null");
- }
- }
private static class MyFacesResponseStream extends ResponseStream
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/DefaultResourceLibraryContractsProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/DefaultResourceLibraryContractsProvider.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/DefaultResourceLibraryContractsProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/DefaultResourceLibraryContractsProvider.java Wed Oct 28 11:08:17 2015
@@ -84,7 +84,7 @@ public class DefaultResourceLibraryContr
{
String urlString = urls[i].toExternalForm();
int suffixPos = urlString.lastIndexOf(META_INF_CONTRACTS_FILE);
- int slashPos = urlString.lastIndexOf("/", suffixPos-1);
+ int slashPos = urlString.lastIndexOf('/', suffixPos-1);
if (suffixPos > 0 && slashPos > 0)
{
contracts.add(urlString.substring(slashPos+1, suffixPos));
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java Wed Oct 28 11:08:17 2015
@@ -355,7 +355,7 @@ public class DebugUtils
name = name.substring("javax.faces.webapp.UIComponentTag.".length());
}
stream.print(' ');
- stream.print(name.toString());
+ stream.print(name);
stream.print("=\"");
if (value != null)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java Wed Oct 28 11:08:17 2015
@@ -20,7 +20,6 @@ package org.apache.myfaces.view.facelets
import java.io.IOException;
import java.io.InputStream;
-import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLConnection;
import javax.faces.context.ExternalContext;
@@ -40,7 +39,6 @@ import org.apache.myfaces.config.impl.di
import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletValidatorTagImpl;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.util.ClassUtils;
-import org.apache.myfaces.view.facelets.util.ReflectionUtil;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
@@ -408,71 +406,6 @@ public class TagLibraryConfigUnmarshalle
return s;
}
- @SuppressWarnings("unchecked")
- private static <T> Class<? extends T> createClass(Class<T> type, String name) throws Exception
- {
- Class<? extends T> factory = (Class<? extends T>)ReflectionUtil.forName(name);
- if (!type.isAssignableFrom(factory))
- {
- throw new Exception(name + " must be an instance of " + type.getName());
- }
- return factory;
- }
-
- private static Method createMethod(Class<?> type, String s) throws Exception
- {
- int pos = s.indexOf(' ');
- if (pos == -1)
- {
- throw new Exception("Must Provide Return Type: " + s);
- }
- else
- {
- int pos2 = s.indexOf('(', pos + 1);
- if (pos2 == -1)
- {
- throw new Exception("Must provide a method name, followed by '(': " + s);
- }
- else
- {
- String mn = s.substring(pos + 1, pos2).trim();
- pos = s.indexOf(')', pos2 + 1);
- if (pos == -1)
- {
- throw new Exception("Must close parentheses, ')' missing: " + s);
- }
- else
- {
- String[] ps = s.substring(pos2 + 1, pos).trim().split(",");
- Class<?>[] pc;
- if (ps.length == 1 && "".equals(ps[0]))
- {
- pc = new Class[0];
- }
- else
- {
- pc = new Class[ps.length];
- for (int i = 0; i < pc.length; i++)
- {
- pc[i] = ReflectionUtil.forName(ps[i].trim());
- }
- }
- try
- {
- return type.getMethod(mn, pc);
- }
- catch (NoSuchMethodException e)
- {
- throw new Exception("No Function Found on type: " + type.getName() + " with signature: "
- + s);
- }
-
- }
-
- }
- }
- }
-
public InputSource resolveEntity(String publicId, String systemId) throws SAXException
{
if ("-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN".equals(publicId))
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java Wed Oct 28 11:08:17 2015
@@ -710,22 +710,6 @@ final class TextUnit extends Compilation
}
return size;
}
-
- private static int getFirstTextCharLocationIgnoringSpacesTabsAndCarriageReturn(String text)
- {
- for (int i = 0; i < text.length(); i++)
- {
- if (Character.isWhitespace(text.charAt(i)))
- {
- continue;
- }
- else
- {
- return i;
- }
- }
- return text.length();
- }
private static int getLastTextCharLocationIgnoringSpacesTabsAndCarriageReturn(String text)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java Wed Oct 28 11:08:17 2015
@@ -537,7 +537,7 @@ public class ELText
if (buff.length() > 0)
{
- text.add(new ELText(new String(buff.toString())));
+ text.add(new ELText(buff.toString()));
buff.setLength(0);
}
@@ -622,7 +622,7 @@ public class ELText
if (buff.length() > 0)
{
- text.add(new ELText(new String(buff.toString())));
+ text.add(new ELText(buff.toString()));
buff.setLength(0);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java Wed Oct 28 11:08:17 2015
@@ -296,8 +296,7 @@ final class DefaultFaceletContext extend
// with htmlunit 2.4 or lower, so in order to prevent it it is better to use
// only positive values instead.
// Take into account CompilationManager.nextTagId() uses Math.abs too.
- Integer prefixInt = new Integer(Math.abs(_uniqueIdBuilder.toString().hashCode()));
- _prefix = prefixInt.toString();
+ _prefix = Integer.toString(Math.abs(_uniqueIdBuilder.toString().hashCode()));
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java?rev=1710992&r1=1710991&r2=1710992&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java Wed Oct 28 11:08:17 2015
@@ -114,7 +114,7 @@ public final class UIDebug extends UICom
+ this.getHotkey() + "' & e.shiftKey & e.ctrlKey) faceletsDebug('");
sb.append(actionId);
- int index = actionId.indexOf ("?");
+ int index = actionId.indexOf('?');
if (index != -1)
{
sb.append('&');