Added basic search service, and improved web app UI.
This commit is contained in:
parent
3d5fe43526
commit
d96d5bbe63
|
|
@ -2,16 +2,14 @@ package nl.andrewlalis.gymboard_api.controller;
|
|||
|
||||
import nl.andrewlalis.gymboard_api.controller.dto.GymResponse;
|
||||
import nl.andrewlalis.gymboard_api.service.GymService;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Controller for accessing a particular gym.
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping(path = "/gyms/{countryCode}/{cityCode}/{gymName}")
|
||||
public class GymController {
|
||||
private final GymService gymService;
|
||||
|
||||
|
|
@ -19,7 +17,7 @@ public class GymController {
|
|||
this.gymService = gymService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@GetMapping(path = "/gyms/{countryCode}/{cityCode}/{gymName}")
|
||||
public GymResponse getGym(
|
||||
@PathVariable String countryCode,
|
||||
@PathVariable String cityCode,
|
||||
|
|
@ -27,4 +25,9 @@ public class GymController {
|
|||
) {
|
||||
return gymService.getGym(countryCode, cityCode, gymName);
|
||||
}
|
||||
|
||||
@GetMapping(path = "/gyms/search")
|
||||
public List<GymResponse> searchGyms(@RequestParam(name = "query", required = false) String query) {
|
||||
return gymService.searchGyms(query);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@ package nl.andrewlalis.gymboard_api.dao;
|
|||
import nl.andrewlalis.gymboard_api.model.Gym;
|
||||
import nl.andrewlalis.gymboard_api.model.GymId;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@Repository
|
||||
public interface GymRepository extends JpaRepository<Gym, GymId> {
|
||||
public interface GymRepository extends JpaRepository<Gym, GymId>, JpaSpecificationExecutor<Gym> {
|
||||
@Query("SELECT g FROM Gym g " +
|
||||
"WHERE g.id.shortName = :gym AND " +
|
||||
"g.id.city.id.shortName = :city AND " +
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package nl.andrewlalis.gymboard_api.service;
|
||||
|
||||
import jakarta.persistence.criteria.Predicate;
|
||||
import nl.andrewlalis.gymboard_api.controller.dto.GymResponse;
|
||||
import nl.andrewlalis.gymboard_api.dao.GymRepository;
|
||||
import nl.andrewlalis.gymboard_api.model.Gym;
|
||||
|
|
@ -8,6 +9,9 @@ import org.springframework.stereotype.Service;
|
|||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class GymService {
|
||||
private final GymRepository gymRepository;
|
||||
|
|
@ -22,4 +26,24 @@ public class GymService {
|
|||
.orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
|
||||
return new GymResponse(gym);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<GymResponse> searchGyms(String queryText) {
|
||||
return gymRepository.findAll((root, query, criteriaBuilder) -> {
|
||||
query.distinct(true);
|
||||
List<Predicate> predicates = new ArrayList<>();
|
||||
if (queryText != null && !queryText.isBlank()) {
|
||||
String queryTextStr = "%" + queryText.toUpperCase() + "%";
|
||||
predicates.add(criteriaBuilder.like(
|
||||
criteriaBuilder.upper(root.get("displayName")),
|
||||
queryTextStr
|
||||
));
|
||||
predicates.add(criteriaBuilder.like(
|
||||
criteriaBuilder.upper(root.get("id").get("shortName")),
|
||||
queryTextStr
|
||||
));
|
||||
}
|
||||
return criteriaBuilder.or(predicates.toArray(new Predicate[0]));
|
||||
}).stream().map(GymResponse::new).toList();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
import axios from "axios";
|
||||
import process from "process";
|
||||
import axios from 'axios';
|
||||
|
||||
const api = axios.create({
|
||||
const api = axios.create({
|
||||
baseURL: 'http://localhost:8080'
|
||||
});
|
||||
|
||||
export interface GymIdentifiable {
|
||||
countryCode: string,
|
||||
cityShortName: string,
|
||||
shortName: string
|
||||
}
|
||||
|
||||
export type Gym = {
|
||||
countryCode: string,
|
||||
countryName: string,
|
||||
|
|
@ -37,4 +42,8 @@ export async function getGym(countryCode: string, cityShortName: string, gymShor
|
|||
streetAddress: d.streetAddress
|
||||
};
|
||||
return gym;
|
||||
}
|
||||
}
|
||||
|
||||
export function getGymRoute(gym: GymIdentifiable): string {
|
||||
return `/g/${gym.countryCode}/${gym.cityShortName}/${gym.shortName}`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
import axios from 'axios';
|
||||
|
||||
const api = axios.create({
|
||||
baseURL: 'http://localhost:8081'
|
||||
});
|
||||
|
||||
export interface GymSearchResult {
|
||||
shortName: string,
|
||||
displayName: string,
|
||||
cityShortName: string,
|
||||
cityName: string,
|
||||
countryCode: string,
|
||||
countryName: string,
|
||||
streetAddress: string,
|
||||
latitude: number,
|
||||
longitude: number
|
||||
}
|
||||
|
||||
/**
|
||||
* Searches for gyms using the given query, and eventually returns results.
|
||||
* @param query The query to use.
|
||||
*/
|
||||
export async function searchGyms(query: string): Promise<Array<GymSearchResult>> {
|
||||
const response = await api.get('/search/gyms?q=' + query);
|
||||
return response.data;
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
<template>
|
||||
<q-item :to="getGymRoute(gym)">
|
||||
<q-item-section>
|
||||
<q-item-label>{{ gym.displayName }}</q-item-label>
|
||||
<q-item-label caption lines="1">{{ gym.cityName }}</q-item-label>
|
||||
<q-item-label caption lines="1">{{ gym.countryName }}</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side top>
|
||||
<q-badge color="primary" label="10k"/>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {getGymRoute} from 'src/api/gymboard-api';
|
||||
import {GymSearchResult} from 'src/api/gymboard-search';
|
||||
|
||||
interface Props {
|
||||
gym: GymSearchResult
|
||||
}
|
||||
defineProps<Props>();
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<!--
|
||||
The standard wrapper for most content that appears in the app's central view,
|
||||
which centers content into a column on larger screens, and expands to full
|
||||
width for smaller screens.
|
||||
|
||||
Use this as the root component for any pages you create.
|
||||
-->
|
||||
<template>
|
||||
<q-page>
|
||||
<div class="row justify-center">
|
||||
<div class="col-xs-12 col-md-6 q-px-sm">
|
||||
<slot>
|
||||
<p>Page content</p>
|
||||
</slot>
|
||||
</div>
|
||||
</div>
|
||||
</q-page>
|
||||
</template>
|
||||
|
|
@ -1,20 +1,77 @@
|
|||
<template>
|
||||
<q-page>
|
||||
Index
|
||||
<router-link to="/g/nl/groningen/trainmore-munnekeholm">Test</router-link>
|
||||
<p>
|
||||
Search bar for gyms.
|
||||
</p>
|
||||
</q-page>
|
||||
<StandardCenteredPage>
|
||||
<q-input
|
||||
v-model="searchQuery"
|
||||
label="Search for a Gym"
|
||||
clearable
|
||||
:loading="searchBarLoadingState"
|
||||
@update:modelValue="onSearchQueryUpdated"
|
||||
class="q-mt-lg"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
<q-list>
|
||||
<SimpleGymItem v-for="gym in searchResults" :gym="gym" :key="gym.shortName" />
|
||||
</q-list>
|
||||
</StandardCenteredPage>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent } from 'vue';
|
||||
<script setup lang="ts">
|
||||
import {onMounted, ref, Ref} from 'vue';
|
||||
import SimpleGymItem from 'components/SimpleGymItem.vue';
|
||||
import {useRoute, useRouter} from 'vue-router';
|
||||
import StandardCenteredPage from 'components/StandardCenteredPage.vue';
|
||||
import {GymSearchResult, searchGyms} from 'src/api/gymboard-search';
|
||||
|
||||
export default defineComponent({
|
||||
name: 'IndexPage',
|
||||
setup () {
|
||||
return {};
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
|
||||
const searchQuery: Ref<string> = ref('');
|
||||
const searchBarLoadingState: Ref<boolean> = ref(false);
|
||||
const searchResults: Ref<Array<GymSearchResult>> = ref([]);
|
||||
|
||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
const SEARCH_TIMEOUT = 500;
|
||||
|
||||
onMounted(async () => {
|
||||
if (route.query.search_query) {
|
||||
searchQuery.value = route.query.search_query as string;
|
||||
searchBarLoadingState.value = true;
|
||||
await doSearch();
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Function that's called when the user's search query updates. It will start
|
||||
* a timer that'll eventually trigger {@link doSearch}.
|
||||
*/
|
||||
function onSearchQueryUpdated() {
|
||||
if (timer !== null) {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
timer = setTimeout(doSearch, SEARCH_TIMEOUT);
|
||||
searchBarLoadingState.value = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers a search of gyms using the current search query.
|
||||
*/
|
||||
async function doSearch() {
|
||||
const searchQueryText = searchQuery.value;
|
||||
let query = {};
|
||||
if (searchQueryText && searchQueryText.length > 0) {
|
||||
query = { search_query: searchQueryText };
|
||||
}
|
||||
await router.push({ path: '/', query: query });
|
||||
try {
|
||||
searchResults.value = await searchGyms(searchQueryText)
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
} finally {
|
||||
searchBarLoadingState.value = false;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
<template>
|
||||
<q-page>
|
||||
<h3>Gym Home Page</h3>
|
||||
<p>
|
||||
Put stuff here.
|
||||
</p>
|
||||
</q-page>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
<template>
|
||||
<q-page>
|
||||
<h3>Leaderboards</h3>
|
||||
<p>
|
||||
Some text here.
|
||||
</p>
|
||||
</q-page>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
<template>
|
||||
<q-page v-if="gym">
|
||||
<h3>{{ gym.displayName }}</h3>
|
||||
<p>Recent top lifts go here.</p>
|
||||
<q-btn
|
||||
color="primary"
|
||||
label="Submit Your Lift"
|
||||
:to="route.fullPath + '/submit'"
|
||||
/>
|
||||
<p>All the rest of the gym leaderboards should show up here.</p>
|
||||
</q-page>
|
||||
<StandardCenteredPage v-if="gym">
|
||||
<h3 class="q-my-sm">{{ gym.displayName }}</h3>
|
||||
<q-btn-group>
|
||||
<q-btn label="Home" :to="baseGymPath"/>
|
||||
<q-btn label="Submit" :to="baseGymPath + '/submit'"/>
|
||||
<q-btn label="Leaderboard" :to="baseGymPath + '/lb'"/>
|
||||
</q-btn-group>
|
||||
<router-view/>
|
||||
</StandardCenteredPage>
|
||||
<q-page v-if="notFound">
|
||||
<h3>Gym not found! Oh no!!!</h3>
|
||||
<router-link to="/">Back</router-link>
|
||||
|
|
@ -19,8 +18,10 @@
|
|||
import { onMounted, ref, Ref } from 'vue';
|
||||
import { getGym, Gym } from 'src/api/gymboard-api';
|
||||
import { useRoute } from 'vue-router';
|
||||
import StandardCenteredPage from 'components/StandardCenteredPage.vue';
|
||||
|
||||
const route = useRoute();
|
||||
const baseGymPath = `/g/${route.params.countryCode}/${route.params.cityShortName}/${route.params.gymShortName}`;
|
||||
|
||||
const gym: Ref<Gym | undefined> = ref<Gym>();
|
||||
const notFound: Ref<boolean | undefined> = ref<boolean>();
|
||||
|
|
@ -39,4 +40,4 @@ onMounted(async () => {
|
|||
notFound.value = true;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
<template>
|
||||
<q-page v-if="gym">
|
||||
<h3>Submit Your Lift for {{ gym.displayName }}</h3>
|
||||
<q-form>
|
||||
|
||||
</q-form>
|
||||
</q-page>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {onMounted, ref, Ref} from 'vue';
|
||||
import {getGym, Gym} from 'src/api/gymboard-api';
|
||||
import {useRoute} from 'vue-router';
|
||||
|
||||
const route = useRoute();
|
||||
const gym: Ref<Gym | undefined> = ref<Gym>();
|
||||
|
||||
onMounted(async () => {
|
||||
try {
|
||||
gym.value = await getGym(
|
||||
route.params.countryCode as string,
|
||||
route.params.cityShortName as string,
|
||||
route.params.gymShortName as string
|
||||
);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
|
|
@ -1,20 +1,25 @@
|
|||
import { RouteRecordRaw } from 'vue-router';
|
||||
import MainLayout from 'layouts/MainLayout.vue';
|
||||
import IndexPage from 'pages/IndexPage.vue';
|
||||
import GymPage from 'pages/GymPage.vue';
|
||||
import GymPage from 'pages/gym/GymPage.vue';
|
||||
import GymSubmissionPage from 'pages/gym/GymSubmissionPage.vue';
|
||||
import GymHomePage from 'pages/gym/GymHomePage.vue';
|
||||
import GymLeaderboardsPage from 'pages/gym/GymLeaderboardsPage.vue';
|
||||
|
||||
const routes: RouteRecordRaw[] = [
|
||||
{
|
||||
path: '/',
|
||||
component: MainLayout,
|
||||
children: [
|
||||
{
|
||||
path: '',
|
||||
component: IndexPage
|
||||
},
|
||||
{ path: '', component: IndexPage },
|
||||
{
|
||||
path: 'g/:countryCode/:cityShortName/:gymShortName',
|
||||
component: GymPage
|
||||
component: GymPage,
|
||||
children: [
|
||||
{ path: '', component: GymHomePage },
|
||||
{ path: 'submit', component: GymSubmissionPage },
|
||||
{ path: 'lb', component: GymLeaderboardsPage }
|
||||
]
|
||||
}
|
||||
],
|
||||
},
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
HELP.md
|
||||
target/
|
||||
!.mvn/wrapper/maven-wrapper.jar
|
||||
!**/src/main/**/target/
|
||||
!**/src/test/**/target/
|
||||
|
||||
### STS ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
.factorypath
|
||||
.project
|
||||
.settings
|
||||
.springBeans
|
||||
.sts4-cache
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
### NetBeans ###
|
||||
/nbproject/private/
|
||||
/nbbuild/
|
||||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
build/
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
gym-index/
|
||||
Binary file not shown.
|
|
@ -0,0 +1,2 @@
|
|||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
|
||||
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# Gymboard Search
|
||||
|
||||
A simple search API for Gymboard, backed by Apache Lucene. This application includes both indexing of Gyms and other searchable entities, and a public web interface for searching those indexes.
|
||||
|
||||
This application is configured with read-only access to the central Gymboard database, for its indexing operations.
|
||||
|
|
@ -0,0 +1,316 @@
|
|||
#!/bin/sh
|
||||
# ----------------------------------------------------------------------------
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Maven Start Up Batch script
|
||||
#
|
||||
# Required ENV vars:
|
||||
# ------------------
|
||||
# JAVA_HOME - location of a JDK home dir
|
||||
#
|
||||
# Optional ENV vars
|
||||
# -----------------
|
||||
# M2_HOME - location of maven2's installed home dir
|
||||
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
|
||||
# e.g. to debug Maven itself, use
|
||||
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
|
||||
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
if [ -z "$MAVEN_SKIP_RC" ] ; then
|
||||
|
||||
if [ -f /usr/local/etc/mavenrc ] ; then
|
||||
. /usr/local/etc/mavenrc
|
||||
fi
|
||||
|
||||
if [ -f /etc/mavenrc ] ; then
|
||||
. /etc/mavenrc
|
||||
fi
|
||||
|
||||
if [ -f "$HOME/.mavenrc" ] ; then
|
||||
. "$HOME/.mavenrc"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
# OS specific support. $var _must_ be set to either true or false.
|
||||
cygwin=false;
|
||||
darwin=false;
|
||||
mingw=false
|
||||
case "`uname`" in
|
||||
CYGWIN*) cygwin=true ;;
|
||||
MINGW*) mingw=true;;
|
||||
Darwin*) darwin=true
|
||||
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
|
||||
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
|
||||
if [ -z "$JAVA_HOME" ]; then
|
||||
if [ -x "/usr/libexec/java_home" ]; then
|
||||
export JAVA_HOME="`/usr/libexec/java_home`"
|
||||
else
|
||||
export JAVA_HOME="/Library/Java/Home"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -z "$JAVA_HOME" ] ; then
|
||||
if [ -r /etc/gentoo-release ] ; then
|
||||
JAVA_HOME=`java-config --jre-home`
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$M2_HOME" ] ; then
|
||||
## resolve links - $0 may be a link to maven's home
|
||||
PRG="$0"
|
||||
|
||||
# need this for relative symlinks
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG="`dirname "$PRG"`/$link"
|
||||
fi
|
||||
done
|
||||
|
||||
saveddir=`pwd`
|
||||
|
||||
M2_HOME=`dirname "$PRG"`/..
|
||||
|
||||
# make it fully qualified
|
||||
M2_HOME=`cd "$M2_HOME" && pwd`
|
||||
|
||||
cd "$saveddir"
|
||||
# echo Using m2 at $M2_HOME
|
||||
fi
|
||||
|
||||
# For Cygwin, ensure paths are in UNIX format before anything is touched
|
||||
if $cygwin ; then
|
||||
[ -n "$M2_HOME" ] &&
|
||||
M2_HOME=`cygpath --unix "$M2_HOME"`
|
||||
[ -n "$JAVA_HOME" ] &&
|
||||
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
||||
[ -n "$CLASSPATH" ] &&
|
||||
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
|
||||
fi
|
||||
|
||||
# For Mingw, ensure paths are in UNIX format before anything is touched
|
||||
if $mingw ; then
|
||||
[ -n "$M2_HOME" ] &&
|
||||
M2_HOME="`(cd "$M2_HOME"; pwd)`"
|
||||
[ -n "$JAVA_HOME" ] &&
|
||||
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
|
||||
fi
|
||||
|
||||
if [ -z "$JAVA_HOME" ]; then
|
||||
javaExecutable="`which javac`"
|
||||
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
|
||||
# readlink(1) is not available as standard on Solaris 10.
|
||||
readLink=`which readlink`
|
||||
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
|
||||
if $darwin ; then
|
||||
javaHome="`dirname \"$javaExecutable\"`"
|
||||
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
|
||||
else
|
||||
javaExecutable="`readlink -f \"$javaExecutable\"`"
|
||||
fi
|
||||
javaHome="`dirname \"$javaExecutable\"`"
|
||||
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
|
||||
JAVA_HOME="$javaHome"
|
||||
export JAVA_HOME
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$JAVACMD" ] ; then
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
else
|
||||
JAVACMD="`\\unset -f command; \\command -v java`"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
echo "Error: JAVA_HOME is not defined correctly." >&2
|
||||
echo " We cannot execute $JAVACMD" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$JAVA_HOME" ] ; then
|
||||
echo "Warning: JAVA_HOME environment variable is not set."
|
||||
fi
|
||||
|
||||
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
|
||||
|
||||
# traverses directory structure from process work directory to filesystem root
|
||||
# first directory with .mvn subdirectory is considered project base directory
|
||||
find_maven_basedir() {
|
||||
|
||||
if [ -z "$1" ]
|
||||
then
|
||||
echo "Path not specified to find_maven_basedir"
|
||||
return 1
|
||||
fi
|
||||
|
||||
basedir="$1"
|
||||
wdir="$1"
|
||||
while [ "$wdir" != '/' ] ; do
|
||||
if [ -d "$wdir"/.mvn ] ; then
|
||||
basedir=$wdir
|
||||
break
|
||||
fi
|
||||
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
|
||||
if [ -d "${wdir}" ]; then
|
||||
wdir=`cd "$wdir/.."; pwd`
|
||||
fi
|
||||
# end of workaround
|
||||
done
|
||||
echo "${basedir}"
|
||||
}
|
||||
|
||||
# concatenates all lines of a file
|
||||
concat_lines() {
|
||||
if [ -f "$1" ]; then
|
||||
echo "$(tr -s '\n' ' ' < "$1")"
|
||||
fi
|
||||
}
|
||||
|
||||
BASE_DIR=`find_maven_basedir "$(pwd)"`
|
||||
if [ -z "$BASE_DIR" ]; then
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
##########################################################################################
|
||||
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
|
||||
# This allows using the maven wrapper in projects that prohibit checking in binary data.
|
||||
##########################################################################################
|
||||
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo "Found .mvn/wrapper/maven-wrapper.jar"
|
||||
fi
|
||||
else
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
|
||||
fi
|
||||
if [ -n "$MVNW_REPOURL" ]; then
|
||||
jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
|
||||
else
|
||||
jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
|
||||
fi
|
||||
while IFS="=" read key value; do
|
||||
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
|
||||
esac
|
||||
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo "Downloading from: $jarUrl"
|
||||
fi
|
||||
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
|
||||
if $cygwin; then
|
||||
wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
|
||||
fi
|
||||
|
||||
if command -v wget > /dev/null; then
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo "Found wget ... using wget"
|
||||
fi
|
||||
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
|
||||
wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
|
||||
else
|
||||
wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
|
||||
fi
|
||||
elif command -v curl > /dev/null; then
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo "Found curl ... using curl"
|
||||
fi
|
||||
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
|
||||
curl -o "$wrapperJarPath" "$jarUrl" -f
|
||||
else
|
||||
curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
|
||||
fi
|
||||
|
||||
else
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo "Falling back to using Java to download"
|
||||
fi
|
||||
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
|
||||
# For Cygwin, switch paths to Windows format before running javac
|
||||
if $cygwin; then
|
||||
javaClass=`cygpath --path --windows "$javaClass"`
|
||||
fi
|
||||
if [ -e "$javaClass" ]; then
|
||||
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo " - Compiling MavenWrapperDownloader.java ..."
|
||||
fi
|
||||
# Compiling the Java class
|
||||
("$JAVA_HOME/bin/javac" "$javaClass")
|
||||
fi
|
||||
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
|
||||
# Running the downloader
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo " - Running MavenWrapperDownloader.java ..."
|
||||
fi
|
||||
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
##########################################################################################
|
||||
# End of extension
|
||||
##########################################################################################
|
||||
|
||||
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
|
||||
if [ "$MVNW_VERBOSE" = true ]; then
|
||||
echo $MAVEN_PROJECTBASEDIR
|
||||
fi
|
||||
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin; then
|
||||
[ -n "$M2_HOME" ] &&
|
||||
M2_HOME=`cygpath --path --windows "$M2_HOME"`
|
||||
[ -n "$JAVA_HOME" ] &&
|
||||
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
|
||||
[ -n "$CLASSPATH" ] &&
|
||||
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
|
||||
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
|
||||
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
|
||||
fi
|
||||
|
||||
# Provide a "standardized" way to retrieve the CLI args that will
|
||||
# work with both Windows and non-Windows executions.
|
||||
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
|
||||
export MAVEN_CMD_LINE_ARGS
|
||||
|
||||
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
|
||||
|
||||
exec "$JAVACMD" \
|
||||
$MAVEN_OPTS \
|
||||
$MAVEN_DEBUG_OPTS \
|
||||
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
|
||||
"-Dmaven.home=${M2_HOME}" \
|
||||
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
|
||||
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
|
||||
|
|
@ -0,0 +1,188 @@
|
|||
@REM ----------------------------------------------------------------------------
|
||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
||||
@REM or more contributor license agreements. See the NOTICE file
|
||||
@REM distributed with this work for additional information
|
||||
@REM regarding copyright ownership. The ASF licenses this file
|
||||
@REM to you under the Apache License, Version 2.0 (the
|
||||
@REM "License"); you may not use this file except in compliance
|
||||
@REM with the License. You may obtain a copy of the License at
|
||||
@REM
|
||||
@REM https://www.apache.org/licenses/LICENSE-2.0
|
||||
@REM
|
||||
@REM Unless required by applicable law or agreed to in writing,
|
||||
@REM software distributed under the License is distributed on an
|
||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
@REM KIND, either express or implied. See the License for the
|
||||
@REM specific language governing permissions and limitations
|
||||
@REM under the License.
|
||||
@REM ----------------------------------------------------------------------------
|
||||
|
||||
@REM ----------------------------------------------------------------------------
|
||||
@REM Maven Start Up Batch script
|
||||
@REM
|
||||
@REM Required ENV vars:
|
||||
@REM JAVA_HOME - location of a JDK home dir
|
||||
@REM
|
||||
@REM Optional ENV vars
|
||||
@REM M2_HOME - location of maven2's installed home dir
|
||||
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
|
||||
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
|
||||
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
|
||||
@REM e.g. to debug Maven itself, use
|
||||
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
|
||||
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
||||
@REM ----------------------------------------------------------------------------
|
||||
|
||||
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
|
||||
@echo off
|
||||
@REM set title of command window
|
||||
title %0
|
||||
@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
|
||||
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
|
||||
|
||||
@REM set %HOME% to equivalent of $HOME
|
||||
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
|
||||
|
||||
@REM Execute a user defined script before this one
|
||||
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
|
||||
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
|
||||
if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
|
||||
if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
|
||||
:skipRcPre
|
||||
|
||||
@setlocal
|
||||
|
||||
set ERROR_CODE=0
|
||||
|
||||
@REM To isolate internal variables from possible post scripts, we use another setlocal
|
||||
@setlocal
|
||||
|
||||
@REM ==== START VALIDATION ====
|
||||
if not "%JAVA_HOME%" == "" goto OkJHome
|
||||
|
||||
echo.
|
||||
echo Error: JAVA_HOME not found in your environment. >&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the >&2
|
||||
echo location of your Java installation. >&2
|
||||
echo.
|
||||
goto error
|
||||
|
||||
:OkJHome
|
||||
if exist "%JAVA_HOME%\bin\java.exe" goto init
|
||||
|
||||
echo.
|
||||
echo Error: JAVA_HOME is set to an invalid directory. >&2
|
||||
echo JAVA_HOME = "%JAVA_HOME%" >&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the >&2
|
||||
echo location of your Java installation. >&2
|
||||
echo.
|
||||
goto error
|
||||
|
||||
@REM ==== END VALIDATION ====
|
||||
|
||||
:init
|
||||
|
||||
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
|
||||
@REM Fallback to current working directory if not found.
|
||||
|
||||
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
|
||||
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
|
||||
|
||||
set EXEC_DIR=%CD%
|
||||
set WDIR=%EXEC_DIR%
|
||||
:findBaseDir
|
||||
IF EXIST "%WDIR%"\.mvn goto baseDirFound
|
||||
cd ..
|
||||
IF "%WDIR%"=="%CD%" goto baseDirNotFound
|
||||
set WDIR=%CD%
|
||||
goto findBaseDir
|
||||
|
||||
:baseDirFound
|
||||
set MAVEN_PROJECTBASEDIR=%WDIR%
|
||||
cd "%EXEC_DIR%"
|
||||
goto endDetectBaseDir
|
||||
|
||||
:baseDirNotFound
|
||||
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
|
||||
cd "%EXEC_DIR%"
|
||||
|
||||
:endDetectBaseDir
|
||||
|
||||
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
|
||||
|
||||
@setlocal EnableExtensions EnableDelayedExpansion
|
||||
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
|
||||
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
|
||||
|
||||
:endReadAdditionalConfig
|
||||
|
||||
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
|
||||
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
|
||||
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
|
||||
|
||||
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
|
||||
|
||||
FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
|
||||
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
|
||||
)
|
||||
|
||||
@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
|
||||
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
|
||||
if exist %WRAPPER_JAR% (
|
||||
if "%MVNW_VERBOSE%" == "true" (
|
||||
echo Found %WRAPPER_JAR%
|
||||
)
|
||||
) else (
|
||||
if not "%MVNW_REPOURL%" == "" (
|
||||
SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
|
||||
)
|
||||
if "%MVNW_VERBOSE%" == "true" (
|
||||
echo Couldn't find %WRAPPER_JAR%, downloading it ...
|
||||
echo Downloading from: %DOWNLOAD_URL%
|
||||
)
|
||||
|
||||
powershell -Command "&{"^
|
||||
"$webclient = new-object System.Net.WebClient;"^
|
||||
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
|
||||
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
|
||||
"}"^
|
||||
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
|
||||
"}"
|
||||
if "%MVNW_VERBOSE%" == "true" (
|
||||
echo Finished downloading %WRAPPER_JAR%
|
||||
)
|
||||
)
|
||||
@REM End of extension
|
||||
|
||||
@REM Provide a "standardized" way to retrieve the CLI args that will
|
||||
@REM work with both Windows and non-Windows executions.
|
||||
set MAVEN_CMD_LINE_ARGS=%*
|
||||
|
||||
%MAVEN_JAVA_EXE% ^
|
||||
%JVM_CONFIG_MAVEN_PROPS% ^
|
||||
%MAVEN_OPTS% ^
|
||||
%MAVEN_DEBUG_OPTS% ^
|
||||
-classpath %WRAPPER_JAR% ^
|
||||
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
|
||||
%WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
|
||||
if ERRORLEVEL 1 goto error
|
||||
goto end
|
||||
|
||||
:error
|
||||
set ERROR_CODE=1
|
||||
|
||||
:end
|
||||
@endlocal & set ERROR_CODE=%ERROR_CODE%
|
||||
|
||||
if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
|
||||
@REM check for post script, once with legacy .bat ending and once with .cmd ending
|
||||
if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
|
||||
if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
|
||||
:skipRcPost
|
||||
|
||||
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
|
||||
if "%MAVEN_BATCH_PAUSE%"=="on" pause
|
||||
|
||||
if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
|
||||
|
||||
cmd /C exit /B %ERROR_CODE%
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>nl.andrewlalis</groupId>
|
||||
<artifactId>gymboard-search</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<name>gymboard-search</name>
|
||||
<description>Search API for Gymboard</description>
|
||||
<properties>
|
||||
<java.version>17</java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core -->
|
||||
<dependency>
|
||||
<groupId>org.apache.lucene</groupId>
|
||||
<artifactId>lucene-core</artifactId>
|
||||
<version>9.4.2</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-spatial -->
|
||||
<dependency>
|
||||
<groupId>org.apache.lucene</groupId>
|
||||
<artifactId>lucene-spatial</artifactId>
|
||||
<version>8.4.1</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package nl.andrewlalis.gymboardsearch;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
public class DbUtils {
|
||||
public static String loadClasspathString(String resourceName) throws IOException {
|
||||
InputStream in = DbUtils.class.getResourceAsStream(resourceName);
|
||||
if (in == null) throw new IOException("Resource " + resourceName + " not found.");
|
||||
String s = new String(in.readAllBytes(), StandardCharsets.UTF_8);
|
||||
in.close();
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
package nl.andrewlalis.gymboardsearch;
|
||||
|
||||
import org.apache.lucene.analysis.Analyzer;
|
||||
import org.apache.lucene.analysis.standard.StandardAnalyzer;
|
||||
import org.apache.lucene.document.*;
|
||||
import org.apache.lucene.index.IndexWriter;
|
||||
import org.apache.lucene.index.IndexWriterConfig;
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.store.FSDirectory;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.FileSystemUtils;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.sql.Connection;
|
||||
import java.sql.DriverManager;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
|
||||
@Service
|
||||
public class GymIndexGenerator {
|
||||
private static final Logger log = LoggerFactory.getLogger(GymIndexGenerator.class);
|
||||
|
||||
void generateIndex() throws Exception {
|
||||
log.info("Starting Gym index generation.");
|
||||
Path gymIndexDir = Path.of("gym-index");
|
||||
FileSystemUtils.deleteRecursively(gymIndexDir);
|
||||
Files.createDirectory(gymIndexDir);
|
||||
long count = 0;
|
||||
try (
|
||||
Connection conn = DriverManager.getConnection("jdbc:postgresql://localhost:5432/gymboard-api-dev", "gymboard-api-dev", "testpass");
|
||||
PreparedStatement stmt = conn.prepareStatement(DbUtils.loadClasspathString("/sql/select-gyms.sql"));
|
||||
ResultSet resultSet = stmt.executeQuery();
|
||||
|
||||
Analyzer analyzer = new StandardAnalyzer();
|
||||
Directory indexDir = FSDirectory.open(gymIndexDir);
|
||||
IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(analyzer))
|
||||
) {
|
||||
while (resultSet.next()) {
|
||||
String shortName = resultSet.getString("short_name");
|
||||
String displayName = resultSet.getString("display_name");
|
||||
String cityShortName = resultSet.getString("city_short_name");
|
||||
String cityName = resultSet.getString("city_name");
|
||||
String countryCode = resultSet.getString("country_code");
|
||||
String countryName = resultSet.getString("country_name");
|
||||
String streetAddress = resultSet.getString("street_address");
|
||||
BigDecimal latitude = resultSet.getBigDecimal("latitude");
|
||||
BigDecimal longitude = resultSet.getBigDecimal("longitude");
|
||||
|
||||
Document doc = new Document();
|
||||
doc.add(new StringField("short_name", shortName, Field.Store.YES));
|
||||
doc.add(new StringField("display_name", displayName, Field.Store.YES));
|
||||
doc.add(new StringField("city_short_name", cityShortName, Field.Store.YES));
|
||||
doc.add(new StringField("city_name", cityName, Field.Store.YES));
|
||||
doc.add(new StringField("country_code", countryCode, Field.Store.YES));
|
||||
doc.add(new StringField("country_name", countryName, Field.Store.YES));
|
||||
doc.add(new StringField("street_address", streetAddress, Field.Store.YES));
|
||||
doc.add(new DoublePoint("latitude_point", latitude.doubleValue()));
|
||||
doc.add(new StoredField("latitude", latitude.doubleValue()));
|
||||
doc.add(new DoublePoint("longitude_point", longitude.doubleValue()));
|
||||
doc.add(new StoredField("longitude", longitude.doubleValue()));
|
||||
indexWriter.addDocument(doc);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
log.info("Gym index generation complete. {} gyms indexed.", count);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
package nl.andrewlalis.gymboardsearch;
|
||||
|
||||
import nl.andrewlalis.gymboardsearch.dto.GymResponse;
|
||||
import org.apache.lucene.document.Document;
|
||||
import org.apache.lucene.index.DirectoryReader;
|
||||
import org.apache.lucene.index.Term;
|
||||
import org.apache.lucene.search.*;
|
||||
import org.apache.lucene.store.FSDirectory;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class GymIndexSearcher {
|
||||
public List<GymResponse> searchGyms(String rawQuery) {
|
||||
if (rawQuery == null || rawQuery.isBlank()) return Collections.emptyList();
|
||||
String[] terms = rawQuery.split("\\s+");
|
||||
BooleanQuery.Builder queryBuilder = new BooleanQuery.Builder();
|
||||
String[] searchableFields = {
|
||||
"short_name",
|
||||
"display_name",
|
||||
"city_short_name",
|
||||
"city_name",
|
||||
"country_code",
|
||||
"country_name",
|
||||
"street_address"
|
||||
};
|
||||
for (String term : terms) {
|
||||
for (String field : searchableFields) {
|
||||
queryBuilder.add(new TermQuery(new Term(field, term)), BooleanClause.Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
BooleanQuery query = queryBuilder.build();
|
||||
Path gymIndexDir = Path.of("gym-index");
|
||||
try (
|
||||
var reader = DirectoryReader.open(FSDirectory.open(gymIndexDir));
|
||||
) {
|
||||
IndexSearcher searcher = new IndexSearcher(reader);
|
||||
List<GymResponse> results = new ArrayList<>(10);
|
||||
TopDocs topDocs = searcher.search(query, 10, Sort.RELEVANCE, false);
|
||||
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
|
||||
Document doc = searcher.doc(scoreDoc.doc);
|
||||
results.add(new GymResponse(doc));
|
||||
}
|
||||
return results;
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package nl.andrewlalis.gymboardsearch;
|
||||
|
||||
import org.springframework.boot.CommandLineRunner;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
@SpringBootApplication
|
||||
public class GymboardSearchApplication implements CommandLineRunner {
|
||||
private final GymIndexGenerator gymIndexGenerator;
|
||||
|
||||
public GymboardSearchApplication(GymIndexGenerator gymIndexGenerator) {
|
||||
this.gymIndexGenerator = gymIndexGenerator;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(GymboardSearchApplication.class, args);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
gymIndexGenerator.generateIndex();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package nl.andrewlalis.gymboardsearch;
|
||||
|
||||
import nl.andrewlalis.gymboardsearch.dto.GymResponse;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class SearchController {
|
||||
private final GymIndexSearcher gymIndexSearcher;
|
||||
|
||||
public SearchController(GymIndexSearcher gymIndexSearcher) {
|
||||
this.gymIndexSearcher = gymIndexSearcher;
|
||||
}
|
||||
|
||||
@GetMapping(path = "/search/gyms")
|
||||
public List<GymResponse> searchGyms(@RequestParam(name = "q", required = false) String query) {
|
||||
return gymIndexSearcher.searchGyms(query);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
package nl.andrewlalis.gymboardsearch.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||
import org.springframework.web.filter.CorsFilter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
@Configuration
|
||||
public class WebConfig {
|
||||
|
||||
@Bean
|
||||
public CorsFilter corsFilter() {
|
||||
final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||
final CorsConfiguration config = new CorsConfiguration();
|
||||
config.setAllowCredentials(true);
|
||||
// Don't do this in production, use a proper list of allowed origins
|
||||
config.addAllowedOriginPattern("*");
|
||||
config.setAllowedHeaders(Arrays.asList("Origin", "Content-Type", "Accept"));
|
||||
config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "OPTIONS", "DELETE", "PATCH"));
|
||||
source.registerCorsConfiguration("/**", config);
|
||||
return new CorsFilter(source);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
package nl.andrewlalis.gymboardsearch.dto;
|
||||
|
||||
import org.apache.lucene.document.Document;
|
||||
|
||||
public record GymResponse(
|
||||
String shortName,
|
||||
String displayName,
|
||||
String cityShortName,
|
||||
String cityName,
|
||||
String countryCode,
|
||||
String countryName,
|
||||
String streetAddress,
|
||||
double latitude,
|
||||
double longitude
|
||||
) {
|
||||
public GymResponse(Document doc) {
|
||||
this(
|
||||
doc.get("short_name"),
|
||||
doc.get("display_name"),
|
||||
doc.get("city_short_name"),
|
||||
doc.get("city_name"),
|
||||
doc.get("country_code"),
|
||||
doc.get("country_name"),
|
||||
doc.get("street_address"),
|
||||
doc.getField("latitude").numericValue().doubleValue(),
|
||||
doc.getField("longitude").numericValue().doubleValue()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
server.port=8081
|
||||
|
|
@ -0,0 +1 @@
|
|||
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
SELECT
|
||||
gym.short_name as short_name,
|
||||
gym.display_name as display_name,
|
||||
city.short_name as city_short_name,
|
||||
city.name as city_name,
|
||||
country.code as country_code,
|
||||
country.name as country_name,
|
||||
gym.street_address as street_address,
|
||||
gym.latitude as latitude,
|
||||
gym.longitude as longitude
|
||||
FROM gym
|
||||
LEFT JOIN city on gym.city_short_name = city.short_name
|
||||
LEFT JOIN country on gym.city_country_code = country.code
|
||||
ORDER BY gym.created_at;
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
package nl.andrewlalis.gymboardsearch;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
@SpringBootTest
|
||||
class GymboardSearchApplicationTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue