Skip to content

Commit

Permalink
#19.: clean up getter, setter, toString, remove activated in user, de…
Browse files Browse the repository at this point in the history 
…lete mailService
  • Loading branch information
Yuqiu Ge committed Jul 4, 2020
1 parent 37f99d4 commit e865d93
Show file tree
Hide file tree
Showing 26 changed files with 109 additions and 1,228 deletions.
60 changes: 31 additions & 29 deletions .github/workflows/github-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,37 +28,39 @@ jobs:
- name: Install node.js packages for ui test
run: npm install
working-directory: ${{env.ui-test-directory}}
# - name: Run backend test
# run: |
# chmod +x mvnw
# ./mvnw -ntp clean verify -P-webpack
# working-directory: ${{env.working-directory}}
# - name: Run frontend test
# run: npm run test
# working-directory: ${{env.working-directory}}

- name: Run backend test
run: |
chmod +x mvnw
./mvnw -ntp clean verify -P-webpack
working-directory: ${{env.working-directory}}
- name: Run frontend test
run: npm run test
working-directory: ${{env.working-directory}}
- name: Run UI Test
run: |
chmod +x run-e2e.sh
./run-e2e.sh
working-directory: ${{env.ui-test-directory}}
# - name: Analyze code with SonarQube
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# run: |
# if [ -n $SONAR_TOKEN ]; then
# ./mvnw -ntp initialize sonar:sonar
# else
# echo No SONAR_TOKEN, skipping...
# fi
# working-directory: ${{env.working-directory}}
# - name: Package application
# run: ./mvnw -ntp package -Pprod -DskipTests
# working-directory: ${{env.working-directory}}
# - name: Build and publish docker image
# if: github.event_name == 'push' && (github.ref == 'refs/heads/working' || startsWith(github.ref, 'refs/tags/'))
# run: |
# GIT_TAG=:${GITHUB_REF#refs/tags/}
# DOCKER_TAG=${GIT_TAG#:refs/heads/working}
# ./mvnw -ntp jib:build -Djib.to.image=registry.hub.docker.com/yuqiuge/sfo-gate-assignment-problem${DOCKER_TAG} -Djib.to.auth.username="${{ secrets.DOCKER_USERNAME }}" -Djib.to.auth.password="${{ secrets.DOCKER_PASSWORD }}"
# working-directory: ${{env.working-directory}}
- name: Analyze code with SonarQube
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
if [ -n $SONAR_TOKEN ]; then
./mvnw -ntp initialize sonar:sonar
else
echo No SONAR_TOKEN, skipping...
fi
working-directory: ${{env.working-directory}}

- name: Package application
run: ./mvnw -ntp package -Pprod -DskipTests
working-directory: ${{env.working-directory}}
- name: Build and publish docker image
if: github.event_name == 'push' && (github.ref == 'refs/heads/working' || startsWith(github.ref, 'refs/tags/'))
run: |
GIT_TAG=:${GITHUB_REF#refs/tags/}
DOCKER_TAG=${GIT_TAG#:refs/heads/working}
./mvnw -ntp jib:build -Djib.to.image=registry.hub.docker.com/yuqiuge/sfo-gate-assignment-problem${DOCKER_TAG} -Djib.to.auth.username="${{ secrets.DOCKER_USERNAME }}" -Djib.to.auth.password="${{ secrets.DOCKER_PASSWORD }}"
working-directory: ${{env.working-directory}}
13 changes: 2 additions & 11 deletions jhipster/src/main/java/it/economics/kata/config/SecurityConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package it.economics.kata.config;

import it.economics.kata.security.*;
import it.economics.kata.security.jwt.*;

import it.economics.kata.security.jwt.JWTConfigurer;
import it.economics.kata.security.jwt.TokenProvider;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.http.HttpMethod;
Expand Down Expand Up @@ -78,15 +77,7 @@ public void configure(HttpSecurity http) throws Exception {
.and()
.authorizeRequests()
.antMatchers("/api/authenticate").permitAll()
.antMatchers("/api/register").permitAll()
.antMatchers("/api/activate").permitAll()
.antMatchers("/api/account/reset-password/init").permitAll()
.antMatchers("/api/account/reset-password/finish").permitAll()
.antMatchers("/api/**").authenticated()
.antMatchers("/management/health").permitAll()
.antMatchers("/management/info").permitAll()
.antMatchers("/management/prometheus").permitAll()
.antMatchers("/management/**").hasAuthority(AuthoritiesConstants.ADMIN)
.and()
.httpBasic()
.and()
Expand Down
40 changes: 6 additions & 34 deletions jhipster/src/main/java/it/economics/kata/domain/AbstractAuditingEntity.java
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
package it.economics.kata.domain;

import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.io.Serializable;
import java.time.Instant;
import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.io.Serializable;
import java.time.Instant;

/**
* Base abstract class for entities which will hold definitions for created, last modified, created by,
* last modified by attributes.
*/
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
@Getter
@Setter
public abstract class AbstractAuditingEntity implements Serializable {

private static final long serialVersionUID = 1L;
Expand All @@ -42,36 +46,4 @@ public abstract class AbstractAuditingEntity implements Serializable {
@Column(name = "last_modified_date")
@JsonIgnore
private Instant lastModifiedDate = Instant.now();

public String getCreatedBy() {
return createdBy;
}

public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}

public Instant getCreatedDate() {
return createdDate;
}

public void setCreatedDate(Instant createdDate) {
this.createdDate = createdDate;
}

public String getLastModifiedBy() {
return lastModifiedBy;
}

public void setLastModifiedBy(String lastModifiedBy) {
this.lastModifiedBy = lastModifiedBy;
}

public Instant getLastModifiedDate() {
return lastModifiedDate;
}

public void setLastModifiedDate(Instant lastModifiedDate) {
this.lastModifiedDate = lastModifiedDate;
}
}
25 changes: 8 additions & 17 deletions jhipster/src/main/java/it/economics/kata/domain/Authority.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
package it.economics.kata.domain;

import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Column;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
Expand All @@ -15,6 +19,9 @@
* An authority (a security role) used by Spring Security.
*/
@Entity
@Getter
@Setter
@ToString
@Table(name = "app_authority")
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
public class Authority implements Serializable {
Expand All @@ -27,14 +34,6 @@ public class Authority implements Serializable {
@Column(length = 50)
private String name;

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand All @@ -50,12 +49,4 @@ public boolean equals(Object o) {
public int hashCode() {
return Objects.hashCode(name);
}

// prettier-ignore
@Override
public String toString() {
return "Authority{" +
"name='" + name + '\'' +
"}";
}
}
92 changes: 8 additions & 84 deletions jhipster/src/main/java/it/economics/kata/domain/GateAssignments.java
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
package it.economics.kata.domain;

import it.economics.kata.domain.enumeration.Transaction;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.*;
import javax.validation.constraints.*;

import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.Instant;

import it.economics.kata.domain.enumeration.Transaction;

/**
* A GateAssignments.
*/
@Entity
@Table(name = "gate_assignments")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@Getter
@Setter
@ToString
public class GateAssignments implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down Expand Up @@ -52,106 +56,41 @@ public class GateAssignments implements Serializable {
private String remark;

// jhipster-needle-entity-add-field - JHipster will add fields here
public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public Instant getTime() {
return time;
}

public GateAssignments time(Instant time) {
this.time = time;
return this;
}

public void setTime(Instant time) {
this.time = time;
}

public String getAirline() {
return airline;
}

public GateAssignments airline(String airline) {
this.airline = airline;
return this;
}

public void setAirline(String airline) {
this.airline = airline;
}

public String getFlightNumber() {
return flightNumber;
}

public GateAssignments flightNumber(String flightNumber) {
this.flightNumber = flightNumber;
return this;
}

public void setFlightNumber(String flightNumber) {
this.flightNumber = flightNumber;
}

public Transaction getTransaction() {
return transaction;
}

public GateAssignments transaction(Transaction transaction) {
this.transaction = transaction;
return this;
}

public void setTransaction(Transaction transaction) {
this.transaction = transaction;
}

public String getTerminal() {
return terminal;
}

public GateAssignments terminal(String terminal) {
this.terminal = terminal;
return this;
}

public void setTerminal(String terminal) {
this.terminal = terminal;
}

public String getGate() {
return gate;
}

public GateAssignments gate(String gate) {
this.gate = gate;
return this;
}

public void setGate(String gate) {
this.gate = gate;
}

public String getRemark() {
return remark;
}

public GateAssignments remark(String remark) {
this.remark = remark;
return this;
}

public void setRemark(String remark) {
this.remark = remark;
}
// jhipster-needle-entity-add-getters-setters - JHipster will add getters and setters here

@Override
public boolean equals(Object o) {
if (this == o) {
Expand All @@ -167,19 +106,4 @@ public boolean equals(Object o) {
public int hashCode() {
return 31;
}

// prettier-ignore
@Override
public String toString() {
return "GateAssignments{" +
"id=" + getId() +
", time='" + getTime() + "'" +
", airline='" + getAirline() + "'" +
", flightNumber='" + getFlightNumber() + "'" +
", transaction='" + getTransaction() + "'" +
", terminal='" + getTerminal() + "'" +
", gate='" + getGate() + "'" +
", remark='" + getRemark() + "'" +
"}";
}
}
Loading

0 comments on commit e865d93

Please sign in to comment.