Merge pull request #3433 from DamnClin/landscape-apply-new

Apply new modules

sonar-project.properties

@@ -18,7 +18,7 @@ sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/
 
 sonar.typescript.tsconfigPath=tsconfig.json
 
-sonar.issue.ignore.multicriteria=S3437,S4502,S4684,S4032,S5778,S1133,S119,UndocumentedApi,S5976,S2068,S5738,S4036,S2083,S6206
+sonar.issue.ignore.multicriteria=S3437,S4502,S4684,S4032,S5778,S1133,S119,UndocumentedApi,S5976,S2068,S5738,S4036,S2083,S6206,S4649
 
 # Rule https://rules.sonarsource.com/java/RSPEC-3437 is ignored, as a JPA-managed field cannot be transient
 sonar.issue.ignore.multicriteria.S3437.resourceKey=src/main/java/**/*
@@ -76,3 +76,6 @@ sonar.issue.ignore.multicriteria.S2083.ruleKey=javasecurity:S2083
 sonar.issue.ignore.multicriteria.S6206.resourceKey=src/main/java/**/infrastructure/primary/**/*
 sonar.issue.ignore.multicriteria.S6206.ruleKey=java:S6206
 
+# Rule: Unexpected missing generic font family for icons font
+sonar.issue.ignore.multicriteria.S4649.resourceKey=src/main/webapp/**
+sonar.issue.ignore.multicriteria.S4649.ruleKey=css:S4649

src/main/glyph/config.json

@@ -101,6 +101,12 @@
       "css": "cancel",
       "code": 59398,
       "src": "fontawesome"
+    },
+    {
+      "uid": "12f4ece88e46abd864e40b35e05b11cd",
+      "css": "ok",
+      "code": 59399,
+      "src": "fontawesome"
     }
   ]
 }

src/main/glyph/css/jhlite-icons-codes.css

@@ -19,6 +19,9 @@
 .jhlite-icon-cancel:before {
   content: '\e806';
 } /* '' */
+.jhlite-icon-ok:before {
+  content: '\e807';
+} /* '' */
 .jhlite-icon-twitter:before {
   content: '\f099';
 } /* '' */

src/main/glyph/css/jhlite-icons-ie7-codes.css

@@ -19,6 +19,9 @@
 .jhlite-icon-cancel {
   *zoom: expression(this.runtimeStyle[ 'zoom' ] = '1', this.innerHTML = ' ');
 }
+.jhlite-icon-ok {
+  *zoom: expression(this.runtimeStyle[ 'zoom' ] = '1', this.innerHTML = ' ');
+}
 .jhlite-icon-twitter {
   *zoom: expression(this.runtimeStyle[ 'zoom' ] = '1', this.innerHTML = ' ');
 }

src/main/glyph/css/jhlite-icons-ie7.css

@@ -32,6 +32,9 @@
 .jhlite-icon-cancel {
   *zoom: expression(this.runtimeStyle[ 'zoom' ] = '1', this.innerHTML = ' ');
 }
+.jhlite-icon-ok {
+  *zoom: expression(this.runtimeStyle[ 'zoom' ] = '1', this.innerHTML = ' ');
+}
 .jhlite-icon-twitter {
   *zoom: expression(this.runtimeStyle[ 'zoom' ] = '1', this.innerHTML = ' ');
 }

src/main/glyph/css/jhlite-icons.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: 'jhlite-icons';
-  src: url('../font/jhlite-icons.eot?27650537');
-  src: url('../font/jhlite-icons.eot?27650537#iefix') format('embedded-opentype'),
-    url('../font/jhlite-icons.woff2?27650537') format('woff2'), url('../font/jhlite-icons.woff?27650537') format('woff'),
-    url('../font/jhlite-icons.ttf?27650537') format('truetype'), url('../font/jhlite-icons.svg?27650537#jhlite-icons') format('svg');
+  src: url('../font/jhlite-icons.eot?43345743');
+  src: url('../font/jhlite-icons.eot?43345743#iefix') format('embedded-opentype'),
+    url('../font/jhlite-icons.woff2?43345743') format('woff2'), url('../font/jhlite-icons.woff?43345743') format('woff'),
+    url('../font/jhlite-icons.ttf?43345743') format('truetype'), url('../font/jhlite-icons.svg?43345743#jhlite-icons') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -13,7 +13,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'jhlite-icons';
-    src: url('../font/jhlite-icons.svg?27650537#jhlite-icons') format('svg');
+    src: url('../font/jhlite-icons.svg?43345743#jhlite-icons') format('svg');
   }
 }
 */
@@ -74,6 +74,9 @@
 .jhlite-icon-cancel:before {
   content: '\e806';
 } /* '' */
+.jhlite-icon-ok:before {
+  content: '\e807';
+} /* '' */
 .jhlite-icon-twitter:before {
   content: '\f099';
 } /* '' */

src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoccore/infrastructure/primary/SpringdocModuleConfiguration.java

@@ -25,7 +25,7 @@ JHipsterModuleResource springdocMvcModule(SpringdocApplicationService springdocA
       .slug("springdoc-mvc-openapi")
       .propertiesDefinition(buildPropertiesDefinition())
       .apiDoc(new JHipsterModuleApiDoc(API_GROUP, "Add springdoc-openapi for spring MVC"))
-      .organization(JHipsterModuleOrganization.builder().feature("springdoc").addFeatureDependency("spring-server").build())
+      .organization(JHipsterModuleOrganization.builder().feature("springdoc").addModuleDependency("spring-boot-tomcat").build())
       .tags(SERVER_TAG, SPRING_TAG, SPRING_BOOT_TAG, DOCUMENTATION_TAG, SWAGGER_TAG)
       .factory(springdocApplicationService::buildSpringdocMvcModule);
   }

src/main/webapp/app/common/domain/Memoizer.ts

@@ -13,8 +13,4 @@ export class Memoizer<Key, Value> {
 
     return value;
   }
-
-  clear() {
-    this.memoizedValues.clear();
-  }
 }

src/main/webapp/app/common/domain/Optional.ts

@@ -18,8 +18,13 @@ export abstract class Optional<Value> {
   abstract map<Output>(mapper: (value: Value) => Output): Optional<Output>;
   abstract flatMap<Output>(mapper: (feature: Value) => Optional<Output>): Optional<Output>;
   abstract orElse(value: Value): Value;
+  abstract orElseGet(factory: () => Value): Value;
+  abstract orElseThrow(): Value;
+  abstract filter(predicate: (value: Value) => boolean): Optional<Value>;
   abstract isEmpty(): boolean;
+  abstract isPresent(): boolean;
   abstract ifPresent(consumer: (feature: Value) => void): void;
+  abstract toArray(): Value[];
 }
 
 class EmptyOptional<Value> extends Optional<Value> {
@@ -35,13 +40,33 @@ class EmptyOptional<Value> extends Optional<Value> {
     return value;
   }
 
+  orElseGet(factory: () => Value): Value {
+    return factory();
+  }
+
+  orElseThrow(): Value {
+    throw new Error("Can't get value from an empty optional");
+  }
+
+  filter(): Optional<Value> {
+    return this;
+  }
+
   isEmpty(): boolean {
     return true;
   }
 
+  isPresent(): boolean {
+    return false;
+  }
+
   ifPresent(): void {
     // Nothing to do
   }
+
+  toArray(): Value[] {
+    return [];
+  }
 }
 
 class ValuatedOptional<Value> extends Optional<Value> {
@@ -61,11 +86,35 @@ class ValuatedOptional<Value> extends Optional<Value> {
     return this.value;
   }
 
+  orElseGet(): Value {
+    return this.value;
+  }
+
+  orElseThrow(): Value {
+    return this.value;
+  }
+
+  filter(predicate: (value: Value) => boolean): Optional<Value> {
+    if (predicate(this.value)) {
+      return this;
+    }
+
+    return Optional.empty();
+  }
+
   isEmpty(): boolean {
     return false;
   }
 
+  isPresent(): boolean {
+    return true;
+  }
+
   ifPresent(consumer: (feature: Value) => void): void {
     consumer(this.value);
   }
+
+  toArray(): Value[] {
+    return [this.value];
+  }
 }

src/main/webapp/app/module/domain/ModuleSlug.ts

@@ -1,11 +1,11 @@
 export class ModuleSlug {
   constructor(private readonly slug: string) {}
 
-  get(): string {
+  public get(): string {
     return this.slug;
   }
 
-  normalized(): string {
+  public normalized(): string {
     return this.slug.toLowerCase();
   }
 }