Skip to content

Commit e5d6d53

Browse files
committed
#4235 Fix RefreshAfterWrite cache setting display to be a duration
1 parent e3a0c7e commit e5d6d53

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

stroom-config/stroom-config-app/src/test/resources/stroom/config/app/expected.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ appConfig:
5656
offHeapResults: true
5757
valueQueueSize: 10000
5858
streamingAnalyticCache:
59-
expireAfterAccess: "PT10M"
59+
expireAfterAccess: null
6060
expireAfterWrite: null
6161
maximumSize: 1000
62-
refreshAfterWrite: null
62+
refreshAfterWrite: "PT10M"
6363
timezone: "UTC"
6464
annotation:
6565
createText: "Create Annotation"

stroom-core-client/src/main/java/stroom/analytics/client/gin/AnalyticsModule.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
import stroom.analytics.client.presenter.AnalyticRulePresenter;
2929
import stroom.analytics.client.presenter.AnalyticStreamDestinationPresenter;
3030
import stroom.analytics.client.presenter.AnalyticStreamDestinationPresenter.AnalyticStreamDestinationView;
31-
import stroom.analytics.client.presenter.ScheduledProcessingPresenter;
32-
import stroom.analytics.client.presenter.ScheduledProcessingPresenter.ScheduledProcessingView;
3331
import stroom.analytics.client.presenter.ScheduledProcessEditPresenter;
3432
import stroom.analytics.client.presenter.ScheduledProcessEditView;
33+
import stroom.analytics.client.presenter.ScheduledProcessingPresenter;
34+
import stroom.analytics.client.presenter.ScheduledProcessingPresenter.ScheduledProcessingView;
3535
import stroom.analytics.client.presenter.StreamingProcessingPresenter;
3636
import stroom.analytics.client.presenter.StreamingProcessingPresenter.StreamingProcessingView;
3737
import stroom.analytics.client.presenter.TableBuilderProcessingPresenter;

stroom-core-client/src/main/java/stroom/analytics/client/view/ScheduledProcessEditViewImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package stroom.analytics.client.view;
1818

19-
import stroom.analytics.client.presenter.ScheduledProcessEditView;
2019
import stroom.analytics.client.presenter.ProcessingStatusUiHandlers;
20+
import stroom.analytics.client.presenter.ScheduledProcessEditView;
2121
import stroom.item.client.SelectionBox;
2222
import stroom.schedule.client.ScheduleBox;
2323
import stroom.widget.datepicker.client.DateTimeBox;

stroom-core-client/src/main/java/stroom/processor/client/presenter/ProcessorListPresenter.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import stroom.entity.client.presenter.HasDocumentRead;
4242
import stroom.entity.client.presenter.TreeRowHandler;
4343
import stroom.pipeline.shared.PipelineDoc;
44-
import stroom.preferences.client.DateTimeFormatter;
4544
import stroom.processor.shared.FetchProcessorRequest;
4645
import stroom.processor.shared.Processor;
4746
import stroom.processor.shared.ProcessorFilter;
@@ -85,7 +84,6 @@ public class ProcessorListPresenter extends MyPresenterWidget<PagerView>
8584
private final RestDataProvider<ProcessorListRow, ProcessorListRowResultPage> dataProvider;
8685
private final TooltipPresenter tooltipPresenter;
8786
private final FetchProcessorRequest request;
88-
private final DateTimeFormatter dateTimeFormatter;
8987
private final ProcessorInfoBuilder processorInfoBuilder;
9088
private boolean doneDataDisplay = false;
9189
private Column<ProcessorListRow, Expander> expanderColumn;
@@ -105,7 +103,6 @@ public ProcessorListPresenter(final EventBus eventBus,
105103
final PagerView view,
106104
final TooltipPresenter tooltipPresenter,
107105
final RestFactory restFactory,
108-
final DateTimeFormatter dateTimeFormatter,
109106
final ProcessorInfoBuilder processorInfoBuilder) {
110107
super(eventBus, view);
111108

@@ -114,7 +111,6 @@ public ProcessorListPresenter(final EventBus eventBus,
114111
view.setDataWidget(dataGrid);
115112

116113
this.tooltipPresenter = tooltipPresenter;
117-
this.dateTimeFormatter = dateTimeFormatter;
118114
this.processorInfoBuilder = processorInfoBuilder;
119115

120116
request = new FetchProcessorRequest();
@@ -212,7 +208,7 @@ private void onChangeData(final ProcessorListRowResultPage data) {
212208
if (nextSelection != null) {
213209
for (final ProcessorListRow row : data.getValues()) {
214210
if (row instanceof ProcessorFilterRow) {
215-
if (nextSelection.equals(((ProcessorFilterRow) row).getProcessorFilter())) {
211+
if (nextSelection.equals(row)) {
216212
selectionModel.setSelected(row);
217213
break;
218214
}

0 commit comments

Comments
 (0)