Merge pull request #431 from NaluKit/430-use-underscore-instead-of-colon-to-mark-variables

#430 done

Author: FrankHossfeld

nalu-processor/src/main/java/io/github/nalukit/nalu/processor/generator/ApplicationGenerator.java

@@ -288,7 +288,7 @@ public void generate(MetaModel metaModel)
                              metaModel);
     generateIsUsingHashMethod(typeSpec,
                               metaModel);
-    generateIsUsingColonForParametersInUrl(typeSpec,
+    generateIsUsingUnderscoreForParametersInUrl(typeSpec,
                                            metaModel);
     generateIsStayOnSide(typeSpec,
                          metaModel);
@@ -369,14 +369,14 @@ private void generateIsUsingHashMethod(TypeSpec.Builder typeSpec,
                                  .build());
   }
 
-  private void generateIsUsingColonForParametersInUrl(TypeSpec.Builder typeSpec,
+  private void generateIsUsingUnderscoreForParametersInUrl(TypeSpec.Builder typeSpec,
                                                       MetaModel metaModel) {
-    typeSpec.addMethod(MethodSpec.methodBuilder("isUsingColonForParametersInUrl")
+    typeSpec.addMethod(MethodSpec.methodBuilder("isUsingUnderscoreForParametersInUrl")
                                  .addAnnotation(Override.class)
                                  .addModifiers(Modifier.PUBLIC)
                                  .returns(boolean.class)
                                  .addStatement("return $L",
-                                               metaModel.isUsingColonForParametersInUrl() ?
+                                               metaModel.isUsingUnderscoreForParametersInUrl() ?
                                                "true" :
                                                "false")
                                  .build());

nalu-processor/src/main/java/io/github/nalukit/nalu/processor/model/MetaModel.java

@@ -45,7 +45,7 @@ public class MetaModel {
   private       ClassNameModel                     customConfirmPresenter;
   private final List<ClassNameModel>               modules;
   private       boolean                            usingHash;
-  private       boolean                            usingColonForParametersInUrl;
+  private       boolean                            usingUnderscoreForParametersInUrl;
   private       boolean                            stayOnSide;
   private       boolean                            usingTrailingSlash;
   /* this model represents the plugin interface */
@@ -235,12 +235,12 @@ public void setUsingHash(boolean usingHash) {
     this.usingHash = usingHash;
   }
 
-  public boolean isUsingColonForParametersInUrl() {
-    return usingColonForParametersInUrl;
+  public boolean isUsingUnderscoreForParametersInUrl() {
+    return usingUnderscoreForParametersInUrl;
   }
 
-  public void setUsingColonForParametersInUrl(boolean usingColonForParametersInUrl) {
-    this.usingColonForParametersInUrl = usingColonForParametersInUrl;
+  public void setUsingUnderscoreForParametersInUrl(boolean usingUnderscoreForParametersInUrl) {
+    this.usingUnderscoreForParametersInUrl = usingUnderscoreForParametersInUrl;
   }
 
   public boolean isStayOnSide() {

nalu-processor/src/main/java/io/github/nalukit/nalu/processor/scanner/ApplicationAnnotationScanner.java

@@ -82,7 +82,7 @@ public void scan()
       metaModel.setBaseHref(applicationAnnotation.usingBaseHref());
       metaModel.setUsingHash(applicationAnnotation.usingHash());
       metaModel.setUsingTrailingSlash(applicationAnnotation.usingTrailingSlash());
-      metaModel.setUsingColonForParametersInUrl(applicationAnnotation.usingColonForParametersInUrl());
+      metaModel.setUsingUnderscoreForParametersInUrl(applicationAnnotation.usingUnderscoreForParametersInUrl());
       metaModel.setStayOnSide(applicationAnnotation.stayOnSite());
       metaModel.setUsingHistory(applicationAnnotation.isUsingHistory());
       metaModel.setCustomAlertPresenter(new ClassNameModel(isNull(customAlertPresenterTypeElement) ? "" : customAlertPresenterTypeElement.toString()));

nalu-processor/src/test/resources/io/github/nalukit/nalu/processor.templates/application/applicationAnnotationOkWithLoaderAsInnerInterface/ApplicationAnnotationOkWithLoaderAsInnerInterfaceImpl.java

@@ -151,7 +151,7 @@ public boolean isUsingHash() {
   }
 
   @Override
-  public boolean isUsingColonForParametersInUrl() {
+  public boolean isUsingUnderscoreForParametersInUrl() {
     return false;
   }
 

nalu-processor/src/test/resources/io/github/nalukit/nalu/processor.templates/blockController/eventhandler/eventHandlerOnABlockControllerOk01/TestApplicationImpl.java

@@ -162,7 +162,7 @@ public boolean isUsingHash() {
   }
 
   @Override
-  public boolean isUsingColonForParametersInUrl() {
+  public boolean isUsingUnderscoreForParametersInUrl() {
     return false;
   }
 

nalu-processor/src/test/resources/io/github/nalukit/nalu/processor.templates/blockController/eventhandler/eventHandlerOnABlockControllerOk02/TestApplicationImpl.java

@@ -162,7 +162,7 @@ public boolean isUsingHash() {
   }
 
   @Override
-  public boolean isUsingColonForParametersInUrl() {
+  public boolean isUsingUnderscoreForParametersInUrl() {
     return false;
   }
 

nalu-processor/src/test/resources/io/github/nalukit/nalu/processor.templates/blockController/eventhandler/eventHandlerOnABlockControllerOk03/TestApplicationImpl.java

@@ -170,7 +170,7 @@ public boolean isUsingHash() {
   }
 
   @Override
-  public boolean isUsingColonForParametersInUrl() {
+  public boolean isUsingUnderscoreForParametersInUrl() {
     return false;
   }
 

nalu-processor/src/test/resources/io/github/nalukit/nalu/processor.templates/common/application/applicationAnnotationOkWithLoader/ApplicationAnnotationOkWithLoaderImpl.java

@@ -151,7 +151,7 @@ public boolean isUsingHash() {
   }
 
   @Override
-  public boolean isUsingColonForParametersInUrl() {
+  public boolean isUsingUnderscoreForParametersInUrl() {
     return false;
   }
 

nalu-processor/src/test/resources/io/github/nalukit/nalu/processor.templates/common/application/applicationAnnotationOkWithLoaderAndPostLoader/ApplicationAnnotationOkWithLoaderAndPostLoaderImpl.java

@@ -151,7 +151,7 @@ public boolean isUsingHash() {
   }
 
   @Override
-  public boolean isUsingColonForParametersInUrl() {
+  public boolean isUsingUnderscoreForParametersInUrl() {
     return false;
   }
 

nalu-processor/src/test/resources/io/github/nalukit/nalu/processor.templates/common/application/applicationAnnotationOkWithLoaderAsInnerInterface/ApplicationAnnotationOkWithLoaderAsInnerInterfaceImpl.java

@@ -152,7 +152,7 @@ public boolean isUsingHash() {
   }
 
   @Override
-  public boolean isUsingColonForParametersInUrl() {
+  public boolean isUsingUnderscoreForParametersInUrl() {
     return false;
   }