diff --git a/pom.xml b/pom.xml index 4a450d7..be8c68d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,35 +1,34 @@ - + 4.0.0 nl.aerius search-parent 1.1-SNAPSHOT pom - AERIUS Search :: Parent + AERIUS Search https://www.aerius.nl - National Institute for Public Health and the Environment of the Netherlands - https://rivm.nl + State of the Netherlands + https://www.government.nl @@ -39,6 +38,12 @@ + + scm:git:ssh://git@github.com/aerius/search.git + scm:git:ssh://git@github.com/aerius/search.git + https://www.github.com/aerius/search + + aerius-nexus @@ -50,41 +55,18 @@ - - scm:git:ssh://git@github.com:aerius/search.git - scm:git:ssh://git@github.com:aerius/search.git - - - - - aerius-nexus-public - AERIUS Nexus repository - https://nexus.aerius.nl/repository/maven-public/ - - true - always - - - - - - - aerius-nexus-public - AERIUS Nexus Repository - https://nexus.aerius.nl/repository/maven-public/ - - - UTF-8 11 11 - 1.2-SNAPSHOT - 1.2-SNAPSHOT - + 1.2.0 + 1.2.0 3.8.1 + + 1.1.1 + 2.5.0 @@ -92,28 +74,49 @@ nl.aerius gwt-client-vue - ${gwt-client-common.version} + ${aerius.gwt-client-common.version} gwt-lib nl.aerius gwt-client-common - ${gwt-client-common.version} + ${aerius.gwt-client-common.version} gwt-lib nl.aerius gwt-client-common-json - ${common-json.version} + ${aerius.gwt-client-common-json.version} gwt-lib + + + aerius-nexus-public + AERIUS Nexus repository + https://nexus.aerius.nl/repository/maven-public/ + + true + always + + + + + + + aerius-nexus-public + AERIUS Nexus Repository + https://nexus.aerius.nl/repository/maven-public/ + + + + - + maven-source-plugin 3.2.0 @@ -145,6 +148,55 @@ + + + com.diffplug.spotless + spotless-maven-plugin + ${spotless.version} + + + + + pom.xml + + + pom-xml-header.txt + <project + + + + + XML + + pom-xml.prefs + + + + + + + src/*/java/nl/aerius/**/*.java + + + checkstyle-header.txt + + + eclipse_code_formatter_profile.xml + + + eclipse.importorder + + + + + + + nl.aerius + tools + ${aerius-tools.version} + + + diff --git a/search-client/pom.xml b/search-client/pom.xml index 07e2318..681103d 100644 --- a/search-client/pom.xml +++ b/search-client/pom.xml @@ -1,3 +1,21 @@ + 4.0.0 @@ -11,30 +29,9 @@ gwt-lib - - - aerius-nexus-public - AERIUS Nexus repository - https://nexus.aerius.nl/repository/maven-public/ - - always - - - - - - aerius-nexus-public - AERIUS Nexus Repository - https://nexus.aerius.nl/repository/maven-public/ - - always - - - - 2.8.2 - 1.0-beta-10-AERIUS + 1.0.1 @@ -44,12 +41,6 @@ provided ${com.google.gwt.version} - - com.google.gwt - gwt-dev - provided - ${com.google.gwt.version} - com.axellience @@ -92,6 +83,27 @@ + + + aerius-nexus-public + AERIUS Nexus repository + https://nexus.aerius.nl/repository/maven-public/ + + always + + + + + + aerius-nexus-public + AERIUS Nexus Repository + https://nexus.aerius.nl/repository/maven-public/ + + always + + + + diff --git a/search-client/src/main/java/nl/aerius/search/wui/command/SearchTextCommand.java b/search-client/src/main/java/nl/aerius/search/wui/command/SearchTextCommand.java index 3a1385e..e623944 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/command/SearchTextCommand.java +++ b/search-client/src/main/java/nl/aerius/search/wui/command/SearchTextCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.command; import nl.aerius.wui.event.SimpleGenericEvent; diff --git a/search-client/src/main/java/nl/aerius/search/wui/component/MapSearchComponent.java b/search-client/src/main/java/nl/aerius/search/wui/component/MapSearchComponent.java index 364ce4a..63ab752 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/component/MapSearchComponent.java +++ b/search-client/src/main/java/nl/aerius/search/wui/component/MapSearchComponent.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.component; import java.util.Collection; diff --git a/search-client/src/main/java/nl/aerius/search/wui/component/PopoutSearchComponent.java b/search-client/src/main/java/nl/aerius/search/wui/component/PopoutSearchComponent.java index 3ba14bf..882af13 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/component/PopoutSearchComponent.java +++ b/search-client/src/main/java/nl/aerius/search/wui/component/PopoutSearchComponent.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.component; import javax.inject.Inject; diff --git a/search-client/src/main/java/nl/aerius/search/wui/config/SearchConfiguration.java b/search-client/src/main/java/nl/aerius/search/wui/config/SearchConfiguration.java index 0b1302f..e9d316b 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/config/SearchConfiguration.java +++ b/search-client/src/main/java/nl/aerius/search/wui/config/SearchConfiguration.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.config; import java.util.Set; @@ -6,8 +22,8 @@ public interface SearchConfiguration { String getSearchEndpoint(); - + Set getSearchCapabilities(); - + String getSearchRegion(); } diff --git a/search-client/src/main/java/nl/aerius/search/wui/context/SearchContext.java b/search-client/src/main/java/nl/aerius/search/wui/context/SearchContext.java index 567312c..d40b21b 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/context/SearchContext.java +++ b/search-client/src/main/java/nl/aerius/search/wui/context/SearchContext.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.context; import java.util.Collection; diff --git a/search-client/src/main/java/nl/aerius/search/wui/daemon/SearchDaemonAsynchronous.java b/search-client/src/main/java/nl/aerius/search/wui/daemon/SearchDaemonAsynchronous.java index 1cfd0e9..c1bc558 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/daemon/SearchDaemonAsynchronous.java +++ b/search-client/src/main/java/nl/aerius/search/wui/daemon/SearchDaemonAsynchronous.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.daemon; import java.util.function.Function; diff --git a/search-client/src/main/java/nl/aerius/search/wui/daemon/SearchDaemonSynchronous.java b/search-client/src/main/java/nl/aerius/search/wui/daemon/SearchDaemonSynchronous.java index c08706c..f71b854 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/daemon/SearchDaemonSynchronous.java +++ b/search-client/src/main/java/nl/aerius/search/wui/daemon/SearchDaemonSynchronous.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.daemon; import java.util.stream.Collectors; diff --git a/search-client/src/main/java/nl/aerius/search/wui/domain/SearchResult.java b/search-client/src/main/java/nl/aerius/search/wui/domain/SearchResult.java index 16ce29e..94c9694 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/domain/SearchResult.java +++ b/search-client/src/main/java/nl/aerius/search/wui/domain/SearchResult.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.domain; import jsinterop.annotations.JsPackage; diff --git a/search-client/src/main/java/nl/aerius/search/wui/domain/SearchSuggestion.java b/search-client/src/main/java/nl/aerius/search/wui/domain/SearchSuggestion.java index 5937a77..8c699f8 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/domain/SearchSuggestion.java +++ b/search-client/src/main/java/nl/aerius/search/wui/domain/SearchSuggestion.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.domain; import jsinterop.annotations.JsPackage; diff --git a/search-client/src/main/java/nl/aerius/search/wui/event/SearchSuggestionSelectionEvent.java b/search-client/src/main/java/nl/aerius/search/wui/event/SearchSuggestionSelectionEvent.java index 3810129..982da52 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/event/SearchSuggestionSelectionEvent.java +++ b/search-client/src/main/java/nl/aerius/search/wui/event/SearchSuggestionSelectionEvent.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.event; import nl.aerius.search.wui.domain.SearchSuggestion; diff --git a/search-client/src/main/java/nl/aerius/search/wui/i18n/SearchM.java b/search-client/src/main/java/nl/aerius/search/wui/i18n/SearchM.java index 5803aa7..b87eb97 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/i18n/SearchM.java +++ b/search-client/src/main/java/nl/aerius/search/wui/i18n/SearchM.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.i18n; import com.google.gwt.core.client.GWT; diff --git a/search-client/src/main/java/nl/aerius/search/wui/i18n/SearchMessages.java b/search-client/src/main/java/nl/aerius/search/wui/i18n/SearchMessages.java index 4c65655..236fddc 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/i18n/SearchMessages.java +++ b/search-client/src/main/java/nl/aerius/search/wui/i18n/SearchMessages.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.i18n; import com.google.gwt.i18n.client.Messages; diff --git a/search-client/src/main/java/nl/aerius/search/wui/resources/SearchImageResources.java b/search-client/src/main/java/nl/aerius/search/wui/resources/SearchImageResources.java index 68f3513..4127b31 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/resources/SearchImageResources.java +++ b/search-client/src/main/java/nl/aerius/search/wui/resources/SearchImageResources.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.resources; import com.google.gwt.resources.client.ClientBundle; diff --git a/search-client/src/main/java/nl/aerius/search/wui/resources/SearchResources.java b/search-client/src/main/java/nl/aerius/search/wui/resources/SearchResources.java index c61cb52..f970914 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/resources/SearchResources.java +++ b/search-client/src/main/java/nl/aerius/search/wui/resources/SearchResources.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.resources; import com.google.gwt.core.client.GWT; diff --git a/search-client/src/main/java/nl/aerius/search/wui/service/SearchServiceAsync.java b/search-client/src/main/java/nl/aerius/search/wui/service/SearchServiceAsync.java index 70cba8d..23b137c 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/service/SearchServiceAsync.java +++ b/search-client/src/main/java/nl/aerius/search/wui/service/SearchServiceAsync.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.service; import java.util.Set; @@ -12,7 +28,7 @@ @ImplementedBy(SearchServiceAsyncImpl.class) public interface SearchServiceAsync { void retrieveSearchResults(String query, Set capabilities, String locale, AsyncCallback callback); - + void startSearchQuery(String query, Set capabilities, String locale, String cancel, AsyncCallback callback); void retrieveSearchResults(String uuid, AsyncCallback callback); diff --git a/search-client/src/main/java/nl/aerius/search/wui/service/SearchServiceAsyncImpl.java b/search-client/src/main/java/nl/aerius/search/wui/service/SearchServiceAsyncImpl.java index 950008a..e6eea7a 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/service/SearchServiceAsyncImpl.java +++ b/search-client/src/main/java/nl/aerius/search/wui/service/SearchServiceAsyncImpl.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.service; import java.util.Set; @@ -35,9 +51,10 @@ public void retrieveSearchResults(final String query, final Set capabilities, final String region, final String cancel, final AsyncCallback callback) { + public void startSearchQuery(final String query, final Set capabilities, final String region, final String cancel, + final AsyncCallback callback) { final String method = cancel == null ? QUERY_ASYNC_FORMAT : QUERY_ASYNC_CANCEL_FORMAT; - + final String url = InteropRequestUtil.prepareUrl(cfg.getSearchEndpoint(), method, ":query", query, ":capabilities", capabilities.stream().map(v -> v.name()).collect(Collectors.joining(",")), diff --git a/search-client/src/main/java/nl/aerius/search/wui/util/SearchUtils.java b/search-client/src/main/java/nl/aerius/search/wui/util/SearchUtils.java index 8d454b3..000fe5e 100644 --- a/search-client/src/main/java/nl/aerius/search/wui/util/SearchUtils.java +++ b/search-client/src/main/java/nl/aerius/search/wui/util/SearchUtils.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.wui.util; import java.util.Set; diff --git a/search-service-extension/pom.xml b/search-service-extension/pom.xml index 48a253a..06da2a9 100644 --- a/search-service-extension/pom.xml +++ b/search-service-extension/pom.xml @@ -16,8 +16,7 @@ along with this program. If not, see http://www.gnu.org/licenses/. --> - + 4.0.0 nl.aerius @@ -35,7 +34,7 @@ search-shared ${project.version} - + io.reactivex.rxjava3 rxjava diff --git a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchResultBuilder.java b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchResultBuilder.java index 5fa2c4a..296b50a 100644 --- a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchResultBuilder.java +++ b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchResultBuilder.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.domain; import java.util.Arrays; diff --git a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestion.java b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestion.java index 5585d3c..af0fcf6 100644 --- a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestion.java +++ b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestion.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.domain; public class SearchSuggestion { diff --git a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestionBuilder.java b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestionBuilder.java index 3bbcb93..b46461e 100644 --- a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestionBuilder.java +++ b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestionBuilder.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.domain; public final class SearchSuggestionBuilder { diff --git a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestionType.java b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestionType.java index 5a42f96..04a86ae 100644 --- a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestionType.java +++ b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchSuggestionType.java @@ -1,14 +1,30 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.domain; public enum SearchSuggestionType { RECEPTOR, - + STREET, POSTAL_CODE, ADDRESS, CITY, MUNICIPALITY, - + TEXT, - + } diff --git a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchTaskResult.java b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchTaskResult.java index 0fd002a..dd0a54f 100644 --- a/search-service-extension/src/main/java/nl/aerius/search/domain/SearchTaskResult.java +++ b/search-service-extension/src/main/java/nl/aerius/search/domain/SearchTaskResult.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.domain; import java.util.List; diff --git a/search-service-extension/src/main/java/nl/aerius/search/tasks/ImplementsCapability.java b/search-service-extension/src/main/java/nl/aerius/search/tasks/ImplementsCapability.java index 28f74fd..8bb2bfb 100644 --- a/search-service-extension/src/main/java/nl/aerius/search/tasks/ImplementsCapability.java +++ b/search-service-extension/src/main/java/nl/aerius/search/tasks/ImplementsCapability.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.tasks; import java.lang.annotation.Retention; diff --git a/search-service-extension/src/main/java/nl/aerius/search/tasks/SearchRegion.java b/search-service-extension/src/main/java/nl/aerius/search/tasks/SearchRegion.java index b2e01ee..2215131 100644 --- a/search-service-extension/src/main/java/nl/aerius/search/tasks/SearchRegion.java +++ b/search-service-extension/src/main/java/nl/aerius/search/tasks/SearchRegion.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.tasks; public enum SearchRegion { diff --git a/search-service-extension/src/main/java/nl/aerius/search/tasks/SearchTaskService.java b/search-service-extension/src/main/java/nl/aerius/search/tasks/SearchTaskService.java index ac0f590..97d5cad 100644 --- a/search-service-extension/src/main/java/nl/aerius/search/tasks/SearchTaskService.java +++ b/search-service-extension/src/main/java/nl/aerius/search/tasks/SearchTaskService.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.tasks; import io.reactivex.rxjava3.core.Single; diff --git a/search-service-geo/pom.xml b/search-service-geo/pom.xml index 5321adf..91ec8c5 100644 --- a/search-service-geo/pom.xml +++ b/search-service-geo/pom.xml @@ -16,7 +16,7 @@ 11 11 - 1.1-SNAPSHOT + 1.2.0 diff --git a/search-shared/pom.xml b/search-shared/pom.xml index c601b4d..7090833 100644 --- a/search-shared/pom.xml +++ b/search-shared/pom.xml @@ -16,8 +16,7 @@ along with this program. If not, see http://www.gnu.org/licenses/. --> - + 4.0.0 nl.aerius diff --git a/search-shared/src/main/java/nl/aerius/search/domain/SearchCapability.java b/search-shared/src/main/java/nl/aerius/search/domain/SearchCapability.java index ddff958..ec75d65 100644 --- a/search-shared/src/main/java/nl/aerius/search/domain/SearchCapability.java +++ b/search-shared/src/main/java/nl/aerius/search/domain/SearchCapability.java @@ -1,3 +1,19 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ package nl.aerius.search.domain; public enum SearchCapability {