You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/03/28 12:50:17 UTC

svn commit: r1462059 - in /openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone: OwbArquillianScannerService.java UrlSet.java

Author: struberg
Date: Thu Mar 28 11:50:17 2013
New Revision: 1462059

URL: http://svn.apache.org/r1462059
Log:
OWB-807 add a special UrlSet to improve archive scan performance

Added:
    openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java
Modified:
    openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java

Modified: openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java?rev=1462059&r1=1462058&r2=1462059&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java (original)
+++ openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java Thu Mar 28 11:50:17 2013
@@ -48,7 +48,7 @@ public class OwbArquillianScannerService
     private boolean beansXmlBdaScanningEnabled;
     private Archive archive;
 
-    private Set<URL> beansXmls = new HashSet<URL>();
+    private Set<URL> beansXmls = new UrlSet();
     private Set<Class<?>> beanClasses = new HashSet<Class<?>>();
 
 

Added: openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java?rev=1462059&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java (added)
+++ openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java Thu Mar 28 11:50:17 2013
@@ -0,0 +1,128 @@
+/*
+ * 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.webbeans.arquillian.standalone;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A {@link java.util.Set} which only takes the externalForm
+ * as key instead the very expensive hashCode.
+ */
+public class UrlSet implements Set<URL>
+{
+    private Map<String, URL> urlMap = new HashMap<String, URL>();
+
+
+    @Override
+    public boolean add(URL url)
+    {
+        return urlMap.put(url.toExternalForm(), url) == null;
+    }
+
+    @Override
+    public int size()
+    {
+        return urlMap.size();
+    }
+
+    @Override
+    public boolean isEmpty()
+    {
+        return urlMap.isEmpty();
+    }
+
+    @Override
+    public boolean contains(Object o)
+    {
+        if (o instanceof URL && o != null)
+        {
+            return urlMap.containsKey(((URL) o).toExternalForm());
+        }
+
+        return false;
+    }
+
+    @Override
+    public Iterator<URL> iterator()
+    {
+        return urlMap.values().iterator();
+    }
+
+    @Override
+    public Object[] toArray()
+    {
+        return urlMap.values().toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a)
+    {
+        return urlMap.values().toArray(a);
+    }
+
+    @Override
+    public boolean remove(Object o)
+    {
+        if (o instanceof URL && o != null)
+        {
+            return urlMap.remove(((URL) o).toExternalForm()) != null;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c)
+    {
+        // not implemented
+        return false;
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends URL> c)
+    {
+        // not implemented
+        return false;
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c)
+    {
+        // not implemented
+        return false;
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c)
+    {
+        // not implemented
+        return false;
+    }
+
+    @Override
+    public void clear()
+    {
+        urlMap.clear();
+    }
+}