diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 568f1b35..f9cce825 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -54,13 +54,14 @@ jobs: name: surefire-report path: target/surefire-reports/ - build-and-owasp: + owasp: runs-on: ubuntu-latest + timeout-minutes: 8 permissions: actions: read contents: read security-events: write - needs: test + needs: build services: owasp-db: image: nalusolutionsgmbh/owasp-maven-action:latest @@ -72,8 +73,6 @@ jobs: distribution: temurin java-version: '11' cache: maven - - name: Build with Maven - run: mvn install -ntp - name: Copy owasp database from container to runner run: docker cp $(docker ps -aqf "name=owasp-db"):/dependency-check/data ./dependency-checker-db/ - name: OWASP Check @@ -94,7 +93,7 @@ jobs: maven-deploy-dev: runs-on: ubuntu-latest - needs: build-and-owasp + needs: [ test, owasp ] if: github.ref == 'refs/heads/dev' steps: - uses: actions/checkout@v4 @@ -132,7 +131,7 @@ jobs: maven-deploy-main: runs-on: ubuntu-latest - needs: build-and-owasp + needs: [ test, owasp ] if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/delete-workflow-runs.yaml b/.github/workflows/delete-workflow-runs.yaml index 93e19037..13c1e6f2 100644 --- a/.github/workflows/delete-workflow-runs.yaml +++ b/.github/workflows/delete-workflow-runs.yaml @@ -1,4 +1,4 @@ -name: Delete old workflow runs +name: Delete workflow runs on: workflow_dispatch: inputs: diff --git a/.github/workflows/deploy-wiki.yaml b/.github/workflows/deploy-wiki.yaml new file mode 100644 index 00000000..babd785d --- /dev/null +++ b/.github/workflows/deploy-wiki.yaml @@ -0,0 +1,18 @@ +name: deploy-wiki +on: + push: + branches: + - main + - dev + paths: + - wiki/** +jobs: + deploy-wiki: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions4gh/deploy-wiki@v1 + env: + GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/wiki-pages.yaml b/.github/workflows/wiki-pages.yaml deleted file mode 100644 index 65e125d9..00000000 --- a/.github/workflows/wiki-pages.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: WikiPages - -on: - push: - branches: - - main - -jobs: - build: - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' - steps: - - uses: actions/checkout@v1 - - name: Upload Documentation to Wiki - uses: SwiftDocOrg/github-wiki-publish-action@v1 - with: - path: etc/wiki - env: - GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} \ No newline at end of file diff --git a/README.md b/README.md index 5fafb8e6..8fd44798 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![GWT3/J2CL compatible](https://img.shields.io/badge/GWT3/J2CL-compatible-brightgreen.svg) [![Join the chat at https://gitter.im/Nalukit42/Lobby](https://badges.gitter.im/Nalukit42/Lobby.svg)](https://gitter.im/Nalukit42/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://img.shields.io/maven-central/v/com.github.nalukit/nalu.svg?colorB=44cc11)](https://central.sonatype.com/artifact/com.github.nalukit/nalu) -[![Build & Deploy](https://github.com/NaluKit/nalu/actions/workflows/build.yaml/badge.svg?branch=dev)](https://github.com/NaluKit/nalu/actions/workflows/build.yaml) +[![Build & Deploy](https://github.com/NaluKit/nalu/actions/workflows/build.yaml/badge.svg?branch=main)](https://github.com/NaluKit/nalu/actions/workflows/build.yaml) Nalu is a tiny framework that helps you to create GWT based applications quite easily. Using the HTML 5 history for routing and navigation, Nalu supports the browser's back-, forward-, and reload-button by default and without any need to implement anything. @@ -136,12 +136,12 @@ To use Nalu add the following dependencies to your pom: com.github.nalukit nalu - 2.20.0 + 2.20.1 com.github.nalukit nalu-processor - 2.20.0 + 2.20.1 provided ``` @@ -156,6 +156,7 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi com.github.nalukit nalu-plugin-elemental2 2.10.1-gwt-2.8.2 + ``` * **GWT 2.9.0 (and newer) - SNAPSHOT** @@ -164,6 +165,7 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi com.github.nalukit nalu-plugin-elemental2 HEAD-SNAPSHOT + ``` * **GWT 2.9.0 (and newer) - Release** @@ -171,7 +173,7 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi com.github.nalukit nalu-plugin-elemental2 - 2.20.0 + 2.20.1 ``` @@ -200,11 +202,29 @@ For Elemento there's a dedicated plugin which supports `org.jboss.gwt.elemento.c com.github.nalukit nalu-plugin-elemento - 2.20.0 + 2.20.1 ``` -The **nalu-plugin-elemento** can also be used with Domino-ui. +For Domino-UI Version 2 there's also a dedicated plugin which supports `org.dominokit.domino.ui.IsElement` as widget type: + +* **GWT 2.9.0 (and newer) - SNAPSHOT** +```XML + + com.github.nalukit + nalu-plugin-domino-v2 + HEAD-SNAPSHOT + +``` + +* **GWT 2.9.0 (and newer) - Release** +```XML + + com.github.nalukit + nalu-plugin-domino-v2 + 2.20.1 + +``` **(These plugins are ready to use with J2CL / GWT 3)** @@ -245,12 +265,12 @@ If your project uses a widget set based on **GWT** 2.8.2 or newer, use the **Nal com.github.nalukit nalu-plugin-gwt - 2.20.0 + 2.20.1 com.github.nalukit nalu-plugin-gwt-processor - 2.20.0 + 2.20.1 provided ``` @@ -277,7 +297,7 @@ Nalu has **no** dependency to gwt-user nor Nalu's dependencies! Nalu does not us Nalu is ready to use with J2CL / GWT 3 as long as you do not use the nalu-plugin-gwt! ## To get in touch with the developer -Please use the [Nalu Gitter room](https://gitter.im/Nalukit42/Lobby). +Please visit use us at [Nalu Gitter room](https://gitter.im/Nalukit42/Lobby). ## Examples Here you will find many examples that show Nalu in action: [https://github.com/nalukit/nalu-examples](https://github.com/nalukit/nalu-examples). diff --git a/nalu-plugin-core-web/pom.xml b/nalu-plugin-core-web/pom.xml index e72bd1ba..67418f7b 100644 --- a/nalu-plugin-core-web/pom.xml +++ b/nalu-plugin-core-web/pom.xml @@ -98,44 +98,20 @@ - + org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-engine ${junit-jupiter.version} test - + org.junit.platform - junit-platform-runner + junit-platform-suite-api ${junit-jupiter-platform.version} test - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - - org.hamcrest - hamcrest-core - - - diff --git a/nalu-plugin-core-web/src/test/java/com/github/nalukit/nalu/plugin/core/web/AllTests.java b/nalu-plugin-core-web/src/test/java/com/github/nalukit/nalu/plugin/core/web/AllTests.java index 3fc14e58..ca1a0992 100644 --- a/nalu-plugin-core-web/src/test/java/com/github/nalukit/nalu/plugin/core/web/AllTests.java +++ b/nalu-plugin-core-web/src/test/java/com/github/nalukit/nalu/plugin/core/web/AllTests.java @@ -18,11 +18,8 @@ package com.github.nalukit.nalu.plugin.core.web; import com.github.nalukit.nalu.plugin.core.web.client.NaluPluginCoreWebTest; -import org.junit.platform.runner.JUnitPlatform; import org.junit.platform.suite.api.SelectClasses; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) @SelectClasses({ NaluPluginCoreWebTest.class }) public class AllTests { diff --git a/nalu-plugin-domino-v2/pom.xml b/nalu-plugin-domino-v2/pom.xml index be982d91..cc7533d8 100644 --- a/nalu-plugin-domino-v2/pom.xml +++ b/nalu-plugin-domino-v2/pom.xml @@ -75,7 +75,7 @@ - 2.0.0-RC5 + 2.0.2 diff --git a/nalu-plugin-elemental2/pom.xml b/nalu-plugin-elemental2/pom.xml index a08d5405..47693aae 100644 --- a/nalu-plugin-elemental2/pom.xml +++ b/nalu-plugin-elemental2/pom.xml @@ -113,13 +113,6 @@ - diff --git a/nalu-plugin-elemento/pom.xml b/nalu-plugin-elemento/pom.xml index 439b17e4..72a64da6 100644 --- a/nalu-plugin-elemento/pom.xml +++ b/nalu-plugin-elemento/pom.xml @@ -75,7 +75,7 @@ - 1.0.3 + 1.6.5 @@ -132,15 +132,24 @@ jsinterop-annotations com.google.jsinterop + + junit-jupiter + org.junit.jupiter + + + junit-jupiter-api + org.junit.jupiter + + + junit-jupiter-engine + org.junit.jupiter + + + junit-jupiter-params + org.junit.jupiter + - diff --git a/nalu-plugin-gwt-processor/pom.xml b/nalu-plugin-gwt-processor/pom.xml index 1761b79b..eb7d0939 100644 --- a/nalu-plugin-gwt-processor/pom.xml +++ b/nalu-plugin-gwt-processor/pom.xml @@ -222,46 +222,22 @@ test + org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-engine ${junit-jupiter.version} test - + org.junit.platform - junit-platform-runner + junit-platform-suite-api ${junit-jupiter-platform.version} test - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - - org.hamcrest - hamcrest-core - - - - diff --git a/nalu-processor/pom.xml b/nalu-processor/pom.xml index d2ff06b5..16dc8ba0 100644 --- a/nalu-processor/pom.xml +++ b/nalu-processor/pom.xml @@ -170,43 +170,20 @@ test + org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-engine ${junit-jupiter.version} test - + org.junit.platform - junit-platform-runner + junit-platform-suite-api ${junit-jupiter-platform.version} test - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - - org.hamcrest - hamcrest-core - - - com.google.elemental2 @@ -280,23 +257,20 @@ org.apache.maven.plugins maven-surefire-plugin ${plugin.version.surfire} - - - unit-tests - - test - - test - - - - - **/Test*.java - **/*Test.java - **/*Tests.java - **/*TestCase.java - - + + + + + + + + + + + + + + org.apache.maven.plugins diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/ProcessorUtils.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/ProcessorUtils.java index 31570e07..c4480c07 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/ProcessorUtils.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/ProcessorUtils.java @@ -193,12 +193,6 @@ public TypeMirror getFlattenedSupertype(Types types, return null; } - // public String createNameWithleadingUpperCase(String name) { - // return name.substring(0, - // 1) - // .toUpperCase() + name.substring(1); - // } - public void createErrorMessage(String errorMessage) { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/intern/BlockControllerModel.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/intern/BlockControllerModel.java index c0e0034c..3d3c6d10 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/intern/BlockControllerModel.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/intern/BlockControllerModel.java @@ -20,16 +20,16 @@ public class BlockControllerModel { - private String name; - private ClassNameModel context; - private ClassNameModel controller; - private ClassNameModel componentInterface; - private ClassNameModel component; - private ClassNameModel provider; - private boolean componentCreator; - private ClassNameModel conndition; - private List eventHandlers; - private List eventModels; + private String name; + private ClassNameModel context; + private ClassNameModel controller; + private ClassNameModel componentInterface; + private ClassNameModel component; + private final ClassNameModel provider; + private boolean componentCreator; + private ClassNameModel conndition; + private List eventHandlers; + private List eventModels; public BlockControllerModel(String name, ClassNameModel context, @@ -97,10 +97,6 @@ public ClassNameModel getProvider() { return provider; } - public void setProvider(ClassNameModel provider) { - this.provider = provider; - } - public boolean isComponentCreator() { return componentCreator; } diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/intern/ControllerModel.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/intern/ControllerModel.java index 8cf17239..701f598d 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/intern/ControllerModel.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/intern/ControllerModel.java @@ -22,20 +22,20 @@ public class ControllerModel { - private String[] originalRoute; - private List parameters; - private ClassNameModel provider; - private final List parameterAcceptors; - private boolean componentCreator; - private List route; - private String selector; - private ClassNameModel context; - private ClassNameModel controller; - private ClassNameModel componentInterface; - private ClassNameModel component; - private List composites; - private List eventHandlers; - private List eventModels; + private String[] originalRoute; + private List parameters; + private ClassNameModel provider; + private final List parameterAcceptors; + private boolean componentCreator; + private List route; + private String selector; + private ClassNameModel context; + private ClassNameModel controller; + private ClassNameModel componentInterface; + private ClassNameModel component; + private List composites; + private List eventHandlers; + private List eventModels; public ControllerModel() { this.parameterAcceptors = new ArrayList<>(); @@ -148,14 +148,6 @@ public List getParameterAcceptors() { return parameterAcceptors; } - public String getParameterAcceptors(String parameterName) { - Optional optional = this.parameterAcceptors.stream() - .filter(a -> parameterName.equals(a.getParameterName())) - .findFirst(); - return optional.map(ParameterAcceptorModel::getMethodName) - .orElse(null); - } - public ParameterConstraintModel getConstraintModelFor(String parameterName) { Optional optional = this.parameterAcceptors.stream() .filter(a -> parameterName.equals(a.getParameterName())) @@ -237,17 +229,6 @@ private String getShellFromRoute(String route) { return shellOfRoute; } - private boolean matchRouteWithoutShell(String route) { - for (String originalRoute : this.originalRoute) { - String routeWithoutShell = this.getRouteWithoutShell(originalRoute); - String startRouteWithoutShell = this.getRouteWithoutShell(route); - if (routeWithoutShell.equals(startRouteWithoutShell)) { - return true; - } - } - return false; - } - public List getEventHandlers() { return eventHandlers; } diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/ControllerAnnotationScanner.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/ControllerAnnotationScanner.java index 11a96074..aa9b684b 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/ControllerAnnotationScanner.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/ControllerAnnotationScanner.java @@ -18,9 +18,12 @@ import com.github.nalukit.nalu.client.component.AbstractComponentController; import com.github.nalukit.nalu.client.component.AbstractController; +import com.github.nalukit.nalu.client.component.IsAbstractComponent; +import com.github.nalukit.nalu.client.component.IsComponent; import com.github.nalukit.nalu.client.component.IsComponentCreator; import com.github.nalukit.nalu.client.component.annotation.AcceptParameter; import com.github.nalukit.nalu.client.component.annotation.Controller; +import com.github.nalukit.nalu.client.constraint.IsParameterConstraintRule; import com.github.nalukit.nalu.client.constraint.annotation.ParameterConstraint; import com.github.nalukit.nalu.processor.ProcessorException; import com.github.nalukit.nalu.processor.ProcessorUtils; @@ -95,11 +98,11 @@ private ControllerModel handleController() // handle ... TypeElement componentTypeElement = this.getComponentTypeElement(annotation); if (componentTypeElement == null) { - throw new ProcessorException("Nalu-Processor: componentTypeElement is null"); + throw new ProcessorException("Nalu-Processor: component is null"); } TypeElement componentInterfaceTypeElement = this.getComponentInterfaceTypeElement(annotation); if (componentInterfaceTypeElement == null) { - throw new ProcessorException("Nalu-Processor: @Controller - componentInterfaceTypeElement is null"); + throw new ProcessorException("Nalu-Processor: @Controller - componentInterface is null"); } TypeMirror componentTypeTypeMirror = this.getComponentType(controllerElement.asType()); // check and save the component type ... @@ -109,7 +112,8 @@ private ControllerModel handleController() ClassNameModel compareValue = new ClassNameModel(componentTypeTypeMirror.toString()); if (!metaModel.getComponentType() .equals(compareValue)) { - throw new ProcessorException("Nalu-Processor: componentType of >>" + componentTypeElement + + throw new ProcessorException("Nalu-Processor: componentType of >>" + + componentTypeElement + "<< is different (>>" + metaModel.getComponentType() .getClassName() + @@ -189,7 +193,7 @@ private void handleAcceptParameters(RoundEnvironment roundEnvironment, private TypeElement getRuleTypeElement(ParameterConstraint annotation) { try { - annotation.rule(); + Class ignore = annotation.rule(); } catch (MirroredTypeException exception) { return (TypeElement) this.processingEnvironment.getTypeUtils() .asElement(exception.getTypeMirror()); @@ -199,7 +203,7 @@ private TypeElement getRuleTypeElement(ParameterConstraint annotation) { private TypeElement getComponentTypeElement(Controller annotation) { try { - annotation.component(); + Class ignore = annotation.component(); } catch (MirroredTypeException exception) { return (TypeElement) this.processingEnvironment.getTypeUtils() .asElement(exception.getTypeMirror()); @@ -209,7 +213,7 @@ private TypeElement getComponentTypeElement(Controller annotation) { private TypeElement getComponentInterfaceTypeElement(Controller annotation) { try { - annotation.componentInterface(); + Class> ignore = annotation.componentInterface(); } catch (MirroredTypeException exception) { return (TypeElement) this.processingEnvironment.getTypeUtils() .asElement(exception.getTypeMirror()); @@ -337,9 +341,7 @@ public Void visitTypeVariable(TypeVariable typeVariable, // check generic! if (!componentInterfaceTypeElement.toString() .equals(result[0].toString())) { - throw new ProcessorException("Nalu-Processor: controller >>" + - element + - "<< is declared as IsComponentCreator, but the used reference of the component interface does not match with the one inside the controller."); + throw new ProcessorException("Nalu-Processor: controller >>" + element + "<< is declared as IsComponentCreator, but the used reference of the component interface does not match with the one inside the controller."); } return true; } @@ -408,7 +410,7 @@ private List getRoute(String[] routes) { if (tmpRoute.startsWith("/")) { tmpRoute = tmpRoute.substring(1); } - if (tmpRoute.length() == 0) { + if (tmpRoute.isEmpty()) { convertedRoutes.add("/"); } else { StringBuilder sbRoute = new StringBuilder(); diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/ControllerCompositesAnnotationScanner.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/ControllerCompositesAnnotationScanner.java index f161d565..1032731c 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/ControllerCompositesAnnotationScanner.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/ControllerCompositesAnnotationScanner.java @@ -16,6 +16,8 @@ package com.github.nalukit.nalu.processor.scanner; +import com.github.nalukit.nalu.client.component.AbstractCompositeController; +import com.github.nalukit.nalu.client.component.IsLoadCompositeCondition; import com.github.nalukit.nalu.client.component.annotation.Composite; import com.github.nalukit.nalu.client.component.annotation.Composite.Scope; import com.github.nalukit.nalu.client.component.annotation.Composites; @@ -74,7 +76,7 @@ public ControllerModel scan(RoundEnvironment roundEnvironment) { private TypeElement getCompositeTypeElement(Composite annotation) { try { - annotation.compositeController(); + Class> ignore = annotation.compositeController(); } catch (MirroredTypeException exception) { return (TypeElement) this.processingEnvironment.getTypeUtils() .asElement(exception.getTypeMirror()); @@ -84,7 +86,7 @@ private TypeElement getCompositeTypeElement(Composite annotation) { private TypeElement getCompositeConditionElement(Composite annotation) { try { - annotation.condition(); + Class ignore = annotation.condition(); } catch (MirroredTypeException exception) { return (TypeElement) this.processingEnvironment.getTypeUtils() .asElement(exception.getTypeMirror()); diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ConsistenceValidator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ConsistenceValidator.java index edc0a37f..b50723dc 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ConsistenceValidator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ConsistenceValidator.java @@ -80,12 +80,12 @@ private void validateStartRoute() // Does the shell of the start route exist? Optional optionalShell = this.metaModel.getShells() .stream() - .map(m -> m.getName()) + .map(ShellModel::getName) .filter(s -> s.equals(this.metaModel.getShellOfStartRoute())) .findFirst(); - if (!optionalShell.isPresent()) { - if (this.metaModel.getModules() - .size() > 0) { + if (optionalShell.isEmpty()) { + if (!this.metaModel.getModules() + .isEmpty()) { this.processingEnvironment.getMessager() .printMessage(Diagnostic.Kind.NOTE, "Nalu-Processor: The shell of the startRoute >>" + @@ -103,9 +103,9 @@ private void validateStartRoute() .stream() .filter(m -> m.match(this.metaModel.getStartRoute())) .findAny(); - if (!optionalRoute.isPresent()) { - if (this.metaModel.getModules() - .size() > 0) { + if (optionalRoute.isEmpty()) { + if (!this.metaModel.getModules() + .isEmpty()) { this.processingEnvironment.getMessager() .printMessage(Diagnostic.Kind.NOTE, "Nalu-Processor: The route of the startRoute >>" + @@ -131,8 +131,8 @@ private void validateStartRoute() private void validateNoShellsDefined() throws ProcessorException { if (!Objects.isNull(metaModel.getApplication())) { - if (metaModel.getShells() - .size() > 0) { + if (!metaModel.getShells() + .isEmpty()) { return; } throw new ProcessorException("Nalu-Processor: No shells defined! Please define (at least) one shell."); diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ControllerAnnotationValidator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ControllerAnnotationValidator.java index fe6d0ca9..94faafae 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ControllerAnnotationValidator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ControllerAnnotationValidator.java @@ -145,7 +145,7 @@ private void validateRoute(String route) route = route.substring(1); } // initial routes do not need a validation! - if (route.length() == 0) { + if (route.isEmpty()) { return; } String[] splits = route.split("/"); @@ -153,7 +153,7 @@ private void validateRoute(String route) for (String s : splits) { partCounter++; // handle "//" -> not allowed - if (s.length() == 0) { + if (s.isEmpty()) { throw new ProcessorException("Nalu-Processor: controller >>" + this.controllerElement.getEnclosingElement() .toString() + @@ -213,7 +213,7 @@ private void validateParameterNamesAreUnique(String route) .size() > 1) .map(Map.Entry::getKey) .collect(Collectors.toList()); - if (duplicateParameters.size() > 0) { + if (!duplicateParameters.isEmpty()) { StringBuilder sb = new StringBuilder(); sb.append("Nalu-Processor: controller >>") .append(this.controllerElement.getEnclosingElement() @@ -255,7 +255,7 @@ private void validateParameters(String[] routes) for (String parameterFromFirstRoute : parametersOfFirstRoute) { compareParameters.remove(parameterFromFirstRoute); } - if (compareParameters.size() > 0) { + if (!compareParameters.isEmpty()) { StringBuilder sb = new StringBuilder(); sb.append("Nalu-Processor: controller >>") .append(this.controllerElement.getEnclosingElement() @@ -292,7 +292,7 @@ private void searchForDuplicateRoutes(String[] routes) .size() > 1) .map(Map.Entry::getKey) .collect(Collectors.toList()); - if (duplicateRoutes.size() > 0) { + if (!duplicateRoutes.isEmpty()) { StringBuilder sb = new StringBuilder(); sb.append("Nalu-Processor: controller >>") .append(this.controllerElement.getEnclosingElement() diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/LoggerAnnotationValidator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/LoggerAnnotationValidator.java index bb33bfa9..8042e605 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/LoggerAnnotationValidator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/LoggerAnnotationValidator.java @@ -106,7 +106,7 @@ public void validate() private TypeElement getLogger(Logger loggerAnnotation) { try { - loggerAnnotation.logger(); + Class> ignore = loggerAnnotation.logger(); } catch (MirroredTypeException exception) { return (TypeElement) this.processingEnvironment.getTypeUtils() .asElement(exception.getTypeMirror()); diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ShellAnnotationValidator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ShellAnnotationValidator.java index 89a07ed6..dfd58769 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ShellAnnotationValidator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/ShellAnnotationValidator.java @@ -131,9 +131,7 @@ public Void visitDeclared(DeclaredType declaredType, Void v) { List typeArguments = declaredType.getTypeArguments(); if (!typeArguments.isEmpty()) { - if (typeArguments.size() > 0) { - result[0] = typeArguments.get(0); - } + result[0] = typeArguments.get(0); } return null; } diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/TrackerAnnotationValidator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/TrackerAnnotationValidator.java index 96fbdab7..9e591434 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/TrackerAnnotationValidator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/TrackerAnnotationValidator.java @@ -18,6 +18,7 @@ import com.github.nalukit.nalu.client.application.IsApplication; import com.github.nalukit.nalu.client.application.annotation.Application; import com.github.nalukit.nalu.client.tracker.AbstractTracker; +import com.github.nalukit.nalu.client.tracker.IsTracker; import com.github.nalukit.nalu.client.tracker.annotation.Tracker; import com.github.nalukit.nalu.processor.ProcessorException; import com.github.nalukit.nalu.processor.ProcessorUtils; @@ -110,7 +111,7 @@ public void validate() private TypeElement getTracker(Tracker trackerAnnotation) { try { - trackerAnnotation.value(); + Class ignore = trackerAnnotation.value(); } catch (MirroredTypeException exception) { return (TypeElement) this.processingEnvironment.getTypeUtils() .asElement(exception.getTypeMirror()); diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/VersionAnnotationValidator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/VersionAnnotationValidator.java index 61ddd1a3..746c90cd 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/VersionAnnotationValidator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/scanner/validation/VersionAnnotationValidator.java @@ -25,7 +25,6 @@ import javax.annotation.processing.RoundEnvironment; import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; -import javax.lang.model.type.MirroredTypeException; import java.util.Set; public class VersionAnnotationValidator { @@ -69,7 +68,6 @@ public void validate() } for (Element element : elementsWithVersionAnnotation) { if (element instanceof TypeElement) { - TypeElement typeElement = (TypeElement) element; // @Version can only be used on a interface if (!versionElement.getKind() .isInterface()) { @@ -93,16 +91,6 @@ public void validate() } } - private TypeElement getVersion(Version versionAnnotation) { - try { - versionAnnotation.value(); - } catch (MirroredTypeException exception) { - return (TypeElement) this.processingEnvironment.getTypeUtils() - .asElement(exception.getTypeMirror()); - } - return null; - } - public static final class Builder { ProcessingEnvironment processingEnvironment; diff --git a/nalu-processor/src/test/java/com/github/nalukit/nalu/processor/AllTests.java b/nalu-processor/src/test/java/com/github/nalukit/nalu/processor/Tests.java similarity index 63% rename from nalu-processor/src/test/java/com/github/nalukit/nalu/processor/AllTests.java rename to nalu-processor/src/test/java/com/github/nalukit/nalu/processor/Tests.java index 54ae0be6..e3f37cc8 100644 --- a/nalu-processor/src/test/java/com/github/nalukit/nalu/processor/AllTests.java +++ b/nalu-processor/src/test/java/com/github/nalukit/nalu/processor/Tests.java @@ -49,44 +49,42 @@ import com.github.nalukit.nalu.processor.test.VersionTest; import com.github.nalukit.nalu.processor.test.model.intern.ClassNameModelTest; import com.github.nalukit.nalu.processor.test.model.property.PropertiesTest; -import org.junit.platform.runner.JUnitPlatform; import org.junit.platform.suite.api.SelectClasses; import org.junit.platform.suite.api.Suite; -import org.junit.runner.RunWith; @Suite() @SelectClasses({ ApplicationTest.class, - BlockControllerTest.class, - ClassNameModelTest.class, - CompositeCreatorTest.class, - CompositeTest.class, - CompositesTest.class, - ConsistenceTest.class, - ControllerCreatorTest.class, - ControllerModelTest.class, - ControllerTest.class, - ErrorPopUpControllerTest.class, - EventHandlerTest.class, - EventHandlerBlockControllerTest.class, - EventHandlerCompositeTest.class, - EventHandlerControllerTest.class, - EventHandlerErrorPopUpControllerTest.class, - EventHandlerHandlerTest.class, - EventHandlerPopUpControllerTest.class, - EventHandlerShellTest.class, - FiltersTest.class, - HandlerTest.class, - LoggerTest.class, - MetaModelTest.class, - ModuleTest.class, - ParameterConstraintRuleTest.class, - ParameterConstraintTest.class, - PopUpControllerCreatorTest.class, - PopUpFiltersTest.class, - PropertiesTest.class, - ShellCreatorTest.class, - ShellTest.class, - TrackerTest.class, - VersionTest.class }) -public class AllTests { + BlockControllerTest.class, + ClassNameModelTest.class, + CompositeCreatorTest.class, + CompositeTest.class, + CompositesTest.class, + ConsistenceTest.class, + ControllerCreatorTest.class, + ControllerModelTest.class, + ControllerTest.class, + ErrorPopUpControllerTest.class, + EventHandlerTest.class, + EventHandlerBlockControllerTest.class, + EventHandlerCompositeTest.class, + EventHandlerControllerTest.class, + EventHandlerErrorPopUpControllerTest.class, + EventHandlerHandlerTest.class, + EventHandlerPopUpControllerTest.class, + EventHandlerShellTest.class, + FiltersTest.class, + HandlerTest.class, + LoggerTest.class, + MetaModelTest.class, + ModuleTest.class, + ParameterConstraintRuleTest.class, + ParameterConstraintTest.class, + PopUpControllerCreatorTest.class, + PopUpFiltersTest.class, + PropertiesTest.class, + ShellCreatorTest.class, + ShellTest.class, + TrackerTest.class, + VersionTest.class }) +public class Tests { } diff --git a/nalu-processor/src/test/java/com/github/nalukit/nalu/processor/test/VersionTest.java b/nalu-processor/src/test/java/com/github/nalukit/nalu/processor/test/VersionTest.java index cd34d0b8..536bc761 100644 --- a/nalu-processor/src/test/java/com/github/nalukit/nalu/processor/test/VersionTest.java +++ b/nalu-processor/src/test/java/com/github/nalukit/nalu/processor/test/VersionTest.java @@ -21,13 +21,13 @@ import com.google.testing.compile.CompilationSubject; import com.google.testing.compile.JavaFileObjects; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; import java.util.Arrays; import java.util.Collections; import static com.google.testing.compile.Compiler.javac; -@SuppressWarnings("serial") public class VersionTest { @Test diff --git a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/common/application/applicationWithComposite06/ApplicationWithComposite06Impl.java b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/common/application/applicationWithComposite06/ApplicationWithComposite06Impl.java index 247db20a..ff444bcd 100644 --- a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/common/application/applicationWithComposite06/ApplicationWithComposite06Impl.java +++ b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/common/application/applicationWithComposite06/ApplicationWithComposite06Impl.java @@ -19,18 +19,18 @@ import java.util.Arrays; /** - * Build with Nalu version >>%VERSION_TAG%<< at >>2020.11.18-06:57:33<< + * Build with Nalu version >>%VERSION_TAG%<< at 2024.07.22-13:53:19 */ public final class ApplicationWithComposite06Impl extends AbstractApplication implements ApplicationWithComposite06 { public ApplicationWithComposite06Impl() { super(); super.context = new com.github.nalukit.nalu.processor.common.MockContext(); } - + @Override public void loadLoggerConfiguration() { } - + @Override public void logProcessorVersion() { this.eventBus.fireEvent(LogEvent.create().sdmOnly(true).addMessage("=================================================================================").addMessage("Nalu processor version >>%VERSION_TAG%<< used to generate this source").addMessage("=================================================================================").addMessage("")); @@ -48,50 +48,25 @@ public void loadShells() { @Override public void loadShellFactory() { - ShellFactory.INSTANCE.registerShell("com.github.nalukit.nalu.processor.common.ui.MockShell", - new com.github.nalukit.nalu.processor.common.ui.MockShellCreatorImpl(router, - context, - eventBus)); + ShellFactory.INSTANCE.registerShell("com.github.nalukit.nalu.processor.common.ui.MockShell", new com.github.nalukit.nalu.processor.common.ui.MockShellCreatorImpl(router, context, eventBus)); } @Override public void loadCompositeController() { - CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController03", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController03CreatorImpl(router, - context, - eventBus)); - CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController04", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController04CreatorImpl(router, - context, - eventBus)); + CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController03", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController03CreatorImpl(router, context, eventBus)); + CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController04", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController04CreatorImpl(router, context, eventBus)); } @Override public void loadComponents() { - ControllerFactory.INSTANCE.registerController("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite05", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite05CreatorImpl(router, - context, - eventBus)); + ControllerFactory.INSTANCE.registerController("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite05", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite05CreatorImpl(router, context, eventBus)); CompositeCondition01 compositeCondition01_1 = new CompositeCondition01(); compositeCondition01_1.setContext(super.context); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite05", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController03", - compositeCondition01_1); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite05", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController04", - compositeCondition01_1); - ControllerFactory.INSTANCE.registerController("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite06", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite06CreatorImpl(router, - context, - eventBus)); - CompositeCondition01 compositeCondition01_2 = new CompositeCondition01(); - compositeCondition01_2.setContext(super.context); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite06", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController03", - compositeCondition01_2); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite06", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController04", - compositeCondition01_2); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite05", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController03", compositeCondition01_1); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite05", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController04", compositeCondition01_1); + ControllerFactory.INSTANCE.registerController("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite06", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite06CreatorImpl(router, context, eventBus)); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite06", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController03", compositeCondition01_1); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.ControllerWithComposite06", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite06.composite.CompositeController04", compositeCondition01_1); } @Override diff --git a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/common/application/applicationWithComposite07/ApplicationWithComposite07Impl.java b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/common/application/applicationWithComposite07/ApplicationWithComposite07Impl.java index 30659d77..6a69df59 100644 --- a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/common/application/applicationWithComposite07/ApplicationWithComposite07Impl.java +++ b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/common/application/applicationWithComposite07/ApplicationWithComposite07Impl.java @@ -20,7 +20,7 @@ import java.util.Arrays; /** - * Build with Nalu version >>%VERSION_TAG%<< at >>2021.07.28-16:59:17<< + * Build with Nalu version >>%VERSION_TAG%<< at 2024.07.22-13:53:19 */ public final class ApplicationWithComposite07Impl extends AbstractApplication implements ApplicationWithComposite07 { public ApplicationWithComposite07Impl() { @@ -49,62 +49,30 @@ public void loadShells() { @Override public void loadShellFactory() { - ShellFactory.INSTANCE.registerShell("com.github.nalukit.nalu.processor.common.ui.MockShell", - new com.github.nalukit.nalu.processor.common.ui.MockShellCreatorImpl(router, - context, - eventBus)); + ShellFactory.INSTANCE.registerShell("com.github.nalukit.nalu.processor.common.ui.MockShell", new com.github.nalukit.nalu.processor.common.ui.MockShellCreatorImpl(router, context, eventBus)); } @Override public void loadCompositeController() { - CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03CreatorImpl(router, - context, - eventBus)); - CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController04", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController04CreatorImpl(router, - context, - eventBus)); - CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController05", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController05CreatorImpl(router, - context, - eventBus)); + CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03CreatorImpl(router, context, eventBus)); + CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController04", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController04CreatorImpl(router, context, eventBus)); + CompositeFactory.INSTANCE.registerComposite("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController05", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController05CreatorImpl(router, context, eventBus)); } @Override public void loadComponents() { - ControllerFactory.INSTANCE.registerController("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05CreatorImpl(router, - context, - eventBus)); + ControllerFactory.INSTANCE.registerController("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05CreatorImpl(router, context, eventBus)); CompositeCondition01 compositeCondition01_1 = new CompositeCondition01(); compositeCondition01_1.setContext(super.context); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03", - compositeCondition01_1); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController04", - compositeCondition01_1); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03", compositeCondition01_1); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController04", compositeCondition01_1); CompositeCondition02 compositeCondition02_1 = new CompositeCondition02(); compositeCondition02_1.setContext(super.context); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController05", - compositeCondition02_1); - ControllerFactory.INSTANCE.registerController("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06", - new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06CreatorImpl(router, - context, - eventBus)); - CompositeCondition01 compositeCondition01_2 = new CompositeCondition01(); - compositeCondition01_2.setContext(super.context); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03", - compositeCondition01_2); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController04", - compositeCondition01_2); - CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06", - "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03", - super.alwaysLoadComposite); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite05", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController05", compositeCondition02_1); + ControllerFactory.INSTANCE.registerController("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06", new com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06CreatorImpl(router, context, eventBus)); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03", compositeCondition01_1); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController04", compositeCondition01_1); + CompositeConditionFactory.INSTANCE.registerCondition("com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.ControllerWithComposite06", "com.github.nalukit.nalu.processor.common.ui.controllerWithComposite07.composite.CompositeController03", super.alwaysLoadComposite); } @Override diff --git a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java index 02ff5801..f1b591d5 100644 --- a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java +++ b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java @@ -34,7 +34,7 @@ public void logProcessorVersion() { this.eventBus.fireEvent(LogEvent.create() .sdmOnly(true) .addMessage("=================================================================================") - .addMessage("Nalu processor version >>2.20.0<< used to generate this source") + .addMessage("Nalu processor version >>2.20.1<< used to generate this source") .addMessage("=================================================================================") .addMessage("")); } diff --git a/nalu/pom.xml b/nalu/pom.xml index aeec886b..7d0b8c8f 100644 --- a/nalu/pom.xml +++ b/nalu/pom.xml @@ -86,45 +86,26 @@ ${gwt-regexp.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - + + org.junit.jupiter - junit-jupiter-params + junit-jupiter-engine ${junit-jupiter.version} test - + org.junit.platform - junit-platform-runner + junit-platform-suite-api ${junit-jupiter-platform.version} test - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - - org.hamcrest - hamcrest-core - - - - + org.hamcrest + hamcrest-all + ${hamcrest.version} + diff --git a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java index cb77b74a..36b2c936 100644 --- a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java +++ b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java @@ -23,7 +23,7 @@ public class Nalu { public static String getVersion() { // TODO Change this for other versions - return "2.20.0"; + return "2.20.1"; } public static boolean hasHistory() { diff --git a/nalu/src/test/java/com/github/nalukit/nalu/AllTests.java b/nalu/src/test/java/com/github/nalukit/nalu/AllTests.java index 2762023c..ddfbde4c 100644 --- a/nalu/src/test/java/com/github/nalukit/nalu/AllTests.java +++ b/nalu/src/test/java/com/github/nalukit/nalu/AllTests.java @@ -27,10 +27,8 @@ import com.github.nalukit.nalu.client.internal.route.RouterHashImplTest; import com.github.nalukit.nalu.client.internal.validation.RouteValidationTest; import com.github.nalukit.nalu.client.util.NaluUtilsTest; -import org.junit.platform.runner.JUnitPlatform; import org.junit.platform.suite.api.SelectClasses; import org.junit.platform.suite.api.Suite; -import org.junit.runner.RunWith; @Suite() @SelectClasses({ NaluTest.class, diff --git a/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java b/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java index 8028a062..098a191a 100644 --- a/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java +++ b/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java @@ -14,7 +14,7 @@ public class NaluTest { void getVersion() throws IOException { // TODO Change this if you want to test against another version - Assertions.assertEquals("2.20.0", + Assertions.assertEquals("2.20.1", Nalu.getVersion()); } diff --git a/owasp/owasp-suppressions.xml b/owasp/owasp-suppressions.xml index 18ce0062..19bf41d1 100644 --- a/owasp/owasp-suppressions.xml +++ b/owasp/owasp-suppressions.xml @@ -106,7 +106,7 @@ ^pkg:maven/com\.ibm\.icu/icu4j@.*$ CVE-2018-18928 - + CVE-2023-36478 CVE-2023-44487 - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-plus@.*$ - CVE-2022-2048 - CVE-2023-44487 - CVE-2023-36478 - - - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-server@.*$ - CVE-2022-2047 - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2023-36479 - CVE-2023-44487 - CVE-2023-36478 - CVE-2023-40167 - CVE-2023-41900 - - - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-util@.*$ - CVE-2022-2048 - CVE-2023-44487 - CVE-2023-36478 - - - + + ^pkg:maven/org\.eclipse\.jetty/jetty\-plus@.*$ + CVE-2022-2048 + CVE-2023-44487 + CVE-2023-36478 + + + + + ^pkg:maven/org\.eclipse\.jetty/jetty\-server@.*$ + CVE-2022-2047 + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2023-36479 + CVE-2023-44487 + CVE-2023-36478 + CVE-2023-40167 + CVE-2023-41900 + + + + + ^pkg:maven/org\.eclipse\.jetty/jetty\-util@.*$ + CVE-2022-2048 + CVE-2023-44487 + CVE-2023-36478 + + + - ^pkg:maven/org\.eclipse\.jetty/jetty\-continuation@.*$ - CVE-2022-2048 - CVE-2023-36478 - CVE-2023-44487 - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-continuation@.*$ + CVE-2022-2048 + CVE-2023-36478 + CVE-2023-44487 + + + - ^pkg:maven/org\.eclipse\.jetty/jetty\-annotations@.*$ - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2023-36478 - CVE-2023-40167 - CVE-2023-44487 - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-annotations@.*$ + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2023-36478 + CVE-2023-40167 + CVE-2023-44487 + + + - ^pkg:maven/org\.eclipse\.jetty/jetty\-util\-ajax@.*$ - CVE-2022-2047 - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2023-36478 - CVE-2023-36479 - CVE-2023-40167 - CVE-2023-41900 - CVE-2023-44487 - - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-xml@.*$ - CVE-2022-2047 - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2023-36478 - CVE-2023-36479 - CVE-2023-40167 - CVE-2023-41900 - CVE-2023-44487 - - - - - ^pkg:maven/net\.sourceforge\.htmlunit/neko\-htmlunit@.*$ - CVE-2023-2048 - CVE-2023-2798 - CVE-2022-28366 - CVE-2022-29546 - CVE-2023-26119 - CVE-2023-49093 - - - - - ^pkg:maven/xalan/serializer@.*$ - CVE-2022-34169 - - - - - ^pkg:maven/tapestry/tapestry@.*$ - CVE-2014-1972 - CVE-2020-17531 - CVE-2022-31781 - - - - - ^pkg:maven/org\.eclipse\.jetty\.websocket/websocket\-client@.*$ - CVE-2022-2047 - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2023-36478 - CVE-2023-36479 - CVE-2023-40167 - CVE-2023-41900 - CVE-2023-44487 - - - - - ^pkg:maven/org\.eclipse\.jetty\.websocket/websocket\-common@.*$ - CVE-2022-2047 - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2023-36478 - CVE-2023-36479 - CVE-2023-40167 - CVE-2023-41900 - CVE-2023-44487 - - - - - ^pkg:maven/xalan/xalan@.*$ - CVE-2022-34169 - - - - - ^pkg:maven/xerces/xercesImpl@.*$ - CVE-2017-10355 - CVE-2022-23437 - - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-client@.*$ - CVE-2022-2047 - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2023-36479 - CVE-2023-40167 - CVE-2023-40167 - CVE-2023-41900 - CVE-2023-44487 - CVE-2023-36478 - - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-webapp@.*$ - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2022-2047 - CVE-2023-44487 - CVE-2023-36478 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-util\-ajax@.*$ + CVE-2022-2047 + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2023-36478 + CVE-2023-36479 + CVE-2023-40167 + CVE-2023-41900 + CVE-2023-44487 + + + + ^pkg:maven/org\.eclipse\.jetty/jetty\-xml@.*$ + CVE-2022-2047 + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2023-36478 + CVE-2023-36479 + CVE-2023-40167 + CVE-2023-41900 + CVE-2023-44487 + + + + + ^pkg:maven/net\.sourceforge\.htmlunit/neko\-htmlunit@.*$ + CVE-2023-2048 + CVE-2023-2798 + CVE-2022-28366 + CVE-2022-29546 + CVE-2023-26119 + CVE-2023-49093 + + + + + ^pkg:maven/xalan/serializer@.*$ + CVE-2022-34169 + + + + + ^pkg:maven/tapestry/tapestry@.*$ + CVE-2014-1972 + CVE-2020-17531 + CVE-2022-31781 + + + + + ^pkg:maven/org\.eclipse\.jetty\.websocket/websocket\-client@.*$ + CVE-2022-2047 + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2023-36478 + CVE-2023-36479 + CVE-2023-40167 + CVE-2023-41900 + CVE-2023-44487 + + + + + ^pkg:maven/commons-io/commons-io@.*$ + CVE-2024-47554 + + + + + ^pkg:maven/org\.eclipse\.jetty\.websocket/websocket\-common@.*$ + CVE-2022-2047 + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2023-36478 + CVE-2023-36479 + CVE-2023-40167 + CVE-2023-41900 + CVE-2023-44487 + + + + + ^pkg:maven/xalan/xalan@.*$ + CVE-2022-34169 + + + + + ^pkg:maven/xerces/xercesImpl@.*$ + CVE-2017-10355 + CVE-2022-23437 + + + + ^pkg:maven/org\.eclipse\.jetty/jetty\-client@.*$ + CVE-2022-2047 + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2023-36479 + CVE-2023-40167 + CVE-2023-40167 + CVE-2023-41900 + CVE-2023-44487 + CVE-2023-36478 + + + + ^pkg:maven/org\.eclipse\.jetty/jetty\-webapp@.*$ + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2022-2047 + CVE-2023-44487 + CVE-2023-36478 + CVE-2023-44467 CVE-2023-44487 - - + - ^pkg:maven/org\.eclipse\.jetty/jetty\-servlet@.*$ - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2022-2047 - CVE-2023-44487 - CVE-2023-36478 - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-servlet@.*$ + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2022-2047 + CVE-2023-44487 + CVE-2023-36478 + + + - ^pkg:maven/org\.eclipse\.jetty/jetty\-servlets@.*$ - CVE-2022-2047 - CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 - CVE-2023-36478 - CVE-2023-36479 - CVE-2023-40167 - CVE-2023-41900 - CVE-2023-44487 - - - - ^pkg:maven/org\.eclipse\.jetty/jetty\-servlets@.*$ + CVE-2022-2047 + CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 + CVE-2023-36478 + CVE-2023-36479 + CVE-2023-40167 + CVE-2023-41900 + CVE-2023-44487 + + + + - ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit\-core\-js@.*$ - CVE-2023-2798 - CVE-2023-36478 - CVE-2023-36478 - CVE-2023-44487 - - - ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit\-core\-js@.*$ + CVE-2023-2798 + CVE-2023-36478 + CVE-2023-36478 + CVE-2023-44487 + + + - ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit@.*$ - CVE-2023-2798 - - - ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit@.*$ + CVE-2023-2798 + + + - ^pkg:maven/com\.google\.guava/guava@.*$ - cpe:/a:google:guava - CVE-2020-8908 - CVE-2023-2976 - + ^pkg:maven/com\.google\.guava/guava@.*$ + cpe:/a:google:guava + CVE-2020-8908 + CVE-2023-2976 + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d5104a37..9ca28e40 100644 --- a/pom.xml +++ b/pom.xml @@ -87,25 +87,24 @@ - 2.20.0 - - github + 2.20.1 1.2.2 1.1.1 0.21.0 2.10.1 1.2.1 - 33.0.0-jre + 33.2.1-jre 1.0.0-RC1 1.0.0-RC1 2.11.0 + 1.3 2.2 ${java.home}/bin/javadoc 1.13.0 - 5.10.1 - 1.10.1 - 1.1.3 + 5.10.3 + 1.10.3 + 1.4.2 11 11 diff --git a/etc/wiki/01.-Motivation-&-Concepts.md b/wiki/01.-Motivation-&-Concepts.md similarity index 100% rename from etc/wiki/01.-Motivation-&-Concepts.md rename to wiki/01.-Motivation-&-Concepts.md diff --git a/etc/wiki/02.-Integration.md b/wiki/02.-Integration.md similarity index 100% rename from etc/wiki/02.-Integration.md rename to wiki/02.-Integration.md diff --git a/etc/wiki/03.-Getting-Started.md b/wiki/03.-Getting-Started.md similarity index 79% rename from etc/wiki/03.-Getting-Started.md rename to wiki/03.-Getting-Started.md index 756d3908..e5a6d649 100644 --- a/etc/wiki/03.-Getting-Started.md +++ b/wiki/03.-Getting-Started.md @@ -20,6 +20,16 @@ Depending on the widget lib you are using inside your project, you need to add o ``` +* in case working with Elemento use: +```XML + +``` + +* in case working with Domino-UI (Version 2) use: +```XML + +``` + Last but not least, we need to set up the entry point of our application: ```XML @@ -46,7 +56,7 @@ public class Application } } ``` -When using this code, you will recognize that `MyApplication` and `MyApplicationImpl` is marked as error, case the classes do not exist. This is correct. We will discuss the `MyApplication`-class next and the `MyApplicationImpl`-class will be created, once you build your project. +When using this code, you will recognize that `MyApplication` and `MyApplicationImpl` is marked as error, because the classes do not exist. This is correct. We will discuss the `MyApplication`-class next and the `MyApplicationImpl`-class will be created, once you build your project. #### Note There is a pitfall: the `run`-method requires a Nalu plugin. diff --git a/etc/wiki/04.-Nalu-Processor-Plugin.md b/wiki/04.-Nalu-Processor-Plugin.md similarity index 72% rename from etc/wiki/04.-Nalu-Processor-Plugin.md rename to wiki/04.-Nalu-Processor-Plugin.md index d9173cb0..a953e164 100644 --- a/etc/wiki/04.-Nalu-Processor-Plugin.md +++ b/wiki/04.-Nalu-Processor-Plugin.md @@ -79,9 +79,44 @@ The methods of the `ÌsPlugin`-interface are: Currently, there are two existing plugins: -* an Elemental2 plugin for widgets sets based on `HTMLElement` +* a Domino-UI (Version 2) Plugin for widget sets based on `org.dominokit.domino.ui.IsElement` +* an Elemental2 plugin for widget sets based on `HTMLElement` +* an Elemento plugin for widget sets based on `HTMLElement` or `IsElement` * a GWT plugin for widget sets based on GWT `Widget` +## Domino-UI (Version 2) based Widget Sets +In case your widget set is based on Domino-UI (Version 2), you should use, the `nalu-plugin-domino-v2`. + +### Configure the Application +To use the plugin, you have to add the following lines to your pom: +```XML + + com.github.nalukit + nalu-plugin-domino-v2 + LATEST + +``` + +### Using the plugin +To tell Nalu, that the application is using the Domino-UI-V2 plugin, you have to create the plugin and use the instance as a parameter of the run method: + +```Java + +public class Application + implements EntryPoint { + + public void onModuleLoad() { + // Create the application. + // The ApplicationImpl-class will be generated by the framework. + MyApplication application = new MyApplicationImpl(); + // start the application by calling the run()-method. + application.run(new NaluPluginDominoV2()); + } +} +``` + +To define a node of the DOM as an extension point where children can be added, just set an id using the `id`-attribute. The selector attribute inside the `@Controller`-annotation will be used to look for a node inside the DOM with the selector value as id. Once the node is found, all children of the node will be removed and the new child added. + ## Elemental2 based Widget Sets In case your widget set is based on Elemental2, you have to use, the `nalu-plugin-elemental2`. @@ -115,6 +150,39 @@ public class Application To define a node of the DOM as an extension point where children can be added, just set an id using the `id`-attribute. The selector attribute inside the `@Controller`-annotation will be used to look for a node inside the DOM with the selector value as id. Once the node is found, all children of the node will be removed and the new child added. +## Elemento based Widget Sets +In case your widget set is based on Elemento, you have to use, the `nalu-plugin-elemento`. + +### Configure the Application +To use the plugin, you have to add the following lines to your pom: +```XML + + com.github.nalukit + nalu-plugin-elemento + LATEST + +``` + +### Using the plugin +To tell Nalu, that the application is using the Elemento plugin, you have to create the plugin and use the instance as a parameter of the run method: + +```Java + +public class Application + implements EntryPoint { + + public void onModuleLoad() { + // Create the application. + // The ApplicationImpl-class will be generated by the framework. + MyApplication application = new MyApplicationImpl(); + // start the application by calling the run()-method. + application.run(new NaluPluginElemento()); + } +} +``` + +To define a node of the DOM as an extension point where children can be added, just set an id using the `id`-attribute. The selector attribute inside the `@Controller`-annotation will be used to look for a node inside the DOM with the selector value as id. Once the node is found, all children of the node will be removed and the new child added. + ## GWT based Widget Sets In case your widget set is based on the GWT `Widget`-class, you have to use, the `nalu-plugin-gwt`. diff --git a/etc/wiki/05.-Routes.md b/wiki/05.-Routes.md similarity index 100% rename from etc/wiki/05.-Routes.md rename to wiki/05.-Routes.md diff --git a/etc/wiki/06.-Application.md b/wiki/06.-Application.md similarity index 100% rename from etc/wiki/06.-Application.md rename to wiki/06.-Application.md diff --git a/etc/wiki/07.-Application-Loader.md b/wiki/07.-Application-Loader.md similarity index 100% rename from etc/wiki/07.-Application-Loader.md rename to wiki/07.-Application-Loader.md diff --git a/etc/wiki/08.-Eventbus.md b/wiki/08.-Eventbus.md similarity index 100% rename from etc/wiki/08.-Eventbus.md rename to wiki/08.-Eventbus.md diff --git a/etc/wiki/09.-Shell.md b/wiki/09.-Shell.md similarity index 100% rename from etc/wiki/09.-Shell.md rename to wiki/09.-Shell.md diff --git a/etc/wiki/10.-Context.md b/wiki/10.-Context.md similarity index 100% rename from etc/wiki/10.-Context.md rename to wiki/10.-Context.md diff --git a/etc/wiki/11.-Router.md b/wiki/11.-Router.md similarity index 100% rename from etc/wiki/11.-Router.md rename to wiki/11.-Router.md diff --git a/etc/wiki/12.-Error-Handling.md b/wiki/12.-Error-Handling.md similarity index 100% rename from etc/wiki/12.-Error-Handling.md rename to wiki/12.-Error-Handling.md diff --git a/etc/wiki/13.-Handler.md b/wiki/13.-Handler.md similarity index 100% rename from etc/wiki/13.-Handler.md rename to wiki/13.-Handler.md diff --git a/etc/wiki/14.-Controllers-&-Composites.md b/wiki/14.-Controllers-&-Composites.md similarity index 100% rename from etc/wiki/14.-Controllers-&-Composites.md rename to wiki/14.-Controllers-&-Composites.md diff --git a/etc/wiki/15.-Multi-Module-Support.md b/wiki/15.-Multi-Module-Support.md similarity index 100% rename from etc/wiki/15.-Multi-Module-Support.md rename to wiki/15.-Multi-Module-Support.md diff --git a/etc/wiki/16.-Tracking.md b/wiki/16.-Tracking.md similarity index 100% rename from etc/wiki/16.-Tracking.md rename to wiki/16.-Tracking.md diff --git a/etc/wiki/17.-SEO.md b/wiki/17.-SEO.md similarity index 100% rename from etc/wiki/17.-SEO.md rename to wiki/17.-SEO.md diff --git a/etc/wiki/18.-Best-Practice.md b/wiki/18.-Best-Practice.md similarity index 100% rename from etc/wiki/18.-Best-Practice.md rename to wiki/18.-Best-Practice.md diff --git a/etc/wiki/19.-Trouble-Shooting.md b/wiki/19.-Trouble-Shooting.md similarity index 100% rename from etc/wiki/19.-Trouble-Shooting.md rename to wiki/19.-Trouble-Shooting.md diff --git a/etc/wiki/20.-Migration-v1.x----v2.x.md b/wiki/20.-Migration-v1.x----v2.x.md similarity index 100% rename from etc/wiki/20.-Migration-v1.x----v2.x.md rename to wiki/20.-Migration-v1.x----v2.x.md diff --git a/etc/wiki/Home.md b/wiki/Home.md similarity index 100% rename from etc/wiki/Home.md rename to wiki/Home.md diff --git a/etc/wiki/v1-01.-Motivation-and-Basic-concepts.md b/wiki/v1-01.-Motivation-and-Basic-concepts.md similarity index 100% rename from etc/wiki/v1-01.-Motivation-and-Basic-concepts.md rename to wiki/v1-01.-Motivation-and-Basic-concepts.md diff --git a/etc/wiki/v1-02.-Components.md b/wiki/v1-02.-Components.md similarity index 100% rename from etc/wiki/v1-02.-Components.md rename to wiki/v1-02.-Components.md diff --git a/etc/wiki/v1-03.-Integration.md b/wiki/v1-03.-Integration.md similarity index 100% rename from etc/wiki/v1-03.-Integration.md rename to wiki/v1-03.-Integration.md diff --git a/etc/wiki/v1-04.-Application.md b/wiki/v1-04.-Application.md similarity index 100% rename from etc/wiki/v1-04.-Application.md rename to wiki/v1-04.-Application.md diff --git a/etc/wiki/v1-05.-Application-Loader.md b/wiki/v1-05.-Application-Loader.md similarity index 100% rename from etc/wiki/v1-05.-Application-Loader.md rename to wiki/v1-05.-Application-Loader.md diff --git a/etc/wiki/v1-06.-Application-Context.md b/wiki/v1-06.-Application-Context.md similarity index 100% rename from etc/wiki/v1-06.-Application-Context.md rename to wiki/v1-06.-Application-Context.md diff --git a/etc/wiki/v1-07.-Shell.md b/wiki/v1-07.-Shell.md similarity index 100% rename from etc/wiki/v1-07.-Shell.md rename to wiki/v1-07.-Shell.md diff --git a/etc/wiki/v1-08.-Router.md b/wiki/v1-08.-Router.md similarity index 100% rename from etc/wiki/v1-08.-Router.md rename to wiki/v1-08.-Router.md diff --git a/etc/wiki/v1-09.-Controller-&-Component.md b/wiki/v1-09.-Controller-&-Component.md similarity index 100% rename from etc/wiki/v1-09.-Controller-&-Component.md rename to wiki/v1-09.-Controller-&-Component.md diff --git a/etc/wiki/v1-10.-Handler.md b/wiki/v1-10.-Handler.md similarity index 100% rename from etc/wiki/v1-10.-Handler.md rename to wiki/v1-10.-Handler.md diff --git a/etc/wiki/v1-11.-Plugins.md b/wiki/v1-11.-Plugins.md similarity index 100% rename from etc/wiki/v1-11.-Plugins.md rename to wiki/v1-11.-Plugins.md diff --git a/etc/wiki/v1-12.-Tracking.md b/wiki/v1-12.-Tracking.md similarity index 100% rename from etc/wiki/v1-12.-Tracking.md rename to wiki/v1-12.-Tracking.md diff --git a/etc/wiki/v1-13.-Nalu-Processor-Plugins.md b/wiki/v1-13.-Nalu-Processor-Plugins.md similarity index 100% rename from etc/wiki/v1-13.-Nalu-Processor-Plugins.md rename to wiki/v1-13.-Nalu-Processor-Plugins.md diff --git a/etc/wiki/v1-14.-Touble-Shooting.md b/wiki/v1-14.-Touble-Shooting.md similarity index 100% rename from etc/wiki/v1-14.-Touble-Shooting.md rename to wiki/v1-14.-Touble-Shooting.md