@eui/cli 15.0.0-next.2 → 15.0.0-next.20

package/lib/skeletons/web-spring-boot-todo/myapp-web/src/main/angular/src/app/features/buildings/components/buildings-overview.component.html

@@ -1,66 +0,0 @@
-<div class="col-sm-8">
-    <ux-panel label="List of buildings" [isBlocked]="mode === 'load'">
-        <uxPanelHeaderRightContent>
-            <button *ngIf="buildingsPage && mode === 'view'" class="btn btn-secondary" (click)="setMode('edit')">Modify</button>
-            <button *ngIf="buildingsPage && mode === 'edit'" class="btn btn-secondary" (click)="setMode('view')"><span class="fa fa-close"></span> Done</button>
-        </uxPanelHeaderRightContent>
-        <uxPanelFooter *ngIf="buildingsPage && mode !== 'load'">
-            <p-paginator [first]="buildingsPage.from" [rows]="buildingsPage.pageSize" [totalRecords]="buildingsPage.total" (onPageChange)="onPageChange($event)"></p-paginator>
-        </uxPanelFooter>
-
-        <ng-container *ngIf="buildingsPage && mode !== 'load'; else loading">
-            <div class="row">
-                <div class="col-5">
-                    <ux-a-label label="Name of building"></ux-a-label>
-                </div>
-                <div class="col-5">
-                    <ux-a-label label="Address"></ux-a-label>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-12">
-                    <hr/>
-                </div>
-            </div>
-            <ng-container *ngFor="let building of buildingsPage.items">
-                <div class="row">
-                    <div class="col-5 p-2">{{building.name}}</div>
-                    <div class="col-5 p-2">
-                <span *ngIf="building.address as address">
-                    {{address.street}}<br/>
-                    {{address.postalCode}} - {{address.city}}<br/>
-                    {{address.country}}
-                </span>
-                    </div>
-                    <div class="col-1 p-2 align-self-center">
-                        <button *ngIf="mode === 'edit'" class="btn btn-secondary" (click)="deleteBuilding(building.buildingId)"><span class="fa fa-trash"></span></button>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-12">
-                        <hr/>
-                    </div>
-                </div>
-            </ng-container>
-        </ng-container>
-
-        <ng-template #loading>
-            <ng-container *ngIf="! serviceError; else error">
-                Loading...
-            </ng-container>
-        </ng-template>
-
-        <ng-template #error>
-            <ux-alert typeClass="warning">
-                Unable to retrieve the list of buildings; please <a (click)="loadBuildings()">try again</a> later.<br/>
-                If the problem persists, please contact the administrator.<br/>
-                <br/>
-                <a (click)="serviceErrorVisible = !serviceErrorVisible">
-                    <span *ngIf="!serviceErrorVisible">Show technical reason</span>
-                    <span *ngIf="serviceErrorVisible">Hide technical reason</span>
-                </a>
-                <pre *ngIf="serviceErrorVisible">{{serviceError.message}}</pre>
-            </ux-alert>
-        </ng-template>
-    </ux-panel>
-</div>

package/lib/skeletons/web-spring-boot-todo/myapp-web/src/main/angular/src/app/features/buildings/components/buildings-overview.component.ts

@@ -1,72 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { BuildingsService } from '../services/buildings.service';
-import { Page } from '../../../shared/models/page.model';
-import { Building } from '../models/building.model';
-
-@Component({
-    templateUrl: './buildings-overview.component.html',
-    styleUrls: ['./buildings-overview.component.css'],
-})
-export class BuildingsOverviewComponent implements OnInit {
-    buildingsPage: Page<Building>;
-
-    serviceError: null;
-    mode = null;
-    modes: string [] = [];
-
-    constructor(protected buildingsService: BuildingsService) {
-    }
-
-    ngOnInit() {
-        this.loadBuildings();
-    }
-
-    loadBuildings(page?: Page<any>) {
-        if (! page) {
-            page = new Page<Building>(0, 1);
-        }
-
-        this.serviceError = null;
-        this.pushMode('load');
-        this.buildingsService.findBuildings(page).subscribe(buildingsPage => {
-            // Introduce a fake delay here, just to show the "loading" state. Of course, in production this delay should be removed:
-            setTimeout(() => {
-                this.buildingsPage = buildingsPage;
-                this.popMode();
-            }, 2000);
-        }, error => {
-            this.serviceError = error;
-            this.popMode();
-        });
-    }
-
-    deleteBuilding(id: number) {
-        this.buildingsService.deleteBuilding(id).subscribe(null, error => {
-            alert(error.message);
-        });
-    }
-
-    setMode(mode: string) {
-        this.mode = mode;
-        this.modes = [mode];
-    }
-
-    pushMode(mode: string) {
-        this.modes.push(mode);
-        this.mode = mode;
-    }
-
-    popMode() {
-        this.modes.pop();
-        const length = this.modes.length;
-        if (length > 0) {
-            this.mode = this.modes [length - 1];
-        } else {
-            this.mode = 'view';
-        }
-    }
-
-    onPageChange(event) {
-        this.loadBuildings(new Page(event.first, event.first + event.rows - 1));
-    }
-}

package/lib/skeletons/web-spring-boot-todo/myapp-web/src/main/angular/src/app/features/buildings/models/address.model.ts

@@ -1,11 +0,0 @@
-import { Page } from '../../../shared/models/page.model';
-
-export class Address {
-    street: string;
-    postalCode: string;
-    city: string;
-    country: string;
-}
-
-export class AddressesPage extends Page<Address []> {
-}

package/lib/skeletons/web-spring-boot-todo/myapp-web/src/main/angular/src/app/features/buildings/models/building.model.ts

@@ -1,7 +0,0 @@
-import { Address } from './address.model';
-
-export class Building {
-    buildingId: number;
-    name: string;
-    address: Address;
-}

package/lib/skeletons/web-spring-boot-todo/myapp-web/src/main/angular/src/app/features/buildings/services/buildings.service.ts

@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
-import { Building } from '../models/building.model';
-import { Page } from '../../../shared/models/page.model';
-import { environment } from '../../../../environments/environment';
-
-@Injectable()
-export class BuildingsService {
-    constructor(protected http: HttpClient) {
-    }
-
-    findBuildings(requestedPage?: Page<any>): Observable<Page<Building>> {
-        return Page.loadPage(environment.apiBaseUrl + '/buildings/', this.http, requestedPage);
-    }
-
-    deleteBuilding(id: number) {
-        return this.http.delete(environment.apiBaseUrl + '/buildings/' + id + '/');
-    }
-}

package/lib/skeletons/web-spring-boot-todo/myapp-web/src/main/angular/src/app/features/home/home.component.html

@@ -1,9 +0,0 @@
-<div id="page-title">
-    <h2>{{ 'page.home.title' | translate }}</h2>
-</div>
-
-<ux-panel label="Panel">
-    Panel content
-</ux-panel>
-
-<a routerLink="/screen/buildings-overview">List of EC buildings</a>

package/lib/skeletons/web-spring-boot-todo/myapp-web/src/main/angular/src/app/shared/models/page.model.ts

@@ -1,63 +0,0 @@
-import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
-
-export class Page<T> {
-    items: T[];
-    from: number;
-    to: number;
-    total: number;
-
-    constructor(from?: number, to?: number) {
-        if (typeof from !== 'undefined') {
-            this.from = from;
-        }
-
-        if (typeof to !== 'undefined') {
-            this.to = to;
-        }
-    }
-
-    get pageSize(): number {
-        return this.to - this.from + 1;
-    }
-    get pageNumber(): number {
-        return this.from / this.pageSize;
-    }
-
-    static loadPage(url: string, http: HttpClient , requestedPage?: Page<any>): Observable<Page<any>> {
-        let headers = {};
-        if (requestedPage && requestedPage.from >= 0 && requestedPage.to >= 0) {
-            headers = {
-                'Content-Range': 'item ' + requestedPage.from + '-' + requestedPage.to + '/*'
-            };
-        }
-
-        return http.get(url, {
-            headers: new HttpHeaders(headers),
-            observe: 'response'
-        }).map((event: HttpResponse<any>) => {
-            const response = <HttpResponse<any>> event;
-
-            const page = new Page<any>();
-            page.items = response.body;
-
-            const range = response.headers.get('Content-Range');
-            if (range) {
-                const parts = range.split(' ');
-                if (parts.length >= 2 && parts [0] === 'item') {
-                    const itemParts = parts [1].split(/[-\/]/g);
-                    const from = parseInt(itemParts [0], 10);
-                    let to = parseInt(itemParts [1], 10);
-                    if (to < from ) {
-                        to = from;
-                    }
-                    page.total = parseInt(itemParts [2], 10);
-                    page.from = from;
-                    page.to = to;
-                }
-            }
-
-            return page;
-        });
-    }
-}

package/lib/skeletons/web-spring-boot-todo/myapp-web/src/main/angular/src/environments/environment.ts

@@ -1,9 +0,0 @@
-// The file contents for the current environment will overwrite these during build.
-// The build system defaults to the dev environment which uses `environment.ts`, but if you do
-// `ng build --env=prod` then `environment.prod.ts` will be used instead.
-// The list of which env maps to which file can be found in `.angular-cli.json`.
-
-export const environment = {
-    production: false,
-    apiBaseUrl: 'http://localhost:3000/api',
-};

package/lib/skeletons/web-spring-boot-todo/myapp-web-rest/pom.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>@app.name@-web-rest</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-	<parent>
-		<groupId>@app.group.id@.@app.name@</groupId>
-		<artifactId>@app.name@</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
-	</parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>11</java.version>
-        <springswagger.version>2.9.2</springswagger.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Add tomcat only if I want to run directly -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.tomcat</groupId>
-                    <artifactId>tomcat-jdbc</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring-security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring-security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${springswagger.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${springswagger.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>

package/lib/skeletons/web-spring-boot-todo/myapp-web-rest/src/main/java/myapp/MyappApplication.java

@@ -1,46 +0,0 @@
-package @app.group.id@.@app.name@;
-
-import @app.group.id@.@app.name@.resources.support.HateoasPageableHandlerMethodArgumentResolver;
-import @app.group.id@.@app.name@.resources.support.PageJsonSerializer;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.domain.Page;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.List;
-
-@SpringBootApplication
-public class MyappApplication extends SpringBootServletInitializer implements WebApplicationInitializer, WebMvcConfigurer {
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(MyappApplication.class);
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(new HateoasPageableHandlerMethodArgumentResolver());
-    }
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**").allowedOrigins("*").allowedMethods("*").allowedHeaders("*").exposedHeaders("Content-Range").allowCredentials(true);
-    }
-
-    @Bean
-    public Jackson2ObjectMapperBuilder objectMapperBuilder() {
-        Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
-        builder.serializerByType(Page.class, new PageJsonSerializer());
-        return builder;
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(MyappApplication.class, args);
-    }
-}

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

@@ -1,65 +0,0 @@
-package @app.group.id@.@app.name@.domain;
-
-import javax.persistence.*;
-
-@Entity(name = "t_address")
-public class Address {
-    @Id
-    @SequenceGenerator(name="address_generator", sequenceName="seq_address")
-    @GeneratedValue(generator = "address_generator")
-    @Column(name = "address_id", nullable = false)
-    private Long addressId;
-
-    @Column(nullable = false)
-    private String street;
-
-    @Column(name = "postal_code", nullable = false)
-    private String postalCode;
-
-    @Column(nullable = false)
-    private String city;
-
-    @Column(nullable = false)
-    private String country;
-
-    
-    public Long getAddressId() {
-        return addressId;
-    }
-
-    public void setAddressId(Long addressId) {
-        this.addressId = addressId;
-    }
-
-    public String getStreet() {
-        return street;
-    }
-
-    public void setStreet(String street) {
-        this.street = street;
-    }
-
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    public void setPostalCode(String postalCode) {
-        this.postalCode = postalCode;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-}

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

@@ -1,44 +0,0 @@
-package @app.group.id@.@app.name@.domain;
-
-import javax.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-todo/myapp-web-rest/src/main/java/myapp/repositories/BuildingRepository.java

@@ -1,11 +0,0 @@
-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-todo/myapp-web-rest/src/main/java/myapp/resources/BuildingResource.java

@@ -1,26 +0,0 @@
-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-todo/myapp-web-rest/src/main/java/myapp/resources/SwaggerConfig.java

@@ -1,21 +0,0 @@
-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-todo/myapp-web-rest/src/main/java/myapp/resources/support/HateoasPageableHandlerMethodArgumentResolver.java

@@ -1,45 +0,0 @@
-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-todo/myapp-web-rest/src/main/java/myapp/resources/support/HypermediaSupport.java

@@ -1,25 +0,0 @@
-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-todo/myapp-web-rest/src/main/java/myapp/resources/support/PageJsonSerializer.java

@@ -1,17 +0,0 @@
-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());
-    }
-}