fix backwards compatibility

Author: hmottestad

tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/handler/AbstractQueryRequestHandler.java

@@ -317,20 +317,32 @@ abstract protected Query getQuery(HttpServletRequest request, RepositoryConnecti
 	protected ModelAndView getModelAndView(
 			HttpServletRequest request, HttpServletResponse response,
 			boolean headersOnly, RepositoryConnection repositoryCon, View view, Object queryResult,
-			FileFormatServiceRegistry<? extends FileFormat, ?> registry,
-			QueryCircuitBreakerHandle breakerHandle
+			FileFormatServiceRegistry<? extends FileFormat, ?> registry
 	) throws ClientHTTPException {
 		Map<String, Object> model = new HashMap<>();
 		model.put(QueryResultView.FILENAME_HINT_KEY, "query-result");
 		model.put(QueryResultView.QUERY_RESULT_KEY, queryResult);
 		model.put(QueryResultView.FACTORY_KEY, ProtocolUtil.getAcceptableService(request, response, registry));
 		model.put(QueryResultView.HEADERS_ONLY, headersOnly);
 		model.put(QueryResultView.CONNECTION_KEY, repositoryCon);
-		model.put(QueryResultView.BREAKER_HANDLE_KEY, breakerHandle);
 
 		return new ModelAndView(view, model);
 	}
 
+	protected ModelAndView getModelAndView(
+			HttpServletRequest request, HttpServletResponse response,
+			boolean headersOnly, RepositoryConnection repositoryCon, View view, Object queryResult,
+			FileFormatServiceRegistry<? extends FileFormat, ?> registry,
+			QueryCircuitBreakerHandle breakerHandle
+	) throws ClientHTTPException {
+		ModelAndView modelAndView = getModelAndView(request, response, headersOnly, repositoryCon, view, queryResult,
+				registry);
+		if (breakerHandle != null) {
+			modelAndView.addObject(QueryResultView.BREAKER_HANDLE_KEY, breakerHandle);
+		}
+		return modelAndView;
+	}
+
 	private ServerHTTPException toServiceUnavailable(HttpServletResponse response, QueryInterruptedException exception,
 			String fallbackMessage) {
 		QueryCircuitBreaker.CircuitBreakerException breakerException = QueryCircuitBreaker