Fixes #1437: containerCssClass is replaced with selectionCssClass; select2 is retrieved via webjars

Author: solomax

pom.xml

@@ -383,6 +383,7 @@
 		<jquery-ui.version>1.14.2</jquery-ui.version>
 		<moment-js.version>2.30.1</moment-js.version>
 		<fullcalendar.version>6.1.15</fullcalendar.version>
+		<select2.version>4.1.0-rc.0</select2.version>
 		<owasp-sanitizer.version>20260313.1</owasp-sanitizer.version>
 		<!-- plugins -->
 		<maven-surefire-plugin.version>3.5.5</maven-surefire-plugin.version>
@@ -1055,6 +1056,11 @@
 				<artifactId>fullcalendar__google-calendar</artifactId>
 				<version>${fullcalendar.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.webjars.npm</groupId>
+				<artifactId>select2</artifactId>
+				<version>${select2.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
 				<artifactId>owasp-java-html-sanitizer</artifactId>

select2-parent/select2-examples/src/main/java/org/wicketstuff/select2/HomePage.java

@@ -26,7 +26,9 @@
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
 import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
 import org.apache.wicket.markup.html.form.ListMultipleChoice;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.model.PropertyModel;
@@ -50,17 +52,17 @@ public class HomePage extends WebPage
 	@SuppressWarnings("unused")
 	private Country countryDropDownChoice = Country.US;
 	@SuppressWarnings("unused")
-	private List<Country> countries = new ArrayList<>(Arrays.asList(new Country[] { Country.US, Country.CA }));
+	private List<Country> countries = new ArrayList<>(List.of(Country.US, Country.CA));
 	@SuppressWarnings("unused")
-	private List<Country> ajaxcountries = new ArrayList<>(Arrays.asList(new Country[] { Country.US, Country.CA }));
+	private List<Country> ajaxcountries = new ArrayList<>(List.of(Country.US, Country.CA));
 	@SuppressWarnings("unused")
-	private List<Country> ajaxcountriesns = new ArrayList<>(Arrays.asList(new Country[] { Country.US, Country.CA }));
+	private List<Country> ajaxcountriesns = new ArrayList<>(List.of(Country.US, Country.CA));
 	@SuppressWarnings("unused")
-	private List<Country> countriesListMultipleChoice = new ArrayList<>(Arrays.asList(new Country[] { Country.US, Country.CA }));
+	private List<Country> countriesListMultipleChoice = new ArrayList<>(List.of(Country.US, Country.CA));
 	@SuppressWarnings("unused")
 	private List<String> tags = new ArrayList<>(Arrays.asList("tag1", "tag2"));
 	@SuppressWarnings("unused")
-	private List<Country> countriesStateless = new ArrayList<>(Arrays.asList(new Country[] { Country.US, Country.CA }));
+	private List<Country> countriesStateless = new ArrayList<>(List.of(Country.US, Country.CA));
 
 	@Override
 	protected void onInitialize() {
@@ -337,15 +339,12 @@ public void query(String term, int page, Response<String> response)
 		}
 	}
 
-	public static class CountryRenderer extends ChoiceRenderer<Country>
+	public static class CountryRenderer extends LambdaChoiceRenderer<Country>
 	{
-
 		private static final long serialVersionUID = 1L;
 
 		public CountryRenderer() {
-			super("displayName", "name");
+			super(Country::getDisplayName, Country::name);
 		}
-
 	}
-
 }

select2-parent/select2-examples/src/main/java/org/wicketstuff/select2/WicketApplication.java

@@ -14,6 +14,8 @@
 
 import org.apache.wicket.protocol.http.WebApplication;
 
+import de.agilecoders.wicket.webjars.WicketWebjars;
+
 /**
  * Application object
  */
@@ -25,6 +27,7 @@ public class WicketApplication extends WebApplication
 	protected void init() {
 		getCspSettings().blocking().disabled();
 		super.init();
+		WicketWebjars.install(this);
 
 		mountPage("bootstrap", HomeBootstrapPage.class);
 

select2-parent/select2/pom.xml

@@ -35,11 +35,21 @@
 		</license>
 	</licenses>
 	<dependencies>
+		<!-- webjars for bootstrap theme -->
+		<dependency>
+			<groupId>de.agilecoders.wicket.webjars</groupId>
+			<artifactId>wicket-webjars</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.npm</groupId>
+			<artifactId>select2</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<!-- tests -->
 		<dependency>
 			<groupId>org.apache.wicket</groupId>
 			<artifactId>wicket-tester</artifactId>
@@ -61,11 +71,6 @@
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
 		</dependency>
-		<!-- webjars for bootstrap theme -->
-		<dependency>
-			<groupId>de.agilecoders.wicket.webjars</groupId>
-			<artifactId>wicket-webjars</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<resources>

select2-parent/select2/src/main/java/org/wicketstuff/select2/ApplicationSettings.java

@@ -1,11 +1,11 @@
 /*
  * Copyright 2012 Igor Vaynberg
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with
  * the License. You may obtain a copy of the License in the LICENSE file, or at:
- * 
+ *
  * http://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.
@@ -15,32 +15,29 @@
 import org.apache.wicket.Application;
 import org.apache.wicket.MetaDataKey;
 import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.request.resource.ResourceReference;
 
+import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
+import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
+
 /**
  * Application-wide settings that apply to all Select2 components.
- * 
+ *
  * The settings object is retreived via the static {@link #get()} method and is usually configured
  * in the {@link WebApplication#init()} method.
- * 
+ *
  * @author igor
  */
 public class ApplicationSettings
 {
-
 	private static final MetaDataKey<ApplicationSettings> KEY = new MetaDataKey<ApplicationSettings>()
 	{
 		private static final long serialVersionUID = 1L;
 	};
 
-	private ResourceReference javaScriptReference = new JavaScriptResourceReference(
-		ApplicationSettings.class, "res/js/select2.js");
-	private ResourceReference javaScriptReferenceFull = new JavaScriptResourceReference(
-		ApplicationSettings.class, "res/js/select2.full.js");
-	private ResourceReference cssReference = new CssResourceReference(
-		ApplicationSettings.class, "res/css/select2.css");
+	private ResourceReference javaScriptReference = new WebjarsJavaScriptResourceReference("select2/current/dist/js/select2.js");
+	private ResourceReference javaScriptReferenceFull = new WebjarsJavaScriptResourceReference("select2/current/dist/js/select2.full.js");
+	private ResourceReference cssReference = new WebjarsCssResourceReference("select2/current/dist/css/select2.css");
 
 	private boolean includeJavascriptFull = true;
 	private boolean includeJavascript = false;
@@ -127,7 +124,7 @@ public ApplicationSettings setJavascriptReferenceFull(ResourceReference javaScri
 
 	/**
 	 * Retrieves the instance of settings object.
-	 * 
+	 *
 	 * @return settings instance
 	 */
 	public static ApplicationSettings get()

select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java

@@ -64,7 +64,7 @@ public static class Widths
 	private String initSelection;  //TODO Deprecated in Select2 4.0, will be removed in 4.1
 	private String query; //TODO Deprecated in Select2 4.0, will be removed in 4.1
 	private String width;
-	private String containerCss, dropdownCss, containerCssClass, dropdownCssClass; //TODO deprecated
+	private String containerCss, dropdownCss, selectionCssClass, dropdownCssClass; //TODO deprecated
 	private String dropdownParent;
 
 	private AjaxSettings ajax;
@@ -121,7 +121,7 @@ public CharSequence toJson()
 			Json.writeObject(writer, "width", width);
 			Json.writeObject(writer, "theme", theme != null ? theme.name() : null);
 			Json.writeFunction(writer, "containerCss", containerCss);
-			Json.writeObject(writer, "containerCssClass", containerCssClass);
+			Json.writeObject(writer, "selectionCssClass", selectionCssClass);
 			Json.writeFunction(writer, "dropdownCss", dropdownCss);
 			Json.writeObject(writer, "dropdownCssClass", dropdownCssClass);
 			Json.writeObject(writer, "separator", separator);
@@ -451,14 +451,27 @@ public Settings setDropdownCss(String dropdownCss)
 		return this;
 	}
 
+	@Deprecated(forRemoval = true, since = "10.9")
 	public String getContainerCssClass()
 	{
-		return containerCssClass;
+		return selectionCssClass;
 	}
 
-	public Settings setContainerCssClass(String containerCssClass)
+	@Deprecated(forRemoval = true, since = "10.9")
+	public Settings setContainerCssClass(String selectionCssClass)
 	{
-		this.containerCssClass = containerCssClass;
+		this.selectionCssClass = selectionCssClass;
+		return this;
+	}
+
+	public String getSelectionCssClass()
+	{
+		return selectionCssClass;
+	}
+
+	public Settings setSelectionCssClass(String containerCssClass)
+	{
+		this.selectionCssClass = containerCssClass;
 		return this;
 	}