Simple fixes

devonfw · Apr 1, 2023 · ac2efa9 · ac2efa9
1 parent 82d0ad4
commit ac2efa9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git a/.github/workflows/maven-build-test.yml b/.github/workflows/maven-build-test.yml
@@ -19,7 +19,7 @@ on:
       - '**.asciidoc'
 
 env:
-  # if continuously builds exiting ramdomy, possibly add again -Djansi.force=true -Djansi.passthrough=true
+  # if continuously builds exiting randomly, possibly add again -Djansi.force=true -Djansi.passthrough=true
   MVN_BATCH_MODE: '-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
   # fixing random connection reset of maven downloads as proposed here: https://github.com/actions/virtual-environments/issues/2715#issuecomment-797388909
   MVN_HTTP_OPTIMIZATION: '-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120'

diff --git a/cobigen-templates/crud-java-server-app/src/main/resources/template-set.xml b/cobigen-templates/crud-java-server-app/src/main/resources/template-set.xml
@@ -62,12 +62,6 @@
     <tc:increment name="ctos" description="CTO's">
       <tc:templateRef ref="${variables.entityName}Cto.java" />
     </tc:increment>
-    <!-- <increment name="logic_impl" description="CRUD logic (all in one)">
-      <templateRef ref="AbstractBeanMapperSupport.java"/>
-      <templateRef ref="AbstractComponentFacade.java"/>
-      <templateRef ref="${variables.component#cap_first}Impl.java"/>
-      <templateRef ref="${variables.component#cap_first}.java"/>
-    </increment>-->
     <tc:increment name="dataaccess_infrastructure" description="Entity infrastructure">
       <tc:templateRef ref="ApplicationPersistenceEntity.java" />
       <tc:templateRef ref="ApplicationEntity.java" />
@@ -86,12 +80,6 @@
       <tc:templateRef ref="${variables.component#cap_first}RestServiceImplCtos.java" />
       <tc:templateRef ref="${variables.component#cap_first}RestServiceCtos.java" />
     </tc:increment>
-    <!-- <increment name="soap_service_impl" description="CRUD SOAP services">
-      <templateRef ref="ServiceConfig.java"/>
-      <templateRef ref="WebApplicationContextLocator.java"/>
-      <templateRef ref="${variables.component#cap_first}SoapService.java"/>
-      <templateRef ref="${variables.component#cap_first}SoapServiceImpl.java"/>
-    </increment>-->
   </tc:increments>
 </tc:templatesConfiguration>
 </tns:templateSetConfiguration>
diff --git a/...ore-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/ArtifactRetriever.java b/...ore-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/ArtifactRetriever.java
@@ -60,7 +60,7 @@ public static List<String> retrieveTemplateSetJarDownloadURLs(List<String> group
   /**
    * Retrieves a list of maven artifact download URLs
    *
-   * @param groupIdsList grouIds for template-sets
+   * @param groupIdsList groupIds for template-sets
    * @param mavenSettings string of maven's settings.xml
    * @return list of maven artifact download URLs
    *

diff --git a/...rtifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenSettings.java b/...rtifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenSettings.java
@@ -74,7 +74,8 @@ public static MavenSettingsProxyModel determineActiveProxy(MavenSettingsModel mo
   }
 
   /**
-   * Maps parts of maven's settings.xml to a Java class Mapping includes: settings-, profiles-, profile-, repository-,
+   * Maps parts of maven's settings.xml to a Java class.
+   * Mapping includes: settings-, profiles-, profile-, repository-,
    * repositories-, servers-, and server-elements
    *
    * @param mavenSettings string of maven's settings.xml

diff --git a/...ava/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsActiveProfilesModel.java b/...ava/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsActiveProfilesModel.java
@@ -5,7 +5,7 @@
 import jakarta.xml.bind.annotation.XmlElement;
 
 /**
- * Class, which represents the activeProfiles element of maven's setting.xml
+ * Class, which represents the activeProfiles element of maven's settings.xml
  *
  */
 public class MavenSettingsActiveProfilesModel {

diff --git a/...iever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseFactoryTest.java b/...iever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseFactoryTest.java
@@ -239,7 +239,6 @@ public void testNexus3EmptyDownloadLinksAfterSearchRequestCancelsAndReturnsEmpty
 
   /**
    * Tests if an empty list gets returned if the search request received an empty json string as a response
-   *
    */
   @Test
   public void testSearchRequestWithEmptyJsonResponseReturnsEmptyList() {
-Original file line number
+Diff line change
@@ Expand Up @@
       /**
        * Tests if an empty list gets returned if the search request received an empty json string as a response
-       *
        */
       @Test
       public void testSearchRequestWithEmptyJsonResponseReturnsEmptyList() {
@@ Expand Down @@