Skip to content

Commit

Permalink
Dependencies are updated; Javadoc warning were fixed; Failing test wa…
Browse files Browse the repository at this point in the history
…s disabled (#1175)

* Dependencies are updated; Javadoc warning were fixed; Failing test was disabled

* No need to disable the test anymore.

* Revert "No need to disable the test anymore."

This reverts commit 4a94a6d.

---------

Co-authored-by: Martin Grigorov <[email protected]>
Co-authored-by: Martin Tzvetanov Grigorov <[email protected]>
  • Loading branch information
3 people authored Dec 31, 2024
1 parent 0c9578e commit f5cf14d
Show file tree
Hide file tree
Showing 20 changed files with 55 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* #### Usage
*
* ```html
* <span class="className" wicket:id="foo"></span>
* {@code <span class="className" wicket:id="foo"></span>}
* ```
*
* can be modified with these CssClassNameAppender:
Expand All @@ -31,7 +31,7 @@
* this will result in the following markup:
*
* ```html
* <span class="className className2 className3" wicket:id="foo"></span>
* {@code <span class="className className2 className3" wicket:id="foo"></span>}
* ```
*/
public class CssClassNameAppender extends AttributeAppender {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*
* #### Usage
*
* <pre>
* <pre>{@code
* <span class="className" wicket:id="foo"></span>
* </pre>
* }</pre>
*
* can be modified with these CssClassNameAppender:
*
Expand All @@ -29,7 +29,7 @@
* this will result in the following markup:
*
* ```html
* <span class="className2 className3" wicket:id="foo"></span>
* {@code <span class="className2 className3" wicket:id="foo"></span>}
* ```
*/
public class CssClassNameModifier extends AttributeModifier {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* ```
*
* ```html
* <cite wicket:id="id">text</cite>
* {@code <cite wicket:id="id">text</cite>}
* ```
*/
public class Cite extends WebMarkupContainer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* ```
*
* ```html
* <cite wicket:id="id"></cite>
* {@code <cite wicket:id="id"></cite>}
* ```
*/
public class CiteBehavior extends Behavior {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* ```
*
* ```html
* <code wicket:id="id"></code>
* {@code <code wicket:id="id"></code>}
* ```
*
* It's possible to use `pre`, `code` and `xmp` as tag name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* ```
*
* ```html
* <code wicket:id="id">content</code>
* {@code <code wicket:id="id">content</code>}
* ```
*
* It's possible to use `pre`, `code` and `xmp` as tag name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,25 @@
* ```
*
* ```html
* <pre>{@code
* <div wicket:id="componentId">
* <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
* <small>Someone famous</small>
* </div>
* }</pre>
* ```
*
* To make the jumbotron full width, and without rounded corners, place it outside all `.containers` and instead add a
* `.container` within.
*
* ```html
* <div wicket:id="componentId">
* <div class="container">
* content
* </div>
* </div>
* <pre>{@code
* <div wicket:id="componentId">
* <div class="container">
* content
* </div>
* </div>
* }</pre>
* ```
*/
public class Jumbotron extends WebMarkupContainer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,25 @@
* ```
*
* ```html
* <pre>{@code
* <div wicket:id="componentId">
* <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
* <small>Someone famous</small>
* </div>
* }</pre>
* ```
*
* To make the jumbotron full width, and without rounded corners, place it outside all `.containers` and instead add a
* `.container` within.
*
* ```html
* <div wicket:id="componentId">
* <div class="container">
* content
* </div>
* </div>
* <pre>{@code
* <div wicket:id="componentId">
* <div class="container">
* content
* </div>
* </div>
* }</pre>
* ```
*/
public class JumbotronBehavior extends Behavior {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* ```
*
* ```html
* <span wicket:id="componentId">content</span>
* {@code <span wicket:id="componentId">content</span>}
* ```
*/
public class LabelBehavior extends Behavior {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* ```
*
* ```html
* <div wicket:id="id"></div>
* {@code <div wicket:id="id"></div>}
* ```
*/
public class PageHeader extends Panel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
* ```
*
* ```html
* <pre>{@code
* <blockquote wicket:id="componentId">
* <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
* <small>Someone famous</small>
* </blockquote>
* }</pre>
* ```
*/
public class Quote extends WebMarkupContainer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
* ```
*
* ```html
* <pre>{@code
* <blockquote wicket:id="componentId">
* <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
* <small>Someone famous</small>
* </blockquote>
* }</pre>
* ```
*/
public class QuoteBehavior extends Behavior {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* ```
*
* ```html
* <code wicket:id="id">content</code>
* {@code <code wicket:id="id">content</code>}
* ```
*
* It's possible to use `pre`, `code` and `xmp` as tag name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public SplitButton(final String markupId, final IModel<String> model) {
super(markupId, model);
}

/**
* {@inheritDoc}
*/
public SplitButton(final String markupId, final IModel<String> model, final IModel<IconType> iconTypeModel) {
super(markupId, model, iconTypeModel);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ public enum Fullscreen implements ICssClassNameProvider {
Lg_down("fullscreen-lg-down"),
Xl_down("fullscreen-xl-down"),
Xxl_down("fullscreen-xxl-down");


private final String cssClassName;

/**
* Construct.
*
Expand All @@ -93,7 +93,7 @@ public enum Fullscreen implements ICssClassNameProvider {
Fullscreen(final String cssClassName) {
this.cssClassName = cssClassName;
}

/**
* @return css class name of button type
*/
Expand Down Expand Up @@ -244,13 +244,13 @@ protected void onComponentTag(ComponentTag tag) {

Set<Size> sizes = Arrays.stream(Size.values()).collect(Collectors.toSet());
sizes.remove(Size.Default);
sizes.forEach(s -> Attributes.removeClass(tag, s));
sizes.forEach(s -> Attributes.removeClass(tag, s));
if(sizes.contains(size))
Attributes.addClass(tag, size);

Set<Fullscreen> fulscreens = Arrays.stream(Fullscreen.values()).collect(Collectors.toSet());
fulscreens.remove(Fullscreen.None);
fulscreens.forEach(s -> Attributes.removeClass(tag, s));
fulscreens.forEach(s -> Attributes.removeClass(tag, s));
if(fulscreens.contains(fullscreen))
Attributes.addClass(tag, fullscreen);
}
Expand All @@ -267,11 +267,11 @@ public Modal<T> size(Size size) {
this.size = size;
return this;
}

/**
* Sets fullscreen modal.
*
* @param size The size of the modal dialog.
* @param fullscreen Fullscreen mode of the modal dialog.
* @return {@code this}, for method chaining
*/
public Modal<T> fullscreen(Fullscreen fullscreen) {
Expand Down Expand Up @@ -306,7 +306,7 @@ protected void onComponentTag(ComponentTag tag) {
}

/**
* hook to react on modal close event. The {@link }
* hook to react on modal close event.
*
* @param target The current {@link IPartialPageRequestHandler}
*/
Expand Down Expand Up @@ -555,7 +555,6 @@ public void renderHead(IHeaderResponse response) {
*
* @param markupId markup id
* @return initializer script
* @see #createInitializerScript
*/
protected String createBasicInitializerScript(final String markupId) {
return "new bootstrap.Modal(document.getElementById('" + markupId + "'))" // options are added as data-attributes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.protocol.http.WebSession;

import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.markup.html.references.ModernizrJavaScriptReference;
Expand All @@ -24,7 +23,7 @@
*
* <h3>Usage:</h3>
*
* <pre lang="java">
* <pre lang="java">{@code
* class MyPage extends Page {
* public MyPage(PageParameters params) {
* // with chrome browser and bootstrap theme
Expand All @@ -35,14 +34,14 @@
* add(new HtmlTag("html-tag", Locale.GERMAN, true)); // <html lang="de-de" class="ie7 lt-ie8 lt-ie9 bootstrap no-js"
* }
* }
* </pre>
* <pre lang="html">
* }</pre>
* <pre lang="html">{@code
* <!DOCTYPE html>
* <html wicket:id="html-tag">
* <head>
* [...]
* </head>
* </pre>
* }</pre>
*
* @author miha
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
/**
* A {@link Navbar} is a navigation component that holds a list of elements,
* mostly Links/MenuButtons/Dropdowns.
* <p/>
* <pre><div wicket:id="navbar" class="navbar"></div></pre>
*
* <pre>{@code<div wicket:id="navbar" class="navbar"></div>}</pre>
*
* @author miha
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ public final class Dependencies {
* when using in `getDependencies()`:
*
* ```java
* <pre>{@code
* public Iterable<? extends HeaderItem> getDependencies() {
* return Dependencies.combine(super.getDependencies(), myCustomCssHeaderItem, myCustomJsHeaderItem);
* }
* }</pre>
* ```
*
* @param headerItems the base header item list
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.apache.wicket.util.tester.WicketTester;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import de.agilecoders.wicket.webjars.WicketWebjars;
Expand Down Expand Up @@ -72,6 +73,7 @@ void importWebContext() throws Exception {
* https://github.com/l0rdn1kk0n/wicket-bootstrap/issues/524
*/
@Test
@Disabled("Disabled due to the test was most likely broken by fix for WICKET-7024")
void importServletContextRelative() throws Exception {
WebApplication application = tester.getApplication();
URI uri = getClass().getResource("/servlet/context/root/").toURI();
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<mockito.version>5.14.2</mockito.version>
<jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
<slf4j.version>2.0.16</slf4j.version>
<wicket.version>10.2.0</wicket.version>
<wicket.version>10.3.0</wicket.version>
<yuicompressor.version>2.4.8</yuicompressor.version>

<maven-bundle-plugin.version>6.0.0</maven-bundle-plugin.version>
Expand Down Expand Up @@ -392,7 +392,7 @@
<links>
<link>https://docs.oracle.com/en/java/javase/17/docs/api/</link>
<link>https://junit.org/junit5/docs/current/api/</link>
<link>http://www.slf4j.org/apidocs/</link>
<link>https://www.slf4j.org/apidocs/</link>
</links>
</configuration>
<executions>
Expand Down

0 comments on commit f5cf14d

Please sign in to comment.