8 Commits (e9f8d582c8084ade23fa6c4791e986dc9992f713)

Author	SHA1	Message	Date
Dan Cech	9350ab781c	clean up duplicated user creation code (#50178) ... * clean up duplicated user creation code * remove unused duplicate getOrCreateOrg function * fix up tests	4 years ago
Karl Persson	c4a75f9eb3	RBAC: Add scope resolvers for dashboards (#50110) ... * Inject access control into dashboard service * Add function to parse id scopes * Add dashboard as return value * Update mock * Return only err to keep service interface * Add scope resolvers for dashboard id scopes * Add function to parse uid scopes * Add dashboard uid scope resolver * Register scope resolvers for dashboards Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	4 years ago
Kristin Laemmert	0e991461b0	backend/sqlstore: move GetDashboardTags to dashboard service (#50091) ... + removing some functions that were already copied to the dashboard service in a previous pr.	4 years ago
Kat Yang	c63ebc887b	Chore: Run integration tests without grabpl (#49448) ... * Chore: Run integration tests without grabpl * Add new step for integration tests in lib.star * Remove old integration test step from lib.star * Change drone signature * Fix: Edit starlark integration step to not affect enterprise * Remove all build tags & rename starlark integration test step * Resync .drone.yml with .drone.star * Fix lint errors * Fix lint errors * Fix lint errors * Fix more lint errors * Fix another lint error * Rename integration test step * Fix last lint error * Recomment enterprise step * Remove comment from Makefile Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>	4 years ago
Kristin Laemmert	debbb8d59d	sqlstore: finish removing Find and SearchDashboards (#49347) ... * chore: replace artisnal FakeDashboardService with generated mock Maintaining a handcrafted FakeDashboardService is not sustainable now that we are in the process of moving the dashboard-related functions out of sqlstore. * sqlstore: finish removing Find and SearchDashboards Find and SearchDashboards were previously copied into the dashboard service. This commit completes that work, removing Find and SearchDashboards from the sqlstore and updating callers to use the dashboard service. * dashboards: remove SearchDashboards from Store interface SearchDashboards is a wrapper around FindDashboard that transforms the results, so it's been moved out of the Store entirely and the functionality moved into the Dashboard Service's search implementation. The database tests depended heavily on the transformation, so I added testSearchDashboards, a copy of search dashboards, instead of (heavily) refactoring all the tests.	4 years ago
Kat Yang	50c2b4682a	Chore: Rename integration tests (#49438) ... * Chore: Rename integration tests * Remove one Integration Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>	4 years ago
Kristin Laemmert	8c753999df	chore: replace artisanal FakeDashboardService with generated mock (#49276) ... * chore: replace handmade FakeDashboardService with generated mock Maintaining a handcrafted FakeDashboardService is not sustainable now that we are in the process of moving the dashboard-related functions out of sqlstore. * remove dialect global variable	4 years ago
Kristin Laemmert	33359aee6c	backend/sqlstore: move GetDashboards to Dashboard Service (#49175) ... I also did some mild file renaming to try and get the dashboards package closer in line with the sqlstore split design doc.	4 years ago
Kristin Laemmert	2b8909a9c6	move GetDashboardUIDById out of sqlstore and into dashboard service (#49170) ... * sqlstore: move GetDashboardUIDById to dashboard service * winding change through the rest of the codebase	4 years ago
ying-jeanne	e2ea064584	integrat star service into APIs (#49220)	4 years ago
Kristin Laemmert	1df340ff28	backend/services: Move GetDashboard from sqlstore to dashboard service (#48971) ... * rename folder to match package name * backend/sqlstore: move GetDashboard into DashboardService This is a stepping-stone commit which copies the GetDashboard function - which lets us remove the sqlstore from the interfaces in dashboards - without changing any other callers. * checkpoint: moving GetDashboard calls into dashboard service * finish refactoring api tests for dashboardService.GetDashboard	4 years ago
Ieva	f256f625d8	AccessControl: Enable RBAC by default (#48813) ... * Add RBAC section to settings * Default to RBAC enabled settings to true * Update tests to respect RBAC Co-authored-by: Karl Persson <kalle.persson@grafana.com>	4 years ago
Selene	b2af18f129	Chore: Remove bus from dashboard service (#46829) ... * Move DeleteDashboard funtion into dashboards store service, remove bus and update tests * Remove bus from folder service and update more tests * Fix mock	4 years ago
ying-jeanne	0d5a6c2194	remove bus from search and avoid import cycle (#46789) ... * fix the import cicle * fix some unittest * fix removal bus from search	4 years ago
Yuriy Tseretyan	2bd4c9ccde	respect query filter in FindDashboards (#46652)	4 years ago
Marcus Efraimsson	6c7d326499	Plugins: Refactor GetPluginDashboards/LoadPluginDashboard (#46316) ... Refactors GetPluginDashboards/LoadPluginDashboard by moving database interaction from plugin management to the plugindashboards service. Fixes #44553 Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	4 years ago
Kat Yang	d3ae8939af	Chore: Remove x from health, alert notification, dashboard, stats, user (#45265) ... * Chore: Remove x from health * Chore: Remove x from dashboard and user * Chore: Remove x from alert notification * Chore: Remove x from stats * Fix: Update func signature in stats test * Refactor: Remove x from GetDashboardTags * Chore: Remove x from dashboard * Chore: Remove x from Stats * Fix: Update refs of HasAdminPermissionInFolders * Fix: Adjust funcs in tests to be sqlStore methods * Fix: Fix database folder test sqlstore methods	4 years ago
Selene	d5b98772ed	Dashboards: Refactor service to make it injectable by wire (#44588) ... * Add providers to folder and dashboard services * Refactor folder and dashboard services * Move store implementation to its own file due wire cannot allow us to cast to SQLStore * Add store in some places and more missing dependencies * Bad merge fix * Remove old functions from tests and few fixes * Fix provisioning * Remove store from http server and some test fixes * Test fixes * Fix dashboard and folder tests * Fix library tests * Fix provisioning tests * Fix plugins manager tests * Fix alert and org users tests * Refactor service package and more test fixes * Fix dashboard_test tets * Fix api tests * Some lint fixes * Fix lint * More lint :/ * Move dashboard integration tests to dashboards service and fix dependencies * Lint + tests * More integration tests fixes * Lint * Lint again * Fix tests again and again anda again * Update searchstore_test * Fix goimports * More go imports * More imports fixes * Fix lint * Move UnprovisionDashboard function into dashboard service and remove bus * Use search service instead of bus * Fix test * Fix go imports * Use nil in tests	4 years ago
idafurjes	caa5f356be	Remove bus from dashboard api (#44923) ... * Remove bus from dashboard api * Polish api dashboard tests * Remove Delete Slug method * Fix sqlstore dashboard test * Remove bus from dashboard permission * Remove GetDashboardsBySlug from sqlstore	4 years ago
idafurjes	7a23700e1a	Remove unused GetDashboard method (#44890) ... * Remove unused GetDashboard method * Uncomment test * Fix dashboard service integration test * Remove comment	4 years ago
idafurjes	58ee553634	Chore: Remove bus from user api (#44468) ... * Chore: Remove bus from user api * Adu authinfoservice interface * User authinfoservice.Service instead of authinfoservice.Implementation in HTTPServer * Rename Implementation to authInfoService	4 years ago
Katarina Yang	92ca38bedf	Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in misc files (#43926) ... * Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in misc files * Refactor: Change .inTransaction in org.go file * Refactor: Update init() to proper SQLStore handlers * Refactor: Update funcs in tests to be sqlStore methods * Refactor: Update API funcs to receive HTTPServer * Fix: define methods on sqlstore * Adjust GetSignedInUser calls * Refactor: Add sqlStore to Service struct * Chore: Add back black spaces to remove file from PR Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>	4 years ago
Marcus Efraimsson	62b69a0b90	Revert "Search: Fix only searching for folder id zero (#44175)" (#44424) ... This reverts commit 007cd144a9 from #44175.	4 years ago
Marcus Efraimsson	007cd144a9	Search: Fix only searching for folder id zero (#44175) ... Fixes so that searching for folder id zero in folder/dashboard search returns dashboards located in the general folder and not including all folders as it did before. Fixes #40273	4 years ago
Jeremy Price	6ae7b0c3b2	Accesscontrol: list tokens for service account (#43809) ... * Add list tokens endpoint * Update api.go Co-authored-by: J Guerreiro <joao.guerreiro@grafana.com>	4 years ago
Marcus Efraimsson	2d2f7afbde	Chore: Propagate context for search (#41010) ... Propagate context for search.Query, FindPersistedDashboardsQuery, GetUserStarsQuery. Followup on context.TODO added by #40810. Ref #36734	4 years ago
idafurjes	ad79473ca3	Chore: Remove convey from dashboards (#39898) ... * Remove Convey from dashboards * Add context for dashboards * Remove Convey from dashboards * refactor tests to run setup each time * Fix last tests * Adjust after rebase * Remove print statement Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>	4 years ago
idafurjes	2759b16ef5	Chore: Add context for dashboards (#39844) ... * Add context for dashboards * Remove GetDashboardCtx * Remove ctx.TODO	4 years ago
idafurjes	f4f0d74838	Chore: Add context to user (#39649) ... * Add context to user * Add context for enterprise * Add context for UpdateUserLastSeenAtCommand * Remove xorm	4 years ago
idafurjes	b255c1b992	Chore: Add context to star and stats (#39591) ... * Add context to star and stats * Use WithTransactionalDbSession * Add additional ctx * Remove convey * Fix star handler name * Use WithDbSession, use DispatchCtx * Remove xorm from star	4 years ago
Marcus Efraimsson	fa9857499b	Chore: GetDashboardQuery should be dispatched using DispatchCtx (#36877) ... * Chore: GetDashboardQuery should be dispatched using DispatchCtx * Fix after merge * Changes after review * Various fixes * Use GetDashboardCtx function instead of GetDashboard	4 years ago
Serge Zaitsev	643c7fa0cb	Chore: update all +build statements (#38782)	4 years ago
Sofia Papagiannaki	b96dd1877c	Folder API: optionally force deleting Grafana 8 alerts when deleting a folder (or error) (#36427) ... * Folder API: Add an optional query parameter for allowing deleting a folder containing rules * Update frontend - Set forceDeleteRules=true when frontend deletes a folder - Improve modal text * Update docs * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com> Co-authored-by: Nathan Rodman <nathanrodman@gmail.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>	4 years ago
Dafydd	0dcd0281ab	Chore: avoid hard-coding IDs in integration tests (#33152) ... * use dynamic user Ids in test * use dynamic IDs in alert tests * use dynamic IDs in dashboard test queries * use dynamic IDs in org test queries	5 years ago
Arve Knudsen	87c3a2b790	PluginManager: Make Plugins, Renderer and DataSources non-global (#31866) ... * PluginManager: Make Plugins and DataSources non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Replace outdated command Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix build Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove FocusConvey Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo interface changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Backend: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rename to DataSourceCount Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Consolidate dashboard interfaces into one Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix dashboard integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Agnès Toulet	3303e28b38	Search: add sort information in dashboard results (#30609) ... * Search: add SortMeta in dashboard results * fix integration tests * trim SortMeta * fix searchstore tests * Update pkg/services/sqlstore/dashboard.go Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	5 years ago
Emil Hessman	3519330166	Chore: Rewrite test helpers from GoConvey to stdlib (#28919)	5 years ago
Agnès Toulet	f0421ed08e	Dashboards / Folders: delete related data (permissions, stars, tags, versions, annotations) when deleting a dashboard or a folder (#28826) ... * Dashboard: delete related data when deleting a dashboard or a folder * fix migrations order * apply PR feedback	5 years ago
Sofia Papagiannaki	4937f0daab	SQLStore: Run tests as integration tests (#28265) ... * sqlstore: Run tests as integration tests * Truncate database instead of re-creating it on each test * Fix test description See https://github.com/grafana/grafana/pull/12129 * Fix lint issues * Fix postgres dialect after review suggestion * Rename and document functions after review suggestion * Add periods * Fix auto-increment value for mysql dialect Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	5 years ago
Emil Tullstedt	078d08d036	Search: Support multiple order filters (#24230)	6 years ago
Carl Bergquist	f9962eabff	chore: avoid aliasing imports in services (#22499)	6 years ago
Leonard Gram	10fbabfb2e	Sqlstore: guard against getting a dashboard without specifying identi… (#22246) ... * Sqlstore: guard against getting a dashboard without specifying identifier * Sqlstore: linting	6 years ago
Arve Knudsen	2a78d2a61c	pkg/services: Check errors (#19712) ... * pkg/services: Check errors * pkg/services: Don't treat context.Canceled|context.DeadlineExceeded as error	6 years ago
Torkel Ödegaard	36d64fecea	Search: Fixed search issue introduced in recent PR (#16652)	7 years ago
Torkel Ödegaard	8b0dd4244b	Search: Fixes search limits and adds a page parameter (#16458) ... * Search: Fixes search limits and adds a page parameter This adds a page parameter to search api without adding any major breaking change. It does at an api validation error when trying to use a limit beyond 5000. This is a breaking change. We could remove this and have it only in the docs and describe that this is a limit that grafana will apply silently. Fixes #16049 * Fix: Corrected wrong array slice change * Docs: minor docs fix * Search: fixed folder tests * Fixed: Moved limit to correct inner query * Search: moving limit check and page check * Search: limit in handler is no longer needed	7 years ago
Mario Trangoni	b7628f2060	pkg/util/{filepath.go,shortid_generator.go}: Fix golint issues ... See, $ gometalinter --vendor --deadline 10m --disable-all --enable=golint ./... filepath.go:12:5⚠️ error var WalkSkipDir should have name of the form ErrFoo (golint) shortid_generator.go:11:5⚠️ var validUidPattern should be validUIDPattern (golint) shortid_generator.go:19:6⚠️ func IsValidShortUid should be IsValidShortUID (golint) shortid_generator.go:24:6⚠️ func GenerateShortUid should be GenerateShortUID (golint)	7 years ago
Marcus Efraimsson	1dd9646a50	fix failing test due to time diff issues	8 years ago
Mark Meyer	0f6e5e2953	Allow settting of default org id to auto-assign to (#12401) ... Author: Mark Meyer <mark@ofosos.org>	8 years ago
bergquist	1181e96799	merge create user handlers	8 years ago
Karsten Weiss	de8696d5d3	Outdent code after if block that ends with return (golint) ... This commit fixes the following golint warnings: pkg/bus/bus.go:64:9: if block ends with a return statement, so drop this else and outdent its block pkg/bus/bus.go:84:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:137:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:177:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:183:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:199:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:208:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/components/dynmap/dynmap.go:236:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:242:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:257:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:263:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:278:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:284:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:299:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:331:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:350:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:356:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:366:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:390:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:396:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:405:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:427:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:433:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:442:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:459:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:465:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:474:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:491:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:497:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:506:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:523:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:529:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:538:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:555:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:561:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:570:12: if block ends with a return statement, so drop this else and outdent its block pkg/login/ldap.go:55:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/login/ldap_test.go:372:10: if block ends with a return statement, so drop this else and outdent its block pkg/middleware/middleware_test.go:213:12: if block ends with a return statement, so drop this else and outdent its block pkg/plugins/dashboard_importer.go:153:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/dashboards_updater.go:39:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/dashboards_updater.go:121:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/plugins.go:210:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/plugins.go:235:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/eval_context.go:111:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:92:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:98:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:122:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:108:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:118:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:121:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifiers/telegram.go:94:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/annotation.go:34:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/annotation.go:99:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/dashboard_test.go:107:13: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/plugin_setting.go:78:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/preferences.go:91:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/user.go:50:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/migrator/migrator.go:106:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/migrator/postgres_dialect.go:48:10: if block ends with a return statement, so drop this else and outdent its block pkg/tsdb/time_range.go:59:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/tsdb/time_range.go:67:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/tsdb/cloudwatch/metric_find_query.go:225:9: if block ends with a return statement, so drop this else and outdent its block pkg/util/filepath.go:68:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)	8 years ago