Implement dirty based on equality

Author: stroomdev66

stroom-core-client/src/main/java/stroom/state/client/presenter/StateStorePresenter.java

@@ -17,8 +17,8 @@
 package stroom.state.client.presenter;
 
 import stroom.docref.DocRef;
+import stroom.entity.client.presenter.DocTabProvider;
 import stroom.entity.client.presenter.DocumentEditTabPresenter;
-import stroom.entity.client.presenter.DocumentEditTabProvider;
 import stroom.entity.client.presenter.LinkTabPanelView;
 import stroom.entity.client.presenter.MarkdownEditPresenter;
 import stroom.entity.client.presenter.MarkdownTabProvider;
@@ -47,7 +47,7 @@ public StateStorePresenter(
             final DocumentUserPermissionsTabProvider<StateDoc> documentUserPermissionsTabProvider) {
         super(eventBus, view);
 
-        addTab(SETTINGS, new DocumentEditTabProvider<>(indexSettingsPresenterProvider::get));
+        addTab(SETTINGS, new DocTabProvider<>(indexSettingsPresenterProvider::get));
         addTab(DOCUMENTATION, new MarkdownTabProvider<StateDoc>(eventBus, markdownEditPresenterProvider) {
             @Override
             public void onRead(final MarkdownEditPresenter presenter,
@@ -61,8 +61,7 @@ public void onRead(final MarkdownEditPresenter presenter,
             @Override
             public StateDoc onWrite(final MarkdownEditPresenter presenter,
                                     final StateDoc document) {
-                document.setDescription(presenter.getText());
-                return document;
+                return document.copy().description(presenter.getText()).build();
             }
         });
         addTab(PERMISSIONS, documentUserPermissionsTabProvider);

stroom-core-client/src/main/java/stroom/state/client/presenter/StateStoreSettingsPresenter.java

@@ -17,6 +17,7 @@
 package stroom.state.client.presenter;
 
 import stroom.docref.DocRef;
+import stroom.entity.client.presenter.DocPresenter;
 import stroom.entity.client.presenter.DocumentEditPresenter;
 import stroom.entity.client.presenter.ReadOnlyChangeHandler;
 import stroom.explorer.client.presenter.DocSelectionBoxPresenter;
@@ -33,7 +34,7 @@
 import com.gwtplatform.mvp.client.View;
 
 public class StateStoreSettingsPresenter
-        extends DocumentEditPresenter<StateStoreSettingsView, StateDoc>
+        extends DocPresenter<StateStoreSettingsView, StateDoc>
         implements StateStoreSettingsUiHandlers {
 
     private final DocSelectionBoxPresenter clusterPresenter;
@@ -56,12 +57,7 @@ public StateStoreSettingsPresenter(
 
     @Override
     protected void onBind() {
-        registerHandler(clusterPresenter.addDataSelectionHandler(event -> setDirty(true)));
-    }
-
-    @Override
-    public void onChange() {
-        setDirty(true);
+        registerHandler(clusterPresenter.addDataSelectionHandler(event -> onChange()));
     }
 
     @Override
@@ -80,15 +76,17 @@ protected void onRead(final DocRef docRef, final StateDoc doc, final boolean rea
 
     @Override
     protected StateDoc onWrite(final StateDoc doc) {
-        doc.setScyllaDbRef(clusterPresenter.getSelectedEntityReference());
-        doc.setStateType(getView().getStateType());
-        doc.setCondense(getView().isCondense());
-        doc.setCondenseAge(getView().getCondenseAge());
-        doc.setCondenseTimeUnit(getView().getCondenseTimeUnit());
-        doc.setRetainForever(getView().isRetainForever());
-        doc.setRetainAge(getView().getRetainAge());
-        doc.setRetainTimeUnit(getView().getRetainTimeUnit());
-        return doc;
+        return doc
+                .copy()
+                .scyllaDbRef(clusterPresenter.getSelectedEntityReference())
+                .stateType(getView().getStateType())
+                .condense(getView().isCondense())
+                .condenseAge(getView().getCondenseAge())
+                .condenseTimeUnit(getView().getCondenseTimeUnit())
+                .retainForever(getView().isRetainForever())
+                .retainAge(getView().getRetainAge())
+                .retainTimeUnit(getView().getRetainTimeUnit())
+                .build();
     }
 
 

stroom-core-shared/src/main/java/stroom/state/shared/StateDoc.java

@@ -62,23 +62,23 @@ public class StateDoc extends AbstractDoc {
      * Reference to the `scyllaDb` containing common connection properties
      */
     @JsonProperty
-    private DocRef scyllaDbRef;
+    private final DocRef scyllaDbRef;
     @JsonProperty
-    private String description;
+    private final String description;
     @JsonProperty
-    private StateType stateType;
+    private final StateType stateType;
     @JsonProperty
-    private boolean condense;
+    private final boolean condense;
     @JsonProperty
-    private int condenseAge;
+    private final int condenseAge;
     @JsonProperty
-    private TimeUnit condenseTimeUnit;
+    private final TimeUnit condenseTimeUnit;
     @JsonProperty
-    private boolean retainForever;
+    private final boolean retainForever;
     @JsonProperty
-    private int retainAge;
+    private final int retainAge;
     @JsonProperty
-    private TimeUnit retainTimeUnit;
+    private final TimeUnit retainTimeUnit;
 
     @JsonCreator
     public StateDoc(
@@ -130,74 +130,38 @@ public String getDescription() {
         return description;
     }
 
-    public void setDescription(final String description) {
-        this.description = description;
-    }
-
     public DocRef getScyllaDbRef() {
         return scyllaDbRef;
     }
 
-    public void setScyllaDbRef(final DocRef scyllaDbRef) {
-        this.scyllaDbRef = scyllaDbRef;
-    }
-
     public StateType getStateType() {
         return stateType;
     }
 
-    public void setStateType(final StateType stateType) {
-        this.stateType = stateType;
-    }
-
     public boolean isCondense() {
         return condense;
     }
 
-    public void setCondense(final boolean condense) {
-        this.condense = condense;
-    }
-
     public int getCondenseAge() {
         return condenseAge;
     }
 
-    public void setCondenseAge(final int condenseAge) {
-        this.condenseAge = condenseAge;
-    }
-
     public TimeUnit getCondenseTimeUnit() {
         return condenseTimeUnit;
     }
 
-    public void setCondenseTimeUnit(final TimeUnit condenseTimeUnit) {
-        this.condenseTimeUnit = condenseTimeUnit;
-    }
-
     public boolean isRetainForever() {
         return retainForever;
     }
 
-    public void setRetainForever(final boolean retainForever) {
-        this.retainForever = retainForever;
-    }
-
     public int getRetainAge() {
         return retainAge;
     }
 
-    public void setRetainAge(final int retainAge) {
-        this.retainAge = retainAge;
-    }
-
     public TimeUnit getRetainTimeUnit() {
         return retainTimeUnit;
     }
 
-    public void setRetainTimeUnit(final TimeUnit retainTimeUnit) {
-        this.retainTimeUnit = retainTimeUnit;
-    }
-
     @Override
     public boolean equals(final Object o) {
         if (this == o) {

stroom-state/stroom-state-impl/src/main/java/stroom/state/impl/StateDocStoreImpl.java

@@ -85,9 +85,8 @@ public DocRef createDocument(final String name) {
         }
 
         // Set the default keyspace.
-        final StateDoc doc = store.readDocument(created);
-        doc.setStateType(StateType.TEMPORAL_STATE);
-        doc.setRetainForever(true);
+        final StateDoc doc = store.readDocument(created)
+                .copy().stateType(StateType.TEMPORAL_STATE).retainForever(true).build();
         store.writeDocument(doc);
 
         return created;