Skip to content

Commit 27c4345

Browse files
rgomezcasasrgomezcasas
authored
Reformat all the code (#25)
1 parent b64efac commit 27c4345

41 files changed

Lines changed: 222 additions & 203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/main/resources/log4j2.properties‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
name = CodelyTvJavaDddSkeleton
2-
property.filename = logs
3-
appenders = console, file
1+
name = CodelyTvJavaDddSkeleton
2+
property.filename = logs
3+
appenders = console, file
44

5-
status = warn
5+
status = warn
66

7-
appender.console.name = CONSOLE
8-
appender.console.type = CONSOLE
9-
appender.console.target = SYSTEM_OUT
7+
appender.console.name = CONSOLE
8+
appender.console.type = CONSOLE
9+
appender.console.target = SYSTEM_OUT
1010

11-
appender.console.logstash.type = LogstashLayout
11+
appender.console.logstash.type = LogstashLayout
1212
appender.console.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ
13-
appender.console.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json
14-
appender.console.logstash.prettyPrintEnabled = true
15-
appender.console.logstash.stackTraceEnabled = true
13+
appender.console.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json
14+
appender.console.logstash.prettyPrintEnabled = true
15+
appender.console.logstash.stackTraceEnabled = true
1616

17-
appender.file.type = File
18-
appender.file.name = LOGFILE
19-
appender.file.fileName=var/log/java-ddd-skeleton.log
20-
appender.file.logstash.type=LogstashLayout
21-
appender.file.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ
22-
appender.file.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json
23-
appender.file.logstash.prettyPrintEnabled = false
24-
appender.file.logstash.stackTraceEnabled = true
17+
appender.file.type = File
18+
appender.file.name = LOGFILE
19+
appender.file.fileName = var/log/java-ddd-skeleton.log
20+
appender.file.logstash.type = LogstashLayout
21+
appender.file.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ
22+
appender.file.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json
23+
appender.file.logstash.prettyPrintEnabled = false
24+
appender.file.logstash.stackTraceEnabled = true
2525

26-
loggers = file
27-
logger.file.name = tv.codely.java_ddd_skeleton
28-
logger.file.level = info
29-
logger.file.appenderRefs = file
30-
logger.file.appenderRef.file.ref = LOGFILE
26+
loggers = file
27+
logger.file.name = tv.codely.java_ddd_skeleton
28+
logger.file.level = info
29+
logger.file.appenderRefs = file
30+
logger.file.appenderRef.file.ref = LOGFILE
3131

32-
rootLogger.level = info
33-
rootLogger.appenderRefs = stdout
34-
rootLogger.appenderRef.stdout.ref = CONSOLE
32+
rootLogger.level = info
33+
rootLogger.appenderRefs = stdout
34+
rootLogger.appenderRef.stdout.ref = CONSOLE

‎apps/main/tv/codely/apps/mooc/backend/controller/courses/CoursesPutController.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ final class Request {
3434
private String name;
3535
private String duration;
3636

37-
String name() {
38-
return name;
39-
}
40-
41-
String duration() {
42-
return duration;
43-
}
44-
4537
public void setDuration(String duration) {
4638
this.duration = duration;
4739
}
4840

4941
public void setName(String name) {
5042
this.name = name;
5143
}
44+
45+
String name() {
46+
return name;
47+
}
48+
49+
String duration() {
50+
return duration;
51+
}
5252
}

‎apps/test/resources/log4j2.properties‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
name = CodelyTvJavaDddSkeleton
2-
property.filename = logs
3-
appenders = console, file
1+
name = CodelyTvJavaDddSkeleton
2+
property.filename = logs
3+
appenders = console, file
44

5-
status = warn
5+
status = warn
66

7-
appender.console.name = CONSOLE
8-
appender.console.type = CONSOLE
9-
appender.console.target = SYSTEM_OUT
7+
appender.console.name = CONSOLE
8+
appender.console.type = CONSOLE
9+
appender.console.target = SYSTEM_OUT
1010

11-
appender.console.layout.type = PatternLayout
12-
appender.console.layout.pattern = [%level] [%date{HH:mm:ss.SSS}] [%class{0}#%method:%line] %message \(%mdc\) %n%throwable
13-
appender.console.filter.threshold.type = ThresholdFilter
14-
appender.console.filter.threshold.level = info
11+
appender.console.layout.type = PatternLayout
12+
appender.console.layout.pattern = [%level] [%date{HH:mm:ss.SSS}] [%class{0}#%method:%line] %message \(%mdc\) %n%throwable
13+
appender.console.filter.threshold.type = ThresholdFilter
14+
appender.console.filter.threshold.level = info
1515

16-
appender.file.type = File
17-
appender.file.name = LOGFILE
18-
appender.file.fileName=var/log/java-ddd-skeleton-test.log
19-
appender.file.logstash.type=LogstashLayout
16+
appender.file.type = File
17+
appender.file.name = LOGFILE
18+
appender.file.fileName = var/log/java-ddd-skeleton-test.log
19+
appender.file.logstash.type = LogstashLayout
2020
appender.file.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ
21-
appender.file.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json
22-
appender.file.logstash.prettyPrintEnabled = false
23-
appender.file.logstash.stackTraceEnabled = true
21+
appender.file.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json
22+
appender.file.logstash.prettyPrintEnabled = false
23+
appender.file.logstash.stackTraceEnabled = true
2424

25-
loggers = file
26-
logger.file.name = tv.codely.java_ddd_skeleton
27-
logger.file.level = info
28-
logger.file.appenderRefs = file
29-
logger.file.appenderRef.file.ref = LOGFILE
25+
loggers = file
26+
logger.file.name = tv.codely.java_ddd_skeleton
27+
logger.file.level = info
28+
logger.file.appenderRefs = file
29+
logger.file.appenderRef.file.ref = LOGFILE
3030

31-
rootLogger.level = info
32-
rootLogger.appenderRefs = stdout
33-
rootLogger.appenderRef.stdout.ref = CONSOLE
31+
rootLogger.level = info
32+
rootLogger.appenderRefs = stdout
33+
rootLogger.appenderRef.stdout.ref = CONSOLE

‎src/backoffice/main/tv/codely/backoffice/courses/application/search_by_criteria/BackofficeCoursesByCriteriaSearcher.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ public BackofficeCoursesResponse search(
2828
Criteria criteria = new Criteria(filters, order, limit, offset);
2929

3030
return new BackofficeCoursesResponse(
31-
repository.matching(criteria).stream().map(BackofficeCourseResponse::fromAggregate).collect(Collectors.toList())
31+
repository.matching(criteria)
32+
.stream()
33+
.map(BackofficeCourseResponse::fromAggregate)
34+
.collect(Collectors.toList())
3235
);
3336
}
3437
}

‎src/backoffice/main/tv/codely/backoffice/shared/infrastructure/persistence/BackofficeElasticsearchConfiguration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.elasticsearch.client.RequestOptions;
66
import org.elasticsearch.client.RestClient;
77
import org.elasticsearch.client.RestHighLevelClient;
8-
import org.elasticsearch.client.indices.CreateIndexRequest;
98
import org.elasticsearch.client.indices.GetIndexRequest;
109
import org.springframework.context.annotation.Bean;
1110
import org.springframework.context.annotation.Configuration;
@@ -64,7 +63,7 @@ private void generateIndexIfNotExists(ElasticsearchClient client, String context
6463
String indexName = Objects.requireNonNull(jsonIndex.getFilename()).replace(".json", "");
6564

6665
if (!indexExists(indexName, client)) {
67-
String indexBody = new Scanner(
66+
String indexBody = new Scanner(
6867
jsonIndex.getInputStream(),
6968
"UTF-8"
7069
).useDelimiter("\\A").next();

‎src/backoffice/main/tv/codely/backoffice/shared/infrastructure/persistence/BackofficeRabbitMqEventBusConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public BackofficeRabbitMqEventBusConfiguration(
1616
RabbitMqPublisher publisher,
1717
@Qualifier("backofficeMysqlEventBus") MySqlEventBus failoverPublisher
1818
) {
19-
this.publisher = publisher;
19+
this.publisher = publisher;
2020
this.failoverPublisher = failoverPublisher;
2121
}
2222

‎src/mooc/main/resources/database/mooc.sql‎

Lines changed: 56 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,61 @@
1-
CREATE TABLE IF NOT EXISTS `courses` (
2-
`id` CHAR(36) NOT NULL,
3-
`name` VARCHAR(255) NOT NULL,
4-
`duration` VARCHAR(255) NOT NULL,
5-
PRIMARY KEY (`id`)
6-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1+
CREATE TABLE IF NOT EXISTS courses (
2+
id CHAR(36) NOT NULL,
3+
name VARCHAR(255) NOT NULL,
4+
duration VARCHAR(255) NOT NULL,
5+
PRIMARY KEY (id)
6+
)
7+
ENGINE = InnoDB
8+
DEFAULT CHARSET = utf8mb4
9+
COLLATE = utf8mb4_unicode_ci;
710

8-
CREATE TABLE IF NOT EXISTS `courses_counter` (
9-
`id` CHAR(36) NOT NULL,
10-
`total` INT NOT NULL,
11-
`existing_courses` JSON NOT NULL,
12-
PRIMARY KEY (`id`)
13-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
11+
CREATE TABLE IF NOT EXISTS courses_counter (
12+
id CHAR(36) NOT NULL,
13+
total INT NOT NULL,
14+
existing_courses JSON NOT NULL,
15+
PRIMARY KEY (id)
16+
)
17+
ENGINE = InnoDB
18+
DEFAULT CHARSET = utf8mb4
19+
COLLATE = utf8mb4_unicode_ci;
1420

15-
CREATE TABLE IF NOT EXISTS `steps` (
16-
`id` CHAR(36) NOT NULL,
17-
`title` VARCHAR(155) NOT NULL,
18-
PRIMARY KEY (`id`)
19-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
21+
CREATE TABLE IF NOT EXISTS steps (
22+
id CHAR(36) NOT NULL,
23+
title VARCHAR(155) NOT NULL,
24+
PRIMARY KEY (id)
25+
)
26+
ENGINE = InnoDB
27+
DEFAULT CHARSET = utf8mb4
28+
COLLATE = utf8mb4_unicode_ci;
2029

21-
CREATE TABLE IF NOT EXISTS `steps_challenges` (
22-
`id` CHAR(36) NOT NULL,
23-
`statement` TEXT NOT NULL,
24-
PRIMARY KEY (`id`),
25-
CONSTRAINT `fk_steps_challenges__step_id` FOREIGN KEY (`id`) REFERENCES `steps` (`id`)
26-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
30+
CREATE TABLE IF NOT EXISTS steps_challenges (
31+
id CHAR(36) NOT NULL,
32+
statement TEXT NOT NULL,
33+
PRIMARY KEY (id),
34+
CONSTRAINT fk_steps_challenges__step_id FOREIGN KEY (id) REFERENCES steps(id)
35+
)
36+
ENGINE = InnoDB
37+
DEFAULT CHARSET = utf8mb4
38+
COLLATE = utf8mb4_unicode_ci;
2739

28-
CREATE TABLE IF NOT EXISTS `steps_videos` (
29-
`id` CHAR(36) NOT NULL,
30-
`url` VARCHAR(255) NOT NULL,
31-
`text` TEXT NOT NULL,
32-
PRIMARY KEY (`id`),
33-
CONSTRAINT `fk_steps_video__step_id` FOREIGN KEY (`id`) REFERENCES `steps` (`id`)
34-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
40+
CREATE TABLE IF NOT EXISTS steps_videos (
41+
id CHAR(36) NOT NULL,
42+
url VARCHAR(255) NOT NULL,
43+
text TEXT NOT NULL,
44+
PRIMARY KEY (id),
45+
CONSTRAINT fk_steps_video__step_id FOREIGN KEY (id) REFERENCES steps(id)
46+
)
47+
ENGINE = InnoDB
48+
DEFAULT CHARSET = utf8mb4
49+
COLLATE = utf8mb4_unicode_ci;
3550

36-
CREATE TABLE IF NOT EXISTS `domain_events` (
37-
`id` CHAR(36) NOT NULL,
38-
`aggregate_id` CHAR(36) NOT NULL,
39-
`name` VARCHAR(255) NOT NULL,
40-
`body` JSON NOT NULL,
41-
`occurred_on` timestamp NOT NULL,
42-
PRIMARY KEY (`id`)
43-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
51+
CREATE TABLE IF NOT EXISTS domain_events (
52+
id CHAR(36) NOT NULL,
53+
aggregate_id CHAR(36) NOT NULL,
54+
name VARCHAR(255) NOT NULL,
55+
body JSON NOT NULL,
56+
occurred_on TIMESTAMP NOT NULL,
57+
PRIMARY KEY (id)
58+
)
59+
ENGINE = InnoDB
60+
DEFAULT CHARSET = utf8mb4
61+
COLLATE = utf8mb4_unicode_ci;

‎src/mooc/main/tv/codely/mooc/courses/domain/CourseDuration.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import tv.codely.shared.domain.StringValueObject;
44

55
public final class CourseDuration extends StringValueObject {
6-
76
public CourseDuration(String value) {
87
super(value);
98
}

‎src/mooc/main/tv/codely/mooc/courses/infrastructure/persistence/hibernate/Course.hbm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<hibernate-mapping>
77
<class name="tv.codely.mooc.courses.domain.Course" table="courses">
88
<composite-id name="id" class="tv.codely.mooc.courses.domain.CourseId" access="field">
9-
<key-property column="id" name="value" length="36" access="field"/>
9+
<key-property column="id" name="value" length="36" access="field" />
1010
</composite-id>
1111

1212
<component name="name" class="tv.codely.mooc.courses.domain.CourseName" access="field">

‎src/mooc/main/tv/codely/mooc/courses_counter/application/increment/IncrementCoursesCounterOnCourseCreated.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package tv.codely.mooc.courses_counter.application.increment;
22

33
import org.springframework.context.event.EventListener;
4-
import tv.codely.shared.domain.course.CourseCreatedDomainEvent;
54
import tv.codely.mooc.courses.domain.CourseId;
65
import tv.codely.shared.domain.Service;
76
import tv.codely.shared.domain.bus.event.DomainEventSubscriber;
7+
import tv.codely.shared.domain.course.CourseCreatedDomainEvent;
88

99
@Service
1010
@DomainEventSubscriber({CourseCreatedDomainEvent.class})

0 commit comments

Comments
 (0)