@eui/cli 15.4.0 → 15.4.1

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/domain/Building.java

@@ -1,44 +1,44 @@
-package @app.group.id@.@app.name@.domain;
-
-import jakarta.persistence.*;
-import java.io.Serializable;
-
-@Entity(name = "t_building")
-public class Building implements Serializable {
-    @Id
-    @SequenceGenerator(name="building_generator", sequenceName="seq_building")
-    @GeneratedValue(generator = "building_generator")
-    private Long buildingId;
-
-    @Column(nullable = false)
-    private String name;
-
-    @OneToOne()
-    @JoinColumn(name = "address_id")
-    private Address address;
-
-
-    public Long getBuildingId() {
-        return buildingId;
-    }
-
-    public void setBuildingId(Long buildingId) {
-        this.buildingId = buildingId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Address getAddress() {
-        return address;
-    }
-
-    public void setAddress(Address address) {
-        this.address = address;
-    }
-}
+package @app.group.id@.@app.name@.domain;
+
+import jakarta.persistence.*;
+import java.io.Serializable;
+
+@Entity(name = "t_building")
+public class Building implements Serializable {
+    @Id
+    @SequenceGenerator(name="building_generator", sequenceName="seq_building")
+    @GeneratedValue(generator = "building_generator")
+    private Long buildingId;
+
+    @Column(nullable = false)
+    private String name;
+
+    @OneToOne()
+    @JoinColumn(name = "address_id")
+    private Address address;
+
+
+    public Long getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Long buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/repositories/BuildingRepository.java

@@ -1,11 +1,11 @@
-package @app.group.id@.@app.name@.repositories;
-
-import @app.group.id@.@app.name@.domain.Building;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-public interface BuildingRepository extends PagingAndSortingRepository<Building, Long> {
-    Page<Building> findAll(Pageable pageable);
-    Page<Building> findByNameContainingAllIgnoringCase(String name, Pageable pageable);
+package @app.group.id@.@app.name@.repositories;
+
+import @app.group.id@.@app.name@.domain.Building;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface BuildingRepository extends PagingAndSortingRepository<Building, Long> {
+    Page<Building> findAll(Pageable pageable);
+    Page<Building> findByNameContainingAllIgnoringCase(String name, Pageable pageable);
 }

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/resources/BuildingResource.java

@@ -1,26 +1,26 @@
-package @app.group.id@.@app.name@.resources;
-
-import @app.group.id@.@app.name@.resources.support.HypermediaSupport;
-import @app.group.id@.@app.name@.services.BuildingService;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("api/buildings")
-public class BuildingResource {
-    private BuildingService buildingService;
-    private HypermediaSupport hateoasPageSupport;
-
-    public BuildingResource(BuildingService buildingService, HypermediaSupport hateoasPageSupport) {
-        this.buildingService = buildingService;
-        this.hateoasPageSupport = hateoasPageSupport;
-    }
-
-    @GetMapping()
-    public ResponseEntity getAllBuildings(Pageable pageable) {
-        return hateoasPageSupport.wrap(buildingService.findAll(pageable), pageable);
-    }
-}
+package @app.group.id@.@app.name@.resources;
+
+import @app.group.id@.@app.name@.resources.support.HypermediaSupport;
+import @app.group.id@.@app.name@.services.BuildingService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("api/buildings")
+public class BuildingResource {
+    private BuildingService buildingService;
+    private HypermediaSupport hateoasPageSupport;
+
+    public BuildingResource(BuildingService buildingService, HypermediaSupport hateoasPageSupport) {
+        this.buildingService = buildingService;
+        this.hateoasPageSupport = hateoasPageSupport;
+    }
+
+    @GetMapping()
+    public ResponseEntity getAllBuildings(Pageable pageable) {
+        return hateoasPageSupport.wrap(buildingService.findAll(pageable), pageable);
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/resources/SwaggerConfig.java

@@ -1,21 +1,21 @@
-package @app.group.id@.@app.name@.resources;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig {
-    @Bean
-    public Docket labelApi() {
-        return new Docket(DocumentationType.SWAGGER_2).
-            select().
-            apis(RequestHandlerSelectors.basePackage("@app.group.id@.@app.name@.resources")).
-            build().
-            useDefaultResponseMessages(false);
-    }
+package @app.group.id@.@app.name@.resources;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Bean
+    public Docket labelApi() {
+        return new Docket(DocumentationType.SWAGGER_2).
+            select().
+            apis(RequestHandlerSelectors.basePackage("@app.group.id@.@app.name@.resources")).
+            build().
+            useDefaultResponseMessages(false);
+    }
 }

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/resources/support/HateoasPageableHandlerMethodArgumentResolver.java

@@ -1,45 +1,45 @@
-package @app.group.id@.@app.name@.resources.support;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
-import org.springframework.web.bind.support.WebDataBinderFactory;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.method.support.ModelAndViewContainer;
-
-public class HateoasPageableHandlerMethodArgumentResolver extends PageableHandlerMethodArgumentResolver {
-    protected int defaultPageSize = 10;
-    
-    @Override
-    public Pageable resolveArgument(MethodParameter methodParameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
-        String contentRange = webRequest.getHeader("Content-Range");
-        if (contentRange != null && contentRange.length() > 0) {
-            contentRange = contentRange.trim();
-            if (contentRange.startsWith("item ")) {
-                int index = contentRange.indexOf("/");
-                String [] range = null;
-                if (index > 0) {
-                    range = contentRange.substring("item ".length(), index).split("-");
-                } else {
-                    range = contentRange.substring("item ".length()).split("-");
-                }
-                
-                int from = Integer.parseInt(range [0]);
-                int to = defaultPageSize;
-                if (range.length > 1) {
-                    to = Integer.parseInt(range [1]);
-                }
-
-                // Page size is never <= 0:
-                int pageSize = Math.max(to - from + 1, 1);
-                // Page is zero-based:
-                int page = from / pageSize;
-                
-                return PageRequest.of(page, pageSize);
-            }
-        }
-        
-        return super.resolveArgument(methodParameter, mavContainer, webRequest, binderFactory);
-    }
-}
+package @app.group.id@.@app.name@.resources.support;
+
+import org.springframework.core.MethodParameter;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+public class HateoasPageableHandlerMethodArgumentResolver extends PageableHandlerMethodArgumentResolver {
+    protected int defaultPageSize = 10;
+    
+    @Override
+    public Pageable resolveArgument(MethodParameter methodParameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
+        String contentRange = webRequest.getHeader("Content-Range");
+        if (contentRange != null && contentRange.length() > 0) {
+            contentRange = contentRange.trim();
+            if (contentRange.startsWith("item ")) {
+                int index = contentRange.indexOf("/");
+                String [] range = null;
+                if (index > 0) {
+                    range = contentRange.substring("item ".length(), index).split("-");
+                } else {
+                    range = contentRange.substring("item ".length()).split("-");
+                }
+                
+                int from = Integer.parseInt(range [0]);
+                int to = defaultPageSize;
+                if (range.length > 1) {
+                    to = Integer.parseInt(range [1]);
+                }
+
+                // Page size is never <= 0:
+                int pageSize = Math.max(to - from + 1, 1);
+                // Page is zero-based:
+                int page = from / pageSize;
+                
+                return PageRequest.of(page, pageSize);
+            }
+        }
+        
+        return super.resolveArgument(methodParameter, mavContainer, webRequest, binderFactory);
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/resources/support/HypermediaSupport.java

@@ -1,25 +1,25 @@
-package @app.group.id@.@app.name@.resources.support;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-
-@Component
-public class HypermediaSupport {
-    public ResponseEntity<Page> wrap(Page page, Pageable pageable) {
-        HttpHeaders headers = new HttpHeaders();
-
-        long total = page.getTotalElements();
-        // Page and range are zero-based:
-        long from = page.getNumber() * page.getSize();
-        long to = from + pageable.getPageSize() - 1;
-        
-        headers.add("Accept-Ranges", "item");
-        headers.add("Content-Range", "item " + from + "-" + to + "/" + total);
-        
-        return new ResponseEntity<Page>(page, headers, HttpStatus.PARTIAL_CONTENT);
-    }
-}
+package @app.group.id@.@app.name@.resources.support;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+@Component
+public class HypermediaSupport {
+    public ResponseEntity<Page> wrap(Page page, Pageable pageable) {
+        HttpHeaders headers = new HttpHeaders();
+
+        long total = page.getTotalElements();
+        // Page and range are zero-based:
+        long from = page.getNumber() * page.getSize();
+        long to = from + pageable.getPageSize() - 1;
+        
+        headers.add("Accept-Ranges", "item");
+        headers.add("Content-Range", "item " + from + "-" + to + "/" + total);
+        
+        return new ResponseEntity<Page>(page, headers, HttpStatus.PARTIAL_CONTENT);
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/resources/support/PageJsonSerializer.java

@@ -1,17 +1,17 @@
-package @app.group.id@.@app.name@.resources.support;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import org.springframework.data.domain.Page;
-
-import java.io.IOException;
-
-public class PageJsonSerializer extends JsonSerializer {
-    @Override
-    public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
-        // Remove the page information that will be serialized to the HTTP headers instead:
-        Page page = (Page) o;
-        jsonGenerator.writeObject(page.getContent());
-    }
-}
+package @app.group.id@.@app.name@.resources.support;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.springframework.data.domain.Page;
+
+import java.io.IOException;
+
+public class PageJsonSerializer extends JsonSerializer {
+    @Override
+    public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+        // Remove the page information that will be serialized to the HTTP headers instead:
+        Page page = (Page) o;
+        jsonGenerator.writeObject(page.getContent());
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/security/CachingPreventionFilter.java

@@ -1,29 +1,29 @@
-package @app.group.id@.@app.name@.security;
-
-import jakarta.servlet.*;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-// Prevents caching of REST service responses.
-public class CachingPreventionFilter implements Filter {
-    public void init(FilterConfig filterConfig) throws ServletException {
-        // do nothing
-    }
-
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        HttpServletResponse response = (HttpServletResponse) servletResponse;
-        response.addIntHeader("Age", 0);
-        response.addHeader("Cache-Control", "no-cache,no-store,no-transform,must-revalidate");
-        response.addHeader("Expires", "Wed, 31 Dec 1969 23:59:59 GMT");
-        response.addHeader("Pragma", "no-cache");
-        response.addHeader("X-Robots-Tag", "noindex, nofollow");
-
-        if (filterChain != null) {
-            filterChain.doFilter(servletRequest, servletResponse);
-        }
-    }
-
-    public void destroy() {
-        // do nothing
-    }
-}
+package @app.group.id@.@app.name@.security;
+
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+// Prevents caching of REST service responses.
+public class CachingPreventionFilter implements Filter {
+    public void init(FilterConfig filterConfig) throws ServletException {
+        // do nothing
+    }
+
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        response.addIntHeader("Age", 0);
+        response.addHeader("Cache-Control", "no-cache,no-store,no-transform,must-revalidate");
+        response.addHeader("Expires", "Wed, 31 Dec 1969 23:59:59 GMT");
+        response.addHeader("Pragma", "no-cache");
+        response.addHeader("X-Robots-Tag", "noindex, nofollow");
+
+        if (filterChain != null) {
+            filterChain.doFilter(servletRequest, servletResponse);
+        }
+    }
+
+    public void destroy() {
+        // do nothing
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/security/CsrfPreventionFilter.java

@@ -1,35 +1,35 @@
-package @app.group.id@.@app.name@.security;
-
-import jakarta.servlet.*;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-// Prevents non-ajax requests for REST services. This is to prevent Cross-Site Request Forgery (CSRF) attacks.
-public class CsrfPreventionFilter implements Filter {
-    public void init(FilterConfig filterConfig) throws ServletException {
-        // do nothing
-    }
-
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) servletRequest;
-        HttpServletResponse response = (HttpServletResponse) servletResponse;
-
-        String origin = request.getHeader("Origin");
-        if ("XMLHttpRequest".equals(request.getHeader("X-Requested-With")) || "OPTIONS".equalsIgnoreCase(request.getMethod()) || (origin != null && origin.trim().length() > 0)) {
-            response.addHeader("Content-Security-Policy", "default-src 'self'; connect-src 'self'; font-src 'none'; img-src 'self'; media-src 'self'; object-src 'self'; plugin-types application/pdf audio/x-wav; referrer no-referrer; reflected-xss block; script-src 'self'; style-src 'self'");
-            response.addHeader("X-Content-Security-Policy", "default-src 'self'; connect-src 'self'; font-src 'none'; img-src 'self'; media-src 'self'; object-src 'self'; plugin-types application/pdf audio/x-wav; referrer no-referrer; reflected-xss block; script-src 'self'; style-src 'self'");
-            response.addHeader("X-Content-Type-Options", "nosniff");
-            if (filterChain != null) {
-                filterChain.doFilter(servletRequest, servletResponse);
-            }
-        } else {
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-            response.getWriter().write("The REST service can only be accessed programmatically.");
-        }
-    }
-
-    public void destroy() {
-        // do nothing
-    }
-}
+package @app.group.id@.@app.name@.security;
+
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+// Prevents non-ajax requests for REST services. This is to prevent Cross-Site Request Forgery (CSRF) attacks.
+public class CsrfPreventionFilter implements Filter {
+    public void init(FilterConfig filterConfig) throws ServletException {
+        // do nothing
+    }
+
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+        String origin = request.getHeader("Origin");
+        if ("XMLHttpRequest".equals(request.getHeader("X-Requested-With")) || "OPTIONS".equalsIgnoreCase(request.getMethod()) || (origin != null && origin.trim().length() > 0)) {
+            response.addHeader("Content-Security-Policy", "default-src 'self'; connect-src 'self'; font-src 'none'; img-src 'self'; media-src 'self'; object-src 'self'; plugin-types application/pdf audio/x-wav; referrer no-referrer; reflected-xss block; script-src 'self'; style-src 'self'");
+            response.addHeader("X-Content-Security-Policy", "default-src 'self'; connect-src 'self'; font-src 'none'; img-src 'self'; media-src 'self'; object-src 'self'; plugin-types application/pdf audio/x-wav; referrer no-referrer; reflected-xss block; script-src 'self'; style-src 'self'");
+            response.addHeader("X-Content-Type-Options", "nosniff");
+            if (filterChain != null) {
+                filterChain.doFilter(servletRequest, servletResponse);
+            }
+        } else {
+            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+            response.getWriter().write("The REST service can only be accessed programmatically.");
+        }
+    }
+
+    public void destroy() {
+        // do nothing
+    }
+}