- Fixes as per @aaime review

geoserver · Sep 21, 2018 · b7da171 · b7da171
1 parent 63dbd62
commit b7da171
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 27 deletions.
diff --git a/src/extension/wps/web-wps/pom.xml b/src/extension/wps/web-wps/pom.xml
@@ -79,15 +79,6 @@
           <groupId>org.apache.wicket</groupId>
           <artifactId>wicket-extensions</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-datetime</artifactId>
-            <version>${wicket.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
         <dependency>
           <groupId>org.geoserver.extension</groupId>
           <artifactId>gs-wps-core</artifactId>

diff --git a/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/ProcessStatusPage.java b/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/ProcessStatusPage.java
@@ -7,15 +7,14 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 import org.apache.wicket.Component;
 import org.apache.wicket.Session;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.datetime.markup.html.basic.DateLabel;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 import org.geoserver.web.GeoServerApplication;
 import org.geoserver.web.GeoServerSecuredPage;
 import org.geoserver.web.wicket.GeoServerDataProvider.Property;
@@ -57,8 +56,8 @@ protected Component getComponentForProperty(
                                     new SimpleDateFormat(
                                             "E, d MMM yyyy HH:mm:ss.SSS 'GMT'",
                                             Session.get().getLocale());
-                            return DateLabel.forDatePattern(
+                            gmtFrmt.setTimeZone(TimeZone.getTimeZone("GMT"));
-                                    id, Model.of((Date) value), gmtFrmt.toPattern());
+                            return new Label(id, gmtFrmt.format((Date) value));
                         }
                         return null;
                     }

diff --git a/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/ProcessStatusProvider.java b/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/ProcessStatusProvider.java
@@ -6,6 +6,7 @@
 
 import static org.geoserver.catalog.Predicates.acceptAll;
 import static org.geoserver.catalog.Predicates.or;
+import static org.geoserver.catalog.Predicates.sortBy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,6 +15,7 @@
 import java.util.logging.Logger;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
 import org.geoserver.catalog.Predicates;
+import org.geoserver.catalog.StoreInfo;
 import org.geoserver.web.GeoServerApplication;
 import org.geoserver.web.wicket.GeoServerDataProvider;
 import org.geoserver.wps.ProcessStatusStore;
@@ -25,7 +27,7 @@
 import org.geotools.util.logging.Logging;
 import org.opengis.filter.Filter;
 import org.opengis.filter.FilterFactory2;
-import org.opengis.filter.sort.SortOrder;
+import org.opengis.filter.sort.SortBy;
 
 /**
  * Provides a filtered, sorted view over the running/recently completed processes
@@ -179,16 +181,17 @@ protected List<ExecutionStatus> getFilteredItems() {
             query.setStartIndex((int) first);
             query.setMaxFeatures((int) count);
         }
-        SortParam sort = getSort();
+
+        final SortParam sort = getSort();
+
+        SortBy sortOrder = null;
         if (sort != null) {
-            SortByImpl[] sortBys = new SortByImpl[1];
+            SortBy[] sortBys = new SortByImpl[1];
             final Property<?> property = getProperty(sort);
             if (property.isSearchable()) { // we really need another flag
-                sortBys[0] = new SortByImpl(FF.property(property.getName()), SortOrder.ASCENDING);
+                final String sortProperty = ((BeanProperty<StoreInfo>) property).getPropertyPath();
-                FF.sort(property.getName(), SortOrder.ASCENDING);
+                sortOrder = sortBy(sortProperty, sort.isAscending());
-                if (!sort.isAscending()) {
+                sortBys[0] = sortOrder;
-                    sortBys[0].setSortOrder(SortOrder.DESCENDING);
-                }
                 query.setSortBy(sortBys);
             }
         }

diff --git a/src/extension/wps/web-wps/src/test/java/org/geoserver/wps/web/ProcessStatusPageTest.java b/src/extension/wps/web-wps/src/test/java/org/geoserver/wps/web/ProcessStatusPageTest.java
@@ -14,6 +14,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 import org.apache.wicket.behavior.AbstractAjaxBehavior;
 import org.custommonkey.xmlunit.SimpleNamespaceContext;
 import org.custommonkey.xmlunit.XMLUnit;
@@ -76,6 +77,7 @@ public void test() throws Exception {
         DateFormat df =
                 new SimpleDateFormat(
                         "E, d MMM yyyy HH:mm:ss.SSS 'GMT'", tester.getSession().getLocale());
+        df.setTimeZone(TimeZone.getTimeZone("GMT"));
         tester.assertLabel(
                 "table:listContainer:items:1:itemProperties:7:component",
                 df.format(status.getExpirationDate()));

diff --git a/src/extension/wps/wps-core/src/main/java/org/geoserver/wps/Executions.java b/src/extension/wps/wps-core/src/main/java/org/geoserver/wps/Executions.java
@@ -159,7 +159,7 @@ else if (request.owner != null
                     Executions.NO_SUCH_PROCESS_CODE, "No Process Execution available.");
         }
 
-        // Are we done? How to collect all the responses outputs?
+        // Going to collect all the responses outputs
         GetExecutionsTransformer executionsTransformer =
                 new GetExecutionsTransformer(
                         gs.getService(WPSInfo.class),

diff --git a/src/extension/wps/wps-core/src/main/java/org/geoserver/wps/GetExecutionsTransformer.java b/src/extension/wps/wps-core/src/main/java/org/geoserver/wps/GetExecutionsTransformer.java
@@ -528,7 +528,7 @@ protected void encodeDataInputs(
                                                         inputAttributes);
                                             }
                                         } catch (Exception e) {
-                                            // LOGGER.log(Level.WARNING, "", e);
+                                            LOGGER.log(Level.WARNING, "", e);
                                         }
                                     } else {
                                         if (ppio instanceof LiteralPPIO) {

diff --git a/...ension/wps/wps-core/src/main/java/org/geoserver/wps/executor/ProcessListenerNotifier.java b/...ension/wps/wps-core/src/main/java/org/geoserver/wps/executor/ProcessListenerNotifier.java
@@ -69,7 +69,7 @@ public void fireProgress(float progress, String task) {
 
             // Update the estimated completion.
             // By default we estimate the completion as:
-            // "time elapsed / percentage completed"
+            // "time elapsed millis / percentage completed"
             if (progress > 0) {
                 long timeEalpsedMillis =
                         (new Date().getTime() - status.getCreationTime().getTime());
@@ -81,7 +81,6 @@ public void fireProgress(float progress, String task) {
                 calendar.setTime(status.getCreationTime());
                 calendar.add(Calendar.MILLISECOND, estimatedCompletionMillis);
                 status.setEstimatedCompletion(calendar.getTime());
-                /** TODO: add / search for completion estimators extensions */
             }
 
             ProcessEvent event = new ProcessEvent(status, inputs, outputs);

diff --git a/src/extension/wps/wps-core/src/main/java/org/geoserver/wps/executor/WPSExecutionManager.java b/src/extension/wps/wps-core/src/main/java/org/geoserver/wps/executor/WPSExecutionManager.java
@@ -175,7 +175,6 @@ public ExecuteResponseType submit(final ExecuteRequest request, boolean synchron
         // Therefore at this stage we cannot still have an idea about such estimation.
         // We'll need to wait for the next poll / call to the ProcessListener
         status.setEstimatedCompletion(null);
-        /** TODO: add / search for completion estimators extensions */
 
         // By default, at the beginning, we'd suggest to make the next poll at least
         // half of the maximum execution time (if > 0).
@@ -184,7 +183,6 @@ public ExecuteResponseType submit(final ExecuteRequest request, boolean synchron
         calendar.setTime(new Date());
         calendar.add(Calendar.SECOND, nextPollTimeDelta);
         status.setNextPoll(new Date());
-        /** TODO: add / search for next poll estimators extensions */
         Executor executor =
                 new Executor(
                         request,