Reduce usage of cglib lazy loading, switch it to use the spring embed…

…ded version, but could not get rid of the warning fully
geoserver · Oct 25, 2018 · 7c9cbd5 · 7c9cbd5
1 parent d713333
commit 7c9cbd5
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 19 deletions.
diff --git a/src/wfs/pom.xml b/src/wfs/pom.xml
@@ -41,10 +41,6 @@
       <groupId>org.geotools</groupId>
       <artifactId>gt-shapefile</artifactId>
     </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>

diff --git a/src/wfs/src/main/java/org/geoserver/wfs/CountExecutor.java b/src/wfs/src/main/java/org/geoserver/wfs/CountExecutor.java
@@ -36,12 +36,16 @@ public CountExecutor(int providedCount) {
     }
 
     public int getCount() throws IOException {
-        if (providedCount != COUNT_UNSET) {
+        if (isCountSet()) {
             return providedCount;
         } else {
             // make sure we get a count by getting a feature colleciton
             // FeatureSource.getCount(...) can return -1
             return source.getFeatures(query).size();
         }
     }
+
+    public boolean isCountSet() {
+        return providedCount != COUNT_UNSET;
+    }
 }
diff --git a/src/wfs/src/main/java/org/geoserver/wfs/GetFeature.java b/src/wfs/src/main/java/org/geoserver/wfs/GetFeature.java
@@ -23,8 +23,6 @@
 import net.opengis.wfs.XlinkPropertyNameType;
 import net.opengis.wfs20.ResultTypeType;
 import net.opengis.wfs20.StoredQueryType;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.LazyLoader;
 import org.geoserver.catalog.AttributeTypeInfo;
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.FeatureTypeInfo;
@@ -115,6 +113,8 @@
 import org.opengis.filter.temporal.TEquals;
 import org.opengis.metadata.extent.GeographicBoundingBox;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.LazyLoader;
 import org.xml.sax.helpers.NamespaceSupport;
 
 /**
@@ -764,6 +764,9 @@ public FeatureCollectionResponse run(GetFeatureRequest request) throws WFSExcept
                 // optimization: if count < max features then total count == count
                 // can't use this optimization for v2
                 totalCount = BigInteger.valueOf(count);
+            } else if (isPreComputed(totalCountExecutors)) {
+                long total = getTotalCount(totalCountExecutors);
+                totalCount = BigInteger.valueOf(total);
             } else {
                 // ok, in this case we're forced to run the queries to discover the actual total
                 // count
@@ -777,18 +780,7 @@ public FeatureCollectionResponse run(GetFeatureRequest request) throws WFSExcept
 
                             @Override
                             public Object loadObject() throws Exception {
-                                long totalCount = 0;
-                                for (CountExecutor q : totalCountExecutors) {
-                                    int result = q.getCount();
-                                    // if the count is unknown for one, we don't know the total,
-                                    // period
-                                    if (result == -1) {
-                                        totalCount = -1;
-                                        break;
-                                    } else {
-                                        totalCount += result;
-                                    }
-                                }
+                                long totalCount = getTotalCount(totalCountExecutors);
                                 return BigInteger.valueOf(totalCount);
                             }
                         });
@@ -815,6 +807,32 @@ public Object loadObject() throws Exception {
                 getFeatureById);
     }
 
+    /** Returns true if all count executors are given a static count value */
+    private boolean isPreComputed(List<CountExecutor> totalCountExecutors) {
+        for (CountExecutor q : totalCountExecutors) {
+            if (!q.isCountSet()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private long getTotalCount(List<CountExecutor> totalCountExecutors) throws IOException {
+        long totalCount = 0;
+        for (CountExecutor q : totalCountExecutors) {
+            int result = q.getCount();
+            // if the count is unknown for one, we don't know the total,
+            // period
+            if (result == -1) {
+                totalCount = -1;
+                break;
+            } else {
+                totalCount += result;
+            }
+        }
+        return totalCount;
+    }
+
     private Filter toFeatureIdFilter(List<FeatureId> lockedFeatures) {
         if (lockedFeatures == null || lockedFeatures.isEmpty()) {
             return Filter.EXCLUDE;