From 75832d3ac955c0bb343bf1e0d6ab593a38d294a0 Mon Sep 17 00:00:00 2001 From: Teo Sarca Date: Wed, 3 May 2017 13:29:38 +0300 Subject: [PATCH] organize document filters moved them to de.metas.ui.web.document.filter package https://github.com/metasfresh/metasfresh-webui-api/issues/330 --- .../CompositeDocumentFilterDescriptorsProvider.java | 2 +- .../filters => document/filter}/DocumentFilter.java | 4 ++-- .../filter}/DocumentFilterDescriptor.java | 3 +-- .../filter}/DocumentFilterDescriptorsProvider.java | 2 +- .../DocumentFilterDescriptorsProviderFactory.java | 4 ++-- .../filter}/DocumentFilterParam.java | 2 +- .../filter}/DocumentFilterParamDescriptor.java | 4 ++-- .../ImmutableDocumentFilterDescriptorsProvider.java | 2 +- .../filter}/MQueryDocumentFilterHelper.java | 6 ++---- .../NullDocumentFilterDescriptorsProvider.java | 2 +- .../UserQueryDocumentFilterDescriptorsProvider.java | 5 ++--- .../filter/json}/JSONDocumentFilter.java | 12 ++++++------ .../filter/json}/JSONDocumentFilterDescriptor.java | 4 ++-- .../filter/json}/JSONDocumentFilterParam.java | 4 ++-- .../json}/JSONDocumentFilterParamDescriptor.java | 4 ++-- .../filter}/sql/SqlDocumentFiltersBuilder.java | 9 +++++---- .../de/metas/ui/web/handlingunits/HUEditorView.java | 4 ++-- .../handlingunits/HUEditorViewBuffer_HighVolume.java | 2 +- .../ui/web/handlingunits/HUEditorViewFactory.java | 2 +- .../de/metas/ui/web/pporder/PPOrderLinesView.java | 2 +- .../ui/web/pporder/PPOrderLinesViewFactory.java | 2 +- src/main/java/de/metas/ui/web/view/DefaultView.java | 6 +++--- src/main/java/de/metas/ui/web/view/IView.java | 2 +- .../de/metas/ui/web/view/IViewDataRepository.java | 4 ++-- src/main/java/de/metas/ui/web/view/IViewFactory.java | 2 +- .../de/metas/ui/web/view/SqlViewDataRepository.java | 4 ++-- .../java/de/metas/ui/web/view/SqlViewFactory.java | 6 +++--- .../view/SqlViewRowIdsOrderedSelectionFactory.java | 2 +- .../java/de/metas/ui/web/view/ViewCreateRequest.java | 2 +- src/main/java/de/metas/ui/web/view/ViewResult.java | 2 +- .../web/view/ViewRowIdsOrderedSelectionFactory.java | 2 +- .../java/de/metas/ui/web/view/ViewsRepository.java | 2 +- .../metas/ui/web/view/descriptor/SqlViewBinding.java | 4 ++-- .../descriptor/SqlViewSelectionQueryBuilder.java | 4 ++-- .../de/metas/ui/web/view/descriptor/ViewLayout.java | 2 +- .../ui/web/view/json/JSONViewCreateRequest.java | 2 +- .../de/metas/ui/web/view/json/JSONViewLayout.java | 4 ++-- .../de/metas/ui/web/view/json/JSONViewResult.java | 2 +- .../window/datatypes/json/JSONDocumentLayout.java | 2 +- .../window/datatypes/json/JSONDocumentLayoutTab.java | 4 ++-- .../window/datatypes/json/JSONDocumentReference.java | 4 ++-- .../window/descriptor/DocumentEntityDescriptor.java | 4 ++-- .../de/metas/ui/web/window/model/DocumentQuery.java | 2 +- .../metas/ui/web/window/model/DocumentReference.java | 2 +- .../web/window/model/DocumentReferencesService.java | 2 +- .../window/model/sql/SqlDocumentQueryBuilder.java | 3 ++- .../web/window/model/sql/SqlDocumentsRepository.java | 2 +- 47 files changed, 78 insertions(+), 80 deletions(-) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/CompositeDocumentFilterDescriptorsProvider.java (98%) rename src/main/java/de/metas/ui/web/{window/model/filters => document/filter}/DocumentFilter.java (95%) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/DocumentFilterDescriptor.java (98%) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/DocumentFilterDescriptorsProvider.java (96%) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/DocumentFilterDescriptorsProviderFactory.java (97%) rename src/main/java/de/metas/ui/web/{window/model/filters => document/filter}/DocumentFilterParam.java (98%) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/DocumentFilterParamDescriptor.java (98%) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/ImmutableDocumentFilterDescriptorsProvider.java (98%) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/MQueryDocumentFilterHelper.java (94%) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/NullDocumentFilterDescriptorsProvider.java (96%) rename src/main/java/de/metas/ui/web/{window/descriptor/filters => document/filter}/UserQueryDocumentFilterDescriptorsProvider.java (97%) rename src/main/java/de/metas/ui/web/{window/datatypes/json/filters => document/filter/json}/JSONDocumentFilter.java (93%) rename src/main/java/de/metas/ui/web/{window/datatypes/json/filters => document/filter/json}/JSONDocumentFilterDescriptor.java (96%) rename src/main/java/de/metas/ui/web/{window/datatypes/json/filters => document/filter/json}/JSONDocumentFilterParam.java (95%) rename src/main/java/de/metas/ui/web/{window/datatypes/json/filters => document/filter/json}/JSONDocumentFilterParamDescriptor.java (97%) rename src/main/java/de/metas/ui/web/{window/model => document/filter}/sql/SqlDocumentFiltersBuilder.java (97%) diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/CompositeDocumentFilterDescriptorsProvider.java b/src/main/java/de/metas/ui/web/document/filter/CompositeDocumentFilterDescriptorsProvider.java similarity index 98% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/CompositeDocumentFilterDescriptorsProvider.java rename to src/main/java/de/metas/ui/web/document/filter/CompositeDocumentFilterDescriptorsProvider.java index cb9edf737..194da4306 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/CompositeDocumentFilterDescriptorsProvider.java +++ b/src/main/java/de/metas/ui/web/document/filter/CompositeDocumentFilterDescriptorsProvider.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import java.util.Collection; import java.util.List; diff --git a/src/main/java/de/metas/ui/web/window/model/filters/DocumentFilter.java b/src/main/java/de/metas/ui/web/document/filter/DocumentFilter.java similarity index 95% rename from src/main/java/de/metas/ui/web/window/model/filters/DocumentFilter.java rename to src/main/java/de/metas/ui/web/document/filter/DocumentFilter.java index 3039dc500..f2af16ecd 100644 --- a/src/main/java/de/metas/ui/web/window/model/filters/DocumentFilter.java +++ b/src/main/java/de/metas/ui/web/document/filter/DocumentFilter.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.model.filters; +package de.metas.ui.web.document.filter; import java.util.ArrayList; import java.util.List; @@ -10,7 +10,7 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import de.metas.ui.web.window.model.filters.DocumentFilterParam.Operator; +import de.metas.ui.web.document.filter.DocumentFilterParam.Operator; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptor.java b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptor.java similarity index 98% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptor.java rename to src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptor.java index 825b53127..e4c81ca08 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptor.java +++ b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptor.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import java.util.ArrayList; import java.util.Collection; @@ -22,7 +22,6 @@ import de.metas.i18n.ITranslatableString; import de.metas.i18n.ImmutableTranslatableString; -import de.metas.ui.web.window.model.filters.DocumentFilterParam; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptorsProvider.java b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptorsProvider.java similarity index 96% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptorsProvider.java rename to src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptorsProvider.java index cc77519e2..665bebc6e 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptorsProvider.java +++ b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptorsProvider.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import java.util.Collection; import java.util.NoSuchElementException; diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptorsProviderFactory.java b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptorsProviderFactory.java similarity index 97% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptorsProviderFactory.java rename to src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptorsProviderFactory.java index e3346a085..5acdf029a 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterDescriptorsProviderFactory.java +++ b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterDescriptorsProviderFactory.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import java.util.Collection; import java.util.stream.Stream; @@ -9,12 +9,12 @@ import org.adempiere.util.api.IMsgBL; import de.metas.i18n.ITranslatableString; +import de.metas.ui.web.document.filter.DocumentFilterParam.Operator; import de.metas.ui.web.window.descriptor.DocumentFieldDescriptor; import de.metas.ui.web.window.descriptor.DocumentFieldDescriptor.Characteristic; import de.metas.ui.web.window.descriptor.DocumentFieldWidgetType; import de.metas.ui.web.window.descriptor.LookupDescriptor; import de.metas.ui.web.window.descriptor.LookupDescriptorProvider; -import de.metas.ui.web.window.model.filters.DocumentFilterParam.Operator; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/model/filters/DocumentFilterParam.java b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterParam.java similarity index 98% rename from src/main/java/de/metas/ui/web/window/model/filters/DocumentFilterParam.java rename to src/main/java/de/metas/ui/web/document/filter/DocumentFilterParam.java index da01eb7ab..dd64d4d5e 100644 --- a/src/main/java/de/metas/ui/web/window/model/filters/DocumentFilterParam.java +++ b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterParam.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.model.filters; +package de.metas.ui.web.document.filter; import org.adempiere.util.Check; diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterParamDescriptor.java b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterParamDescriptor.java similarity index 98% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterParamDescriptor.java rename to src/main/java/de/metas/ui/web/document/filter/DocumentFilterParamDescriptor.java index 0674e98c5..c9da9ed1e 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/DocumentFilterParamDescriptor.java +++ b/src/main/java/de/metas/ui/web/document/filter/DocumentFilterParamDescriptor.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import org.adempiere.util.Check; @@ -6,11 +6,11 @@ import de.metas.i18n.ITranslatableString; import de.metas.i18n.ImmutableTranslatableString; +import de.metas.ui.web.document.filter.DocumentFilterParam.Operator; import de.metas.ui.web.window.descriptor.DocumentFieldDescriptor; import de.metas.ui.web.window.descriptor.DocumentFieldWidgetType; import de.metas.ui.web.window.descriptor.LookupDescriptor; import de.metas.ui.web.window.descriptor.factory.standard.DescriptorsFactoryHelper; -import de.metas.ui.web.window.model.filters.DocumentFilterParam.Operator; import de.metas.ui.web.window.model.lookup.LookupDataSource; import de.metas.ui.web.window.model.lookup.LookupDataSourceFactory; diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/ImmutableDocumentFilterDescriptorsProvider.java b/src/main/java/de/metas/ui/web/document/filter/ImmutableDocumentFilterDescriptorsProvider.java similarity index 98% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/ImmutableDocumentFilterDescriptorsProvider.java rename to src/main/java/de/metas/ui/web/document/filter/ImmutableDocumentFilterDescriptorsProvider.java index 23dfdd634..7a0c9f2a3 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/ImmutableDocumentFilterDescriptorsProvider.java +++ b/src/main/java/de/metas/ui/web/document/filter/ImmutableDocumentFilterDescriptorsProvider.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/MQueryDocumentFilterHelper.java b/src/main/java/de/metas/ui/web/document/filter/MQueryDocumentFilterHelper.java similarity index 94% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/MQueryDocumentFilterHelper.java rename to src/main/java/de/metas/ui/web/document/filter/MQueryDocumentFilterHelper.java index 46e5d7ac3..cdf276e8b 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/MQueryDocumentFilterHelper.java +++ b/src/main/java/de/metas/ui/web/document/filter/MQueryDocumentFilterHelper.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import java.util.ArrayList; import java.util.List; @@ -9,9 +9,7 @@ import com.google.common.collect.ImmutableMap; -import de.metas.ui.web.window.model.filters.DocumentFilter; -import de.metas.ui.web.window.model.filters.DocumentFilterParam; -import de.metas.ui.web.window.model.filters.DocumentFilterParam.Operator; +import de.metas.ui.web.document.filter.DocumentFilterParam.Operator; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/NullDocumentFilterDescriptorsProvider.java b/src/main/java/de/metas/ui/web/document/filter/NullDocumentFilterDescriptorsProvider.java similarity index 96% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/NullDocumentFilterDescriptorsProvider.java rename to src/main/java/de/metas/ui/web/document/filter/NullDocumentFilterDescriptorsProvider.java index cbd5f554c..d8758399e 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/NullDocumentFilterDescriptorsProvider.java +++ b/src/main/java/de/metas/ui/web/document/filter/NullDocumentFilterDescriptorsProvider.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import java.util.Collection; diff --git a/src/main/java/de/metas/ui/web/window/descriptor/filters/UserQueryDocumentFilterDescriptorsProvider.java b/src/main/java/de/metas/ui/web/document/filter/UserQueryDocumentFilterDescriptorsProvider.java similarity index 97% rename from src/main/java/de/metas/ui/web/window/descriptor/filters/UserQueryDocumentFilterDescriptorsProvider.java rename to src/main/java/de/metas/ui/web/document/filter/UserQueryDocumentFilterDescriptorsProvider.java index 6379c1b9c..fb379512e 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/filters/UserQueryDocumentFilterDescriptorsProvider.java +++ b/src/main/java/de/metas/ui/web/document/filter/UserQueryDocumentFilterDescriptorsProvider.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.descriptor.filters; +package de.metas.ui.web.document.filter; import java.util.Collection; import java.util.List; @@ -17,13 +17,12 @@ import com.google.common.base.MoreObjects; import de.metas.i18n.ITranslatableString; +import de.metas.ui.web.document.filter.DocumentFilterParam.Operator; import de.metas.ui.web.window.WindowConstants; import de.metas.ui.web.window.descriptor.DocumentFieldDescriptor; import de.metas.ui.web.window.descriptor.DocumentFieldWidgetType; import de.metas.ui.web.window.descriptor.LookupDescriptor; import de.metas.ui.web.window.descriptor.LookupDescriptorProvider; -import de.metas.ui.web.window.model.filters.DocumentFilterParam; -import de.metas.ui.web.window.model.filters.DocumentFilterParam.Operator; import de.metas.ui.web.window.model.lookup.NullLookupDataSource; /* diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilter.java b/src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilter.java similarity index 93% rename from src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilter.java rename to src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilter.java index 2da3214cb..abd70e2ed 100644 --- a/src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilter.java +++ b/src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilter.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.datatypes.json.filters; +package de.metas.ui.web.document.filter.json; import java.io.Serializable; import java.util.List; @@ -15,11 +15,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptorsProvider; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterParamDescriptor; -import de.metas.ui.web.window.model.filters.DocumentFilter; -import de.metas.ui.web.window.model.filters.DocumentFilterParam; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; +import de.metas.ui.web.document.filter.DocumentFilterDescriptorsProvider; +import de.metas.ui.web.document.filter.DocumentFilterParam; +import de.metas.ui.web.document.filter.DocumentFilterParamDescriptor; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterDescriptor.java b/src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterDescriptor.java similarity index 96% rename from src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterDescriptor.java rename to src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterDescriptor.java index 78d97c206..6ec027fbf 100644 --- a/src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterDescriptor.java +++ b/src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterDescriptor.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.datatypes.json.filters; +package de.metas.ui.web.document.filter.json; import java.io.Serializable; import java.util.Collection; @@ -18,8 +18,8 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; import de.metas.ui.web.window.datatypes.json.JSONOptions; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterParam.java b/src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterParam.java similarity index 95% rename from src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterParam.java rename to src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterParam.java index e8a55f7df..55610d844 100644 --- a/src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterParam.java +++ b/src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterParam.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.datatypes.json.filters; +package de.metas.ui.web.document.filter.json; import java.io.Serializable; import java.util.Optional; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import de.metas.ui.web.document.filter.DocumentFilterParam; import de.metas.ui.web.window.datatypes.Values; -import de.metas.ui.web.window.model.filters.DocumentFilterParam; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterParamDescriptor.java b/src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterParamDescriptor.java similarity index 97% rename from src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterParamDescriptor.java rename to src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterParamDescriptor.java index 03e599e6b..8215587bb 100644 --- a/src/main/java/de/metas/ui/web/window/datatypes/json/filters/JSONDocumentFilterParamDescriptor.java +++ b/src/main/java/de/metas/ui/web/document/filter/json/JSONDocumentFilterParamDescriptor.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.datatypes.json.filters; +package de.metas.ui.web.document.filter.json; import java.io.Serializable; import java.util.Collection; @@ -11,11 +11,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; +import de.metas.ui.web.document.filter.DocumentFilterParamDescriptor; import de.metas.ui.web.window.datatypes.Values; import de.metas.ui.web.window.datatypes.json.JSONLayoutType; import de.metas.ui.web.window.datatypes.json.JSONLayoutWidgetType; import de.metas.ui.web.window.datatypes.json.JSONOptions; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterParamDescriptor; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentFiltersBuilder.java b/src/main/java/de/metas/ui/web/document/filter/sql/SqlDocumentFiltersBuilder.java similarity index 97% rename from src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentFiltersBuilder.java rename to src/main/java/de/metas/ui/web/document/filter/sql/SqlDocumentFiltersBuilder.java index 4b24cd47d..69a2c1ab1 100644 --- a/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentFiltersBuilder.java +++ b/src/main/java/de/metas/ui/web/document/filter/sql/SqlDocumentFiltersBuilder.java @@ -1,4 +1,4 @@ -package de.metas.ui.web.window.model.sql; +package de.metas.ui.web.document.filter.sql; import java.util.ArrayList; import java.util.Collection; @@ -10,12 +10,13 @@ import org.compiere.util.DB; import de.metas.printing.esb.base.util.Check; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.DocumentFilterParam; +import de.metas.ui.web.document.filter.DocumentFilterParam.Operator; import de.metas.ui.web.window.descriptor.DocumentFieldWidgetType; import de.metas.ui.web.window.descriptor.sql.SqlEntityBinding; import de.metas.ui.web.window.descriptor.sql.SqlEntityFieldBinding; -import de.metas.ui.web.window.model.filters.DocumentFilter; -import de.metas.ui.web.window.model.filters.DocumentFilterParam; -import de.metas.ui.web.window.model.filters.DocumentFilterParam.Operator; +import de.metas.ui.web.window.model.sql.SqlDocumentsRepository; import lombok.NonNull; /* diff --git a/src/main/java/de/metas/ui/web/handlingunits/HUEditorView.java b/src/main/java/de/metas/ui/web/handlingunits/HUEditorView.java index b54154bb6..ead186b36 100644 --- a/src/main/java/de/metas/ui/web/handlingunits/HUEditorView.java +++ b/src/main/java/de/metas/ui/web/handlingunits/HUEditorView.java @@ -22,6 +22,8 @@ import com.google.common.collect.ImmutableSet; import de.metas.handlingunits.model.I_M_HU; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.DocumentFilterParam.Operator; import de.metas.ui.web.exceptions.EntityNotFoundException; import de.metas.ui.web.process.ProcessInstanceResult.SelectViewRowsAction; import de.metas.ui.web.process.descriptor.ProcessLayout.ProcessLayoutType; @@ -39,8 +41,6 @@ import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.descriptor.DocumentFieldWidgetType; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; -import de.metas.ui.web.window.model.filters.DocumentFilterParam.Operator; import lombok.NonNull; /* diff --git a/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewBuffer_HighVolume.java b/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewBuffer_HighVolume.java index 8db0108e7..80a6b8d13 100644 --- a/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewBuffer_HighVolume.java +++ b/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewBuffer_HighVolume.java @@ -32,6 +32,7 @@ import de.metas.handlingunits.attribute.Constants; import de.metas.handlingunits.model.I_M_HU; import de.metas.printing.esb.base.util.Check; +import de.metas.ui.web.document.filter.DocumentFilter; import de.metas.ui.web.exceptions.EntityNotFoundException; import de.metas.ui.web.view.SqlViewRowIdsOrderedSelectionFactory; import de.metas.ui.web.view.ViewEvaluationCtx; @@ -41,7 +42,6 @@ import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewFactory.java b/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewFactory.java index 7acdfaff5..c49000213 100644 --- a/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewFactory.java +++ b/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewFactory.java @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableList; import de.metas.handlingunits.model.I_M_HU; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; import de.metas.ui.web.view.IViewFactory; import de.metas.ui.web.view.ViewCreateRequest; import de.metas.ui.web.view.ViewFactory; @@ -26,7 +27,6 @@ import de.metas.ui.web.window.descriptor.DocumentLayoutElementFieldDescriptor; import de.metas.ui.web.window.descriptor.factory.DocumentDescriptorFactory; import de.metas.ui.web.window.descriptor.factory.standard.LayoutFactory; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; import de.metas.ui.web.window.model.DocumentQueryOrderBy; /* diff --git a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesView.java b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesView.java index 0f1865271..ad7659cde 100644 --- a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesView.java +++ b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesView.java @@ -20,6 +20,7 @@ import de.metas.handlingunits.pporder.api.IHUPPOrderBL; import de.metas.process.ProcessPreconditionsResolution; +import de.metas.ui.web.document.filter.DocumentFilter; import de.metas.ui.web.exceptions.EntityNotFoundException; import de.metas.ui.web.handlingunits.WEBUI_HU_Constants; import de.metas.ui.web.process.ProcessInstanceResult.OpenIncludedViewAction; @@ -37,7 +38,6 @@ import de.metas.ui.web.window.datatypes.LookupValuesList; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; import lombok.Builder; import lombok.NonNull; diff --git a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesViewFactory.java b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesViewFactory.java index f95a5c6fc..5c484fc4f 100644 --- a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesViewFactory.java +++ b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesViewFactory.java @@ -5,6 +5,7 @@ import org.compiere.util.CCache; import org.springframework.beans.factory.annotation.Autowired; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; import de.metas.ui.web.pattribute.ASIRepository; import de.metas.ui.web.view.ASIViewRowAttributesProvider; import de.metas.ui.web.view.IViewFactory; @@ -18,7 +19,6 @@ import de.metas.ui.web.window.descriptor.DocumentLayoutElementDescriptor; import de.metas.ui.web.window.descriptor.DocumentLayoutElementFieldDescriptor; import de.metas.ui.web.window.descriptor.factory.standard.LayoutFactory; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/DefaultView.java b/src/main/java/de/metas/ui/web/view/DefaultView.java index 92b9352a9..e99862332 100644 --- a/src/main/java/de/metas/ui/web/view/DefaultView.java +++ b/src/main/java/de/metas/ui/web/view/DefaultView.java @@ -21,15 +21,15 @@ import com.google.common.collect.ImmutableList; import de.metas.logging.LogManager; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.DocumentFilterDescriptorsProvider; +import de.metas.ui.web.document.filter.json.JSONDocumentFilter; import de.metas.ui.web.exceptions.EntityNotFoundException; import de.metas.ui.web.view.event.ViewChangesCollector; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.datatypes.LookupValuesList; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.datatypes.json.filters.JSONDocumentFilter; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptorsProvider; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; import lombok.NonNull; /* diff --git a/src/main/java/de/metas/ui/web/view/IView.java b/src/main/java/de/metas/ui/web/view/IView.java index eef5141ba..5b8e9b73c 100644 --- a/src/main/java/de/metas/ui/web/view/IView.java +++ b/src/main/java/de/metas/ui/web/view/IView.java @@ -10,12 +10,12 @@ import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.DocumentFilter; import de.metas.ui.web.exceptions.EntityNotFoundException; import de.metas.ui.web.process.view.ViewActionDescriptorsList; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.datatypes.LookupValuesList; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/IViewDataRepository.java b/src/main/java/de/metas/ui/web/view/IViewDataRepository.java index d632c56b4..a80733bb2 100644 --- a/src/main/java/de/metas/ui/web/view/IViewDataRepository.java +++ b/src/main/java/de/metas/ui/web/view/IViewDataRepository.java @@ -5,11 +5,11 @@ import org.adempiere.exceptions.DBException; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.DocumentFilterDescriptorsProvider; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptorsProvider; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/IViewFactory.java b/src/main/java/de/metas/ui/web/view/IViewFactory.java index 000790253..347276c94 100644 --- a/src/main/java/de/metas/ui/web/view/IViewFactory.java +++ b/src/main/java/de/metas/ui/web/view/IViewFactory.java @@ -2,10 +2,10 @@ import java.util.Collection; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; import de.metas.ui.web.view.descriptor.ViewLayout; import de.metas.ui.web.view.json.JSONViewDataType; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/SqlViewDataRepository.java b/src/main/java/de/metas/ui/web/view/SqlViewDataRepository.java index 466548d34..a7a98c641 100644 --- a/src/main/java/de/metas/ui/web/view/SqlViewDataRepository.java +++ b/src/main/java/de/metas/ui/web/view/SqlViewDataRepository.java @@ -25,15 +25,15 @@ import com.google.common.collect.ImmutableMap; import de.metas.logging.LogManager; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.DocumentFilterDescriptorsProvider; import de.metas.ui.web.exceptions.EntityNotFoundException; import de.metas.ui.web.view.descriptor.SqlViewBinding; import de.metas.ui.web.view.descriptor.SqlViewRowFieldBinding; import de.metas.ui.web.view.descriptor.SqlViewRowFieldBinding.SqlViewRowFieldLoader; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptorsProvider; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; import lombok.NonNull; /* diff --git a/src/main/java/de/metas/ui/web/view/SqlViewFactory.java b/src/main/java/de/metas/ui/web/view/SqlViewFactory.java index eb90abf2c..2320c3819 100644 --- a/src/main/java/de/metas/ui/web/view/SqlViewFactory.java +++ b/src/main/java/de/metas/ui/web/view/SqlViewFactory.java @@ -10,6 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; +import de.metas.ui.web.document.filter.DocumentFilterDescriptorsProvider; import de.metas.ui.web.view.descriptor.SqlViewBinding; import de.metas.ui.web.view.descriptor.SqlViewRowFieldBinding; import de.metas.ui.web.view.descriptor.SqlViewRowFieldBinding.SqlViewRowFieldLoader; @@ -22,14 +25,11 @@ import de.metas.ui.web.window.descriptor.DocumentFieldDescriptor.Characteristic; import de.metas.ui.web.window.descriptor.DocumentLayoutDescriptor; import de.metas.ui.web.window.descriptor.factory.DocumentDescriptorFactory; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptorsProvider; import de.metas.ui.web.window.descriptor.sql.DocumentFieldValueLoader; import de.metas.ui.web.window.descriptor.sql.SqlDocumentEntityDataBindingDescriptor; import de.metas.ui.web.window.descriptor.sql.SqlDocumentFieldDataBindingDescriptor; import de.metas.ui.web.window.model.DocumentReference; import de.metas.ui.web.window.model.DocumentReferencesService; -import de.metas.ui.web.window.model.filters.DocumentFilter; import lombok.NonNull; import lombok.Value; diff --git a/src/main/java/de/metas/ui/web/view/SqlViewRowIdsOrderedSelectionFactory.java b/src/main/java/de/metas/ui/web/view/SqlViewRowIdsOrderedSelectionFactory.java index f48c35fd0..83e8a76ea 100644 --- a/src/main/java/de/metas/ui/web/view/SqlViewRowIdsOrderedSelectionFactory.java +++ b/src/main/java/de/metas/ui/web/view/SqlViewRowIdsOrderedSelectionFactory.java @@ -17,12 +17,12 @@ import com.google.common.base.Stopwatch; import de.metas.logging.LogManager; +import de.metas.ui.web.document.filter.DocumentFilter; import de.metas.ui.web.view.descriptor.SqlViewSelectionQueryBuilder; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.descriptor.sql.SqlEntityBinding; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; import lombok.NonNull; /* diff --git a/src/main/java/de/metas/ui/web/view/ViewCreateRequest.java b/src/main/java/de/metas/ui/web/view/ViewCreateRequest.java index 5f2c1a617..c0abd4e9b 100644 --- a/src/main/java/de/metas/ui/web/view/ViewCreateRequest.java +++ b/src/main/java/de/metas/ui/web/view/ViewCreateRequest.java @@ -11,12 +11,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import de.metas.ui.web.document.filter.json.JSONDocumentFilter; import de.metas.ui.web.process.view.ViewActionDescriptorsFactory; import de.metas.ui.web.process.view.ViewActionDescriptorsList; import de.metas.ui.web.view.json.JSONViewDataType; import de.metas.ui.web.window.datatypes.DocumentPath; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.datatypes.json.filters.JSONDocumentFilter; import de.metas.ui.web.window.descriptor.DocumentFieldDescriptor.Characteristic; import lombok.NonNull; diff --git a/src/main/java/de/metas/ui/web/view/ViewResult.java b/src/main/java/de/metas/ui/web/view/ViewResult.java index d4237ac10..921bd74b4 100644 --- a/src/main/java/de/metas/ui/web/view/ViewResult.java +++ b/src/main/java/de/metas/ui/web/view/ViewResult.java @@ -9,8 +9,8 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.DocumentFilter; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/ViewRowIdsOrderedSelectionFactory.java b/src/main/java/de/metas/ui/web/view/ViewRowIdsOrderedSelectionFactory.java index 0e8c1eb02..10490e74d 100644 --- a/src/main/java/de/metas/ui/web/view/ViewRowIdsOrderedSelectionFactory.java +++ b/src/main/java/de/metas/ui/web/view/ViewRowIdsOrderedSelectionFactory.java @@ -3,10 +3,10 @@ import java.util.Collection; import java.util.List; +import de.metas.ui.web.document.filter.DocumentFilter; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/ViewsRepository.java b/src/main/java/de/metas/ui/web/view/ViewsRepository.java index 129673821..586273295 100644 --- a/src/main/java/de/metas/ui/web/view/ViewsRepository.java +++ b/src/main/java/de/metas/ui/web/view/ViewsRepository.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableList; import de.metas.logging.LogManager; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; import de.metas.ui.web.exceptions.EntityNotFoundException; import de.metas.ui.web.menu.MenuTreeRepository; import de.metas.ui.web.view.descriptor.ViewLayout; @@ -29,7 +30,6 @@ import de.metas.ui.web.view.json.JSONViewLayout; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.datatypes.json.JSONOptions; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/descriptor/SqlViewBinding.java b/src/main/java/de/metas/ui/web/view/descriptor/SqlViewBinding.java index 56dbda8a3..3c51c126f 100644 --- a/src/main/java/de/metas/ui/web/view/descriptor/SqlViewBinding.java +++ b/src/main/java/de/metas/ui/web/view/descriptor/SqlViewBinding.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableSet; import de.metas.ui.web.base.model.I_T_WEBUI_ViewSelection; +import de.metas.ui.web.document.filter.DocumentFilterDescriptorsProvider; +import de.metas.ui.web.document.filter.NullDocumentFilterDescriptorsProvider; import de.metas.ui.web.view.ViewEvaluationCtx; import de.metas.ui.web.view.descriptor.SqlViewRowFieldBinding.SqlViewRowFieldLoader; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptorsProvider; -import de.metas.ui.web.window.descriptor.filters.NullDocumentFilterDescriptorsProvider; import de.metas.ui.web.window.descriptor.sql.SqlEntityBinding; import de.metas.ui.web.window.model.DocumentQueryOrderBy; import lombok.NonNull; diff --git a/src/main/java/de/metas/ui/web/view/descriptor/SqlViewSelectionQueryBuilder.java b/src/main/java/de/metas/ui/web/view/descriptor/SqlViewSelectionQueryBuilder.java index f59576b5d..e88635b63 100644 --- a/src/main/java/de/metas/ui/web/view/descriptor/SqlViewSelectionQueryBuilder.java +++ b/src/main/java/de/metas/ui/web/view/descriptor/SqlViewSelectionQueryBuilder.java @@ -19,13 +19,13 @@ import com.google.common.collect.ImmutableList; import de.metas.ui.web.base.model.I_T_WEBUI_ViewSelection; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.sql.SqlDocumentFiltersBuilder; import de.metas.ui.web.view.ViewEvaluationCtx; import de.metas.ui.web.view.ViewId; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.descriptor.sql.SqlEntityBinding; import de.metas.ui.web.window.model.DocumentQueryOrderBy; -import de.metas.ui.web.window.model.filters.DocumentFilter; -import de.metas.ui.web.window.model.sql.SqlDocumentFiltersBuilder; import de.metas.ui.web.window.model.sql.SqlDocumentOrderByBuilder; /* diff --git a/src/main/java/de/metas/ui/web/view/descriptor/ViewLayout.java b/src/main/java/de/metas/ui/web/view/descriptor/ViewLayout.java index c7490faca..2160498a3 100644 --- a/src/main/java/de/metas/ui/web/view/descriptor/ViewLayout.java +++ b/src/main/java/de/metas/ui/web/view/descriptor/ViewLayout.java @@ -13,10 +13,10 @@ import de.metas.i18n.ITranslatableString; import de.metas.i18n.ImmutableTranslatableString; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.descriptor.DetailId; import de.metas.ui.web.window.descriptor.DocumentLayoutElementDescriptor; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/json/JSONViewCreateRequest.java b/src/main/java/de/metas/ui/web/view/json/JSONViewCreateRequest.java index 07ad9d83c..8e945ea20 100644 --- a/src/main/java/de/metas/ui/web/view/json/JSONViewCreateRequest.java +++ b/src/main/java/de/metas/ui/web/view/json/JSONViewCreateRequest.java @@ -15,9 +15,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import de.metas.ui.web.document.filter.json.JSONDocumentFilter; import de.metas.ui.web.window.datatypes.DocumentPath; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.datatypes.json.filters.JSONDocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/json/JSONViewLayout.java b/src/main/java/de/metas/ui/web/view/json/JSONViewLayout.java index cbe60d4d6..f7862ccde 100644 --- a/src/main/java/de/metas/ui/web/view/json/JSONViewLayout.java +++ b/src/main/java/de/metas/ui/web/view/json/JSONViewLayout.java @@ -14,13 +14,13 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; +import de.metas.ui.web.document.filter.json.JSONDocumentFilterDescriptor; import de.metas.ui.web.view.descriptor.ViewLayout; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.datatypes.json.JSONDocumentLayoutElement; import de.metas.ui.web.window.datatypes.json.JSONOptions; -import de.metas.ui.web.window.datatypes.json.filters.JSONDocumentFilterDescriptor; import de.metas.ui.web.window.descriptor.DocumentFieldWidgetType; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; /* * #%L diff --git a/src/main/java/de/metas/ui/web/view/json/JSONViewResult.java b/src/main/java/de/metas/ui/web/view/json/JSONViewResult.java index 2501aa70e..03f0f5158 100644 --- a/src/main/java/de/metas/ui/web/view/json/JSONViewResult.java +++ b/src/main/java/de/metas/ui/web/view/json/JSONViewResult.java @@ -9,10 +9,10 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.json.JSONDocumentFilter; import de.metas.ui.web.view.ViewId; import de.metas.ui.web.view.ViewResult; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.datatypes.json.filters.JSONDocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayout.java b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayout.java index a64a728c8..8514c003e 100644 --- a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayout.java +++ b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayout.java @@ -15,8 +15,8 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.json.JSONDocumentFilterDescriptor; import de.metas.ui.web.window.WindowConstants; -import de.metas.ui.web.window.datatypes.json.filters.JSONDocumentFilterDescriptor; import de.metas.ui.web.window.descriptor.DetailId; import de.metas.ui.web.window.descriptor.DocumentLayoutDescriptor; import de.metas.ui.web.window.descriptor.DocumentLayoutDetailDescriptor; diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayoutTab.java b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayoutTab.java index e61d56863..0115d5efa 100644 --- a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayoutTab.java +++ b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayoutTab.java @@ -14,10 +14,10 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import de.metas.ui.web.window.datatypes.json.filters.JSONDocumentFilterDescriptor; +import de.metas.ui.web.document.filter.DocumentFilterDescriptor; +import de.metas.ui.web.document.filter.json.JSONDocumentFilterDescriptor; import de.metas.ui.web.window.descriptor.DetailId; import de.metas.ui.web.window.descriptor.DocumentLayoutDetailDescriptor; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptor; import io.swagger.annotations.ApiModel; /* diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentReference.java b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentReference.java index 592533195..b2105ca95 100644 --- a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentReference.java +++ b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentReference.java @@ -7,10 +7,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import de.metas.logging.LogManager; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.json.JSONDocumentFilter; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.datatypes.json.filters.JSONDocumentFilter; import de.metas.ui.web.window.model.DocumentReference; -import de.metas.ui.web.window.model.filters.DocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/descriptor/DocumentEntityDescriptor.java b/src/main/java/de/metas/ui/web/window/descriptor/DocumentEntityDescriptor.java index e35848254..c1565b673 100644 --- a/src/main/java/de/metas/ui/web/window/descriptor/DocumentEntityDescriptor.java +++ b/src/main/java/de/metas/ui/web/window/descriptor/DocumentEntityDescriptor.java @@ -36,14 +36,14 @@ import de.metas.i18n.ImmutableTranslatableString; import de.metas.logging.LogManager; import de.metas.printing.esb.base.util.Check; +import de.metas.ui.web.document.filter.DocumentFilterDescriptorsProvider; +import de.metas.ui.web.document.filter.DocumentFilterDescriptorsProviderFactory; import de.metas.ui.web.window.datatypes.DataTypes; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.datatypes.DocumentType; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.descriptor.DocumentEntityDataBindingDescriptor.DocumentEntityDataBindingDescriptorBuilder; import de.metas.ui.web.window.descriptor.DocumentFieldDescriptor.Characteristic; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptorsProvider; -import de.metas.ui.web.window.descriptor.filters.DocumentFilterDescriptorsProviderFactory; import de.metas.ui.web.window.model.Document; import de.metas.ui.web.window.model.HighVolumeReadonlyIncludedDocumentsCollection; import de.metas.ui.web.window.model.IIncludedDocumentsCollection; diff --git a/src/main/java/de/metas/ui/web/window/model/DocumentQuery.java b/src/main/java/de/metas/ui/web/window/model/DocumentQuery.java index 3c85f1998..b9de647d1 100644 --- a/src/main/java/de/metas/ui/web/window/model/DocumentQuery.java +++ b/src/main/java/de/metas/ui/web/window/model/DocumentQuery.java @@ -9,9 +9,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.DocumentFilter; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.descriptor.DocumentEntityDescriptor; -import de.metas.ui.web.window.model.filters.DocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/model/DocumentReference.java b/src/main/java/de/metas/ui/web/window/model/DocumentReference.java index dcdbbd2de..ac556103f 100644 --- a/src/main/java/de/metas/ui/web/window/model/DocumentReference.java +++ b/src/main/java/de/metas/ui/web/window/model/DocumentReference.java @@ -5,8 +5,8 @@ import com.google.common.base.MoreObjects; import de.metas.i18n.ITranslatableString; +import de.metas.ui.web.document.filter.DocumentFilter; import de.metas.ui.web.window.datatypes.WindowId; -import de.metas.ui.web.window.model.filters.DocumentFilter; import groovy.transform.Immutable; import lombok.Builder; diff --git a/src/main/java/de/metas/ui/web/window/model/DocumentReferencesService.java b/src/main/java/de/metas/ui/web/window/model/DocumentReferencesService.java index d3a22e697..f42091b4f 100644 --- a/src/main/java/de/metas/ui/web/window/model/DocumentReferencesService.java +++ b/src/main/java/de/metas/ui/web/window/model/DocumentReferencesService.java @@ -16,10 +16,10 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.MQueryDocumentFilterHelper; import de.metas.ui.web.window.datatypes.DocumentPath; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.descriptor.DocumentEntityDescriptor; -import de.metas.ui.web.window.descriptor.filters.MQueryDocumentFilterHelper; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentQueryBuilder.java b/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentQueryBuilder.java index 37b1fa235..6bf7f34fc 100644 --- a/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentQueryBuilder.java +++ b/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentQueryBuilder.java @@ -18,6 +18,8 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import de.metas.ui.web.document.filter.DocumentFilter; +import de.metas.ui.web.document.filter.sql.SqlDocumentFiltersBuilder; import de.metas.ui.web.window.datatypes.DocumentId; import de.metas.ui.web.window.descriptor.DocumentEntityDescriptor; import de.metas.ui.web.window.descriptor.DocumentFieldWidgetType; @@ -26,7 +28,6 @@ import de.metas.ui.web.window.model.DocumentQuery; import de.metas.ui.web.window.model.DocumentQueryOrderBy; import de.metas.ui.web.window.model.IDocumentFieldView; -import de.metas.ui.web.window.model.filters.DocumentFilter; /* * #%L diff --git a/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentsRepository.java b/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentsRepository.java index 2da52d0f5..c4589bb0b 100644 --- a/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentsRepository.java +++ b/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentsRepository.java @@ -671,7 +671,7 @@ else if (value instanceof String) } } - static Object convertValueToPO(final Object value, final String columnName, final DocumentFieldWidgetType widgetType, final Class targetClass) + public static Object convertValueToPO(final Object value, final String columnName, final DocumentFieldWidgetType widgetType, final Class targetClass) { final Class valueClass = value == null ? null : value.getClass();