Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .sonarlint/connectedMode.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"sonarCloudOrganization": "nitinkc",
"projectKey": "nitinkc_JavaConcepts"
}
"projectKey": "nitinkc_JavaConcepts",
"sonarCloudOrganization": "nitinkc"
}
26 changes: 26 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,33 @@ plugins {
id 'java'
id 'maven-publish'
id "org.sonarqube" version "4.4.1.3373" //For local testing
id("com.diffplug.spotless") version "7.1.0"

}

spotless {
format('misc') {
target '.gitattributes', '.gitignore'
trimTrailingWhitespace()
endWithNewline()
leadingSpacesToTabs()
leadingTabsToSpaces(4)
}

java {
googleJavaFormat('1.19.2').aosp()
// reflowLongStrings()
// formatJavadoc(false)
removeUnusedImports()
}

json {
target '**/*.json'
targetExclude '*/target/**'
simple()
}
}

group = 'JavaConcepts'
version = '1.0-SNAPSHOT'

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/converter/db2Dto/Data.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ public class Data {
private String refDataId;
private String releaseNumber;

//Other Data Fields
// Other Data Fields
}
1 change: 0 additions & 1 deletion src/main/java/com/converter/db2Dto/DataDto.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
public class DataDto {
private String createReleaseNumber;
private RefTable refData;

}
2 changes: 1 addition & 1 deletion src/main/java/com/converter/db2Dto/DbToDtoConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ public interface DbToDtoConverter<T, R> {
default List<T> convert(Collection<? extends R> fromCollection) {
return fromCollection.stream().map(this::convert).collect(Collectors.toList());
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/converter/db2Dto/MyConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ public DataDto convert(Data data) {
.refData(refDataReadDao.findById(RefTable.class, data.getRefDataId()))
.build();
}
}
}
5 changes: 3 additions & 2 deletions src/main/java/com/converter/db2Dto/RefDataReadDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ public interface RefDataReadDao {

<K extends ReferenceDataAuditFields> K findById(Class<K> theClass, String id);

<K extends ReferenceDataAuditFields> List<K> findByIds(Class<K> theClass, Collection<String> ids);
}
<K extends ReferenceDataAuditFields> List<K> findByIds(
Class<K> theClass, Collection<String> ids);
}
13 changes: 5 additions & 8 deletions src/main/java/com/converter/db2Dto/RefTable.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package com.converter.db2Dto;

import java.io.Serial;
import javax.persistence.Column;
import javax.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;

import javax.persistence.Column;
import javax.persistence.Table;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
Expand All @@ -17,14 +16,12 @@
public class RefTable extends ReferenceDataAuditFields {

public static final String NAME = "REF_TABLE";
@Serial
private static final long serialVersionUID = -6116147807948969283L;
@Serial private static final long serialVersionUID = -6116147807948969283L;

//@PrimaryKey
// @PrimaryKey
@Column(name = "CODE_ID", nullable = false)
private String codeId;

@Column(name = "DISPLAY_NAME", nullable = false)
private String displayName;

}
16 changes: 7 additions & 9 deletions src/main/java/com/converter/db2Dto/ReferenceDataAuditFields.java
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
package com.converter.db2Dto;

import java.io.Serial;
import java.io.Serializable;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import java.io.Serial;
import java.io.Serializable;
import java.sql.Timestamp;

@Data
@MappedSuperclass
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
public class ReferenceDataAuditFields implements Serializable {

@Serial
private static final long serialVersionUID = -3784354643L;
@Serial private static final long serialVersionUID = -3784354643L;

@Column(name = "START_DATE")
private Timestamp startDate;
Expand All @@ -32,4 +30,4 @@ public class ReferenceDataAuditFields implements Serializable {

@Column(name = "CREATE_RELEASE_NUMBER")
private Integer releaseNumber;
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/converter/dtoConverter/DtoConverter.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.converter.dtoConverter;

import java.util.function.BiConsumer;

import static java.util.Objects.isNull;

import java.util.function.BiConsumer;

public abstract class DtoConverter<O> {

public <E> O convert(E from, O to, BiConsumer<E, O> build) {
Expand Down
29 changes: 15 additions & 14 deletions src/main/java/com/converter/dtoConverter/DtoConvertorRunner.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.converter.dtoConverter;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
Expand All @@ -10,12 +9,13 @@ public class DtoConvertorRunner {
static Entity entity;

static {
entity = Entity.builder()
.idEntity("uuid")
.someString("some String")
.ssn("ssn")
.age(29)
.build();
entity =
Entity.builder()
.idEntity("uuid")
.someString("some String")
.ssn("ssn")
.age(29)
.build();
}

public static void main(String[] args) {
Expand All @@ -27,15 +27,16 @@ public static void main(String[] args) {

private static List<Dto> entityToDto(List<Entity> entityList) {

// if(!(entityList.get(0) instanceof Entity) || entityList == null)
// return null;
// if(!(entityList.get(0) instanceof Entity) || entityList == null)
// return null;

EntityToDtoConverter entityToDtoConverter = new EntityToDtoConverter();
List<Dto> dtoList = entityList.stream()
.filter(obj -> obj == null)
//.map(entity -> entityToDtoConverter.toDto(entity))
.map(entityToDtoConverter::toDto)
.collect(Collectors.toList());
List<Dto> dtoList =
entityList.stream()
.filter(obj -> obj == null)
// .map(entity -> entityToDtoConverter.toDto(entity))
.map(entityToDtoConverter::toDto)
.collect(Collectors.toList());

return dtoList;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/converter/dtoConverter/Entity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
public class Entity {
private String idEntity;
private String someString;
private String ssn;//PII: Can't be send via Dto
private Integer age;//PII: Can't be send via Dto
private String ssn; // PII: Can't be send via Dto
private Integer age; // PII: Can't be send via Dto
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

public class EntityToDtoConverter extends DtoConverter<Dto> {

static final BiConsumer<Entity, Dto> ENTITY_TO_DTO = (entity, dto) -> {

dto.setIdDto(entity.getIdEntity());
dto.setDoseQtyDto(entity.getSomeString());
};
static final BiConsumer<Entity, Dto> ENTITY_TO_DTO =
(entity, dto) -> {
dto.setIdDto(entity.getIdEntity());
dto.setDoseQtyDto(entity.getSomeString());
};

@Override
protected Dto instantiateDto() {
Expand All @@ -19,4 +19,3 @@ public Dto toDto(Entity entity) {
return convert(entity, null, ENTITY_TO_DTO);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ public static void main(String[] args) {
SpannerEntity spannerEntity = entityConverter.convert(db2Entity);

System.out.println(spannerEntity);

}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.converter.entityConverter;

import java.util.function.BiConsumer;

import static java.util.Objects.isNull;

import java.util.function.BiConsumer;

public interface EntityConverter<I, O> {
O convert(I input);

Expand Down
5 changes: 1 addition & 4 deletions src/main/java/com/entity/Address.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
import lombok.ToString;

/**
* @author Created by nichaurasia
* Created on Tuesday, September/29/2020 at 3:09 AM
* @author Created by nichaurasia Created on Tuesday, September/29/2020 at 3:09 AM
*/

@Getter
@Setter
@AllArgsConstructor
Expand All @@ -23,5 +21,4 @@ public class Address {
public String State;
public String Country;
public int zip;

}
1 change: 0 additions & 1 deletion src/main/java/com/entity/Beer.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.entity;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
13 changes: 5 additions & 8 deletions src/main/java/com/entity/Cancer.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,20 @@

import lombok.*;

/**
* Created by nichaurasia on Wednesday, January/29/2020 at 6:24 PM
*/

/** Created by nichaurasia on Wednesday, January/29/2020 at 6:24 PM */
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
@EqualsAndHashCode
public class Cancer {
private String state;//0
private String state; // 0
private String cancer_sites;
private int Year;//2
private int Year; // 2
private String sex;
private String race;//2
private float count;//5
private String race; // 2
private float count; // 5
private int population;
private float age_adj_Rate;
}
17 changes: 10 additions & 7 deletions src/main/java/com/entity/Card.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,32 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

import javax.annotation.processing.Generated;
import lombok.Data;

@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"id",
"uid",
"credit_card_number",
"credit_card_expiry_date",
"credit_card_type"
"id",
"uid",
"credit_card_number",
"credit_card_expiry_date",
"credit_card_type"
})
@Generated("jsonschema2pojo")
public class Card {
@JsonProperty("id")
public Integer id;

@JsonProperty("uid")
public String uid;

@JsonProperty("credit_card_number")
public String creditCardNumber;

@JsonProperty("credit_card_expiry_date")
public String creditCardExpiryDate;

@JsonProperty("credit_card_type")
public String creditCardType;
}
19 changes: 12 additions & 7 deletions src/main/java/com/entity/Employee.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package com.entity;

import java.util.Date;
import lombok.Getter;
import lombok.Setter;

import java.util.Date;

/**
* @author Created by nichaurasia
* Created on Tuesday, September/29/2020 at 7:36 PM
* @author Created by nichaurasia Created on Tuesday, September/29/2020 at 7:36 PM
*/

@Getter
@Setter
public class Employee extends Person {
Expand All @@ -18,8 +15,16 @@ public class Employee extends Person {
private char level;
private int experience;

public Employee(String firstName, String lastName, Date dob, Ethnicity ethnicity, Address address,
String employer, double salary, char level, int experience) {
public Employee(
String firstName,
String lastName,
Date dob,
Ethnicity ethnicity,
Address address,
String employer,
double salary,
char level,
int experience) {
super(firstName, lastName, dob, ethnicity, address);
this.employer = employer;
this.experience = experience;
Expand Down
Loading
Loading