From 6d67bdf04f2c2c2ab7af8b354ae1811a42c7607a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 4 Nov 2020 23:43:43 +0100 Subject: [PATCH] Polishing --- .../beans/DirectFieldAccessor.java | 5 ++--- .../core/metadata/CallMetaDataContext.java | 20 ++++++++++--------- .../web/servlet/DispatcherServletTests.java | 5 +++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java index 4435d7746ae..a98c6eb41b0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -92,8 +92,7 @@ public class DirectFieldAccessor extends AbstractNestablePropertyAccessor { @Override protected NotWritablePropertyException createNotWritablePropertyException(String propertyName) { PropertyMatches matches = PropertyMatches.forField(propertyName, getRootClass()); - throw new NotWritablePropertyException( - getRootClass(), getNestedPath() + propertyName, + throw new NotWritablePropertyException(getRootClass(), getNestedPath() + propertyName, matches.buildErrorMessage(), matches.getPossibleMatches()); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java index 37505db2ef3..2997f874555 100755 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java @@ -637,21 +637,23 @@ public class CallMetaDataContext { schemaNameToUse = this.metaDataProvider.schemaNameToUse(getSchemaName()); } - String procedureNameToUse = this.metaDataProvider.procedureNameToUse(getProcedureName()); if (isFunction() || isReturnValueRequired()) { - callString = new StringBuilder().append("{? = call "). - append(StringUtils.hasLength(catalogNameToUse) ? catalogNameToUse + "." : ""). - append(StringUtils.hasLength(schemaNameToUse) ? schemaNameToUse + "." : ""). - append(procedureNameToUse).append("("); + callString = new StringBuilder("{? = call "); parameterCount = -1; } else { - callString = new StringBuilder().append("{call "). - append(StringUtils.hasLength(catalogNameToUse) ? catalogNameToUse + "." : ""). - append(StringUtils.hasLength(schemaNameToUse) ? schemaNameToUse + "." : ""). - append(procedureNameToUse).append("("); + callString = new StringBuilder("{call "); } + if (StringUtils.hasLength(catalogNameToUse)) { + callString.append(catalogNameToUse).append("."); + } + if (StringUtils.hasLength(schemaNameToUse)) { + callString.append(schemaNameToUse).append("."); + } + callString.append(this.metaDataProvider.procedureNameToUse(getProcedureName())); + callString.append("("); + for (SqlParameter parameter : this.callParameters) { if (!parameter.isResultsParameter()) { if (parameterCount > 0) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index b2e6366a10f..0213b52847e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class DispatcherServletTests { @BeforeEach - public void setUp() throws ServletException { + public void setup() throws ServletException { MockServletConfig complexConfig = new MockServletConfig(getServletContext(), "complex"); complexConfig.addInitParameter("publishContext", "false"); complexConfig.addInitParameter("class", "notWritable"); @@ -105,6 +105,7 @@ public class DispatcherServletTests { return servletConfig.getServletContext(); } + @Test public void configuredDispatcherServlets() { assertThat(("simple" + FrameworkServlet.DEFAULT_NAMESPACE_SUFFIX).equals(simpleDispatcherServlet.getNamespace())).as("Correct namespace").isTrue();