Skip to content

Commit 5cbf651

Browse files
sankypanhalesankypanhale
authored
Merge branch 'master' into master
2 parents 2dcf63c + e7b119c commit 5cbf651

File tree

686 files changed

+6664
-7849
lines changed

Some content is hidden

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

686 files changed

+6664
-7849
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ install:
1717
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -e
1818

1919
after_success:
20-
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_TOKEN
20+
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
2121
- bash update-ghpages.sh
2222

2323
# use latest java version available instead of travis default
@@ -36,4 +36,4 @@ notifications:
3636
on_failure: always # options: [always|never|change] default: always
3737
on_start: never # options: [always|never|change] default: always
3838

39-
sudo: required
39+
sudo: required

‎PULL_REQUEST_TEMPLATE.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
Pull request title
3+
4+
- Clearly and concisely describes what it does
5+
- Refer to the issue that it solves, if available
6+
7+
8+
Pull request description
9+
10+
- Describes the main changes that come with the pull request
11+
- Any relevant additional information is provided
12+
13+
14+
15+
> For detailed contributing instructions see https://github.com/iluwatar/java-design-patterns/wiki/01.-How-to-contribute

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
[![Build status](https://travis-ci.org/iluwatar/java-design-patterns.svg?branch=master)](https://travis-ci.org/iluwatar/java-design-patterns)
88
[![License MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/iluwatar/java-design-patterns/master/LICENSE.md)
99
[![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
10-
[![Quality Gate](https://sonarqube.com/api/badges/gate?key=com.iluwatar%3Ajava-design-patterns)](https://sonarqube.com/dashboard/index/com.iluwatar%3Ajava-design-patterns)
10+
[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=com.iluwatar%3Ajava-design-patterns)](https://sonarcloud.io/dashboard/index/com.iluwatar%3Ajava-design-patterns)
11+
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1503/badge)](https://bestpractices.coreinfrastructure.org/projects/1503)
1112

1213
# Introduction
1314

‎_scripts/postPumlsToServer.py

-67
This file was deleted.

‎abstract-document/README.md

-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ layout: pattern
33
title: Abstract Document
44
folder: abstract-document
55
permalink: /patterns/abstract-document/
6-
pumlid: PSjB3eCm34NHhPG599vtDyQn85L-ifzX-p3lxEf8Twj3MXGDQvyJMFubChxpKN767gucSq07iinEjSNDOACVNvoAUZr6MWoe3QVE_WRnxZ0Mf38b-hkIGlurX_MyehS7
76
categories: Structural
87
tags:
98
- Java
@@ -13,8 +12,6 @@ tags:
1312
## Intent
1413
Achieve flexibility of untyped languages and keep the type-safety
1514

16-
![alt text](./etc/abstract-document-base.png "Abstract Document Base")
17-
1815
![alt text](./etc/abstract-document.png "Abstract Document Traits and Domain")
1916

2017

‎abstract-document/etc/abstract-document-base.png

-14.6 KB
Binary file not shown.

‎abstract-document/etc/abstract-document-base.ucls

-58
This file was deleted.

‎abstract-document/etc/abstract-document.png

77.7 KB
Loading

‎abstract-document/etc/abstract-document.ucls

+88-42
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,137 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<class-diagram version="1.1.9" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
3-
realizations="true" associations="true" dependencies="false" nesting-relationships="true" router="FAN">
4-
<interface id="1" language="java" name="com.iluwatar.abstractdocument.Document" project="design-patterns"
5-
file="/design-patterns/src/com/iluwatar/abstractdocument/Document.java" binary="false" corner="BOTTOM_RIGHT">
6-
<position height="-1" width="-1" x="341" y="376"/>
2+
<class-diagram version="1.2.2" icons="true" always-add-relationships="false" generalizations="true" realizations="true"
3+
associations="true" dependencies="false" nesting-relationships="true" router="FAN">
4+
<class id="1" language="java" name="com.iluwatar.abstractdocument.AbstractDocument" project="abstract-document"
5+
file="/abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java" binary="false"
6+
corner="BOTTOM_RIGHT">
7+
<position height="-1" width="-1" x="659" y="286"/>
78
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
89
sort-features="false" accessors="true" visibility="true">
910
<attributes public="true" package="true" protected="true" private="true" static="true"/>
1011
<operations public="true" package="true" protected="true" private="true" static="true"/>
1112
</display>
12-
</interface>
13-
<interface id="2" language="java" name="com.iluwatar.abstractdocument.domain.HasModel" project="design-patterns"
14-
file="/design-patterns/src/com/iluwatar/abstractdocument/domain/HasModel.java" binary="false" corner="BOTTOM_RIGHT">
15-
<position height="81" width="173" x="41" y="194"/>
13+
</class>
14+
<interface id="2" language="java" name="com.iluwatar.abstractdocument.Document" project="abstract-document"
15+
file="/abstract-document/src/main/java/com/iluwatar/abstractdocument/Document.java" binary="false"
16+
corner="BOTTOM_RIGHT">
17+
<position height="-1" width="-1" x="562" y="27"/>
1618
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
1719
sort-features="false" accessors="true" visibility="true">
1820
<attributes public="true" package="true" protected="true" private="true" static="true"/>
1921
<operations public="true" package="true" protected="true" private="true" static="true"/>
2022
</display>
2123
</interface>
22-
<interface id="3" language="java" name="com.iluwatar.abstractdocument.domain.HasPrice" project="design-patterns"
23-
file="/design-patterns/src/com/iluwatar/abstractdocument/domain/HasPrice.java" binary="false" corner="BOTTOM_RIGHT">
24-
<position height="81" width="175" x="254" y="194"/>
24+
<class id="3" language="java" name="com.iluwatar.abstractdocument.domain.Car" project="abstract-document"
25+
file="/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Car.java" binary="false"
26+
corner="BOTTOM_RIGHT">
27+
<position height="-1" width="-1" x="348" y="737"/>
28+
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
29+
sort-features="false" accessors="true" visibility="true">
30+
<attributes public="true" package="true" protected="true" private="true" static="true"/>
31+
<operations public="true" package="true" protected="true" private="true" static="true"/>
32+
</display>
33+
</class>
34+
<class id="4" language="java" name="com.iluwatar.abstractdocument.domain.Part" project="abstract-document"
35+
file="/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Part.java" binary="false"
36+
corner="BOTTOM_RIGHT">
37+
<position height="-1" width="-1" x="760" y="746"/>
38+
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
39+
sort-features="false" accessors="true" visibility="true">
40+
<attributes public="true" package="true" protected="true" private="true" static="true"/>
41+
<operations public="true" package="true" protected="true" private="true" static="true"/>
42+
</display>
43+
</class>
44+
<interface id="5" language="java" name="com.iluwatar.abstractdocument.domain.HasModel" project="abstract-document"
45+
file="/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasModel.java" binary="false"
46+
corner="BOTTOM_RIGHT">
47+
<position height="-1" width="-1" x="355" y="297"/>
2548
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
2649
sort-features="false" accessors="true" visibility="true">
2750
<attributes public="true" package="true" protected="true" private="true" static="true"/>
2851
<operations public="true" package="true" protected="true" private="true" static="true"/>
2952
</display>
3053
</interface>
31-
<interface id="4" language="java" name="com.iluwatar.abstractdocument.domain.HasParts" project="design-patterns"
32-
file="/design-patterns/src/com/iluwatar/abstractdocument/domain/HasParts.java" binary="false" corner="BOTTOM_RIGHT">
33-
<position height="81" width="173" x="469" y="194"/>
54+
<interface id="6" language="java" name="com.iluwatar.abstractdocument.domain.HasParts" project="abstract-document"
55+
file="/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasParts.java" binary="false"
56+
corner="BOTTOM_RIGHT">
57+
<position height="-1" width="-1" x="109" y="297"/>
3458
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
3559
sort-features="false" accessors="true" visibility="true">
3660
<attributes public="true" package="true" protected="true" private="true" static="true"/>
3761
<operations public="true" package="true" protected="true" private="true" static="true"/>
3862
</display>
3963
</interface>
40-
<class id="5" language="java" name="com.iluwatar.abstractdocument.domain.Car" project="design-patterns"
41-
file="/design-patterns/src/com/iluwatar/abstractdocument/domain/Car.java" binary="false" corner="BOTTOM_RIGHT">
42-
<position height="99" width="173" x="254" y="37"/>
64+
<interface id="7" language="java" name="com.iluwatar.abstractdocument.domain.HasPrice" project="abstract-document"
65+
file="/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasPrice.java" binary="false"
66+
corner="BOTTOM_RIGHT">
67+
<position height="-1" width="-1" x="1008" y="283"/>
4368
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
4469
sort-features="false" accessors="true" visibility="true">
4570
<attributes public="true" package="true" protected="true" private="true" static="true"/>
4671
<operations public="true" package="true" protected="true" private="true" static="true"/>
4772
</display>
48-
</class>
49-
<class id="6" language="java" name="com.iluwatar.abstractdocument.domain.Part" project="design-patterns"
50-
file="/design-patterns/src/com/iluwatar/abstractdocument/domain/Part.java" binary="false" corner="BOTTOM_RIGHT">
51-
<position height="99" width="173" x="41" y="37"/>
73+
</interface>
74+
<interface id="8" language="java" name="com.iluwatar.abstractdocument.domain.HasType" project="abstract-document"
75+
file="/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasType.java" binary="false"
76+
corner="BOTTOM_RIGHT">
77+
<position height="-1" width="-1" x="1257" y="277"/>
5278
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
5379
sort-features="false" accessors="true" visibility="true">
5480
<attributes public="true" package="true" protected="true" private="true" static="true"/>
5581
<operations public="true" package="true" protected="true" private="true" static="true"/>
5682
</display>
57-
</class>
58-
<realization id="7">
59-
<end type="SOURCE" refId="5"/>
60-
<end type="TARGET" refId="2"/>
83+
</interface>
84+
<realization id="9">
85+
<end type="SOURCE" refId="4"/>
86+
<end type="TARGET" refId="8"/>
87+
</realization>
88+
<realization id="10">
89+
<end type="SOURCE" refId="3"/>
90+
<end type="TARGET" refId="7"/>
6191
</realization>
62-
<realization id="8">
92+
<generalization id="11">
6393
<end type="SOURCE" refId="6"/>
6494
<end type="TARGET" refId="2"/>
65-
</realization>
66-
<generalization id="9">
67-
<end type="SOURCE" refId="2"/>
68-
<end type="TARGET" refId="1"/>
6995
</generalization>
70-
<realization id="10">
71-
<end type="SOURCE" refId="5"/>
72-
<end type="TARGET" refId="3"/>
96+
<realization id="12">
97+
<end type="SOURCE" refId="4"/>
98+
<end type="TARGET" refId="5"/>
7399
</realization>
74-
<realization id="11">
75-
<end type="SOURCE" refId="5"/>
76-
<end type="TARGET" refId="4"/>
100+
<realization id="13">
101+
<end type="SOURCE" refId="4"/>
102+
<end type="TARGET" refId="7"/>
77103
</realization>
78-
<generalization id="12">
104+
<generalization id="14">
79105
<end type="SOURCE" refId="3"/>
80106
<end type="TARGET" refId="1"/>
81107
</generalization>
82-
<generalization id="13">
108+
<realization id="15">
109+
<end type="SOURCE" refId="3"/>
110+
<end type="TARGET" refId="6"/>
111+
</realization>
112+
<generalization id="16">
113+
<end type="SOURCE" refId="8"/>
114+
<end type="TARGET" refId="2"/>
115+
</generalization>
116+
<generalization id="17">
117+
<end type="SOURCE" refId="7"/>
118+
<end type="TARGET" refId="2"/>
119+
</generalization>
120+
<realization id="18">
121+
<end type="SOURCE" refId="3"/>
122+
<end type="TARGET" refId="5"/>
123+
</realization>
124+
<generalization id="19">
83125
<end type="SOURCE" refId="4"/>
84126
<end type="TARGET" refId="1"/>
85127
</generalization>
86-
<realization id="14">
87-
<end type="SOURCE" refId="6"/>
88-
<end type="TARGET" refId="3"/>
128+
<generalization id="20">
129+
<end type="SOURCE" refId="5"/>
130+
<end type="TARGET" refId="2"/>
131+
</generalization>
132+
<realization id="21">
133+
<end type="SOURCE" refId="1"/>
134+
<end type="TARGET" refId="2"/>
89135
</realization>
90136
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
91137
sort-features="false" accessors="true" visibility="true">

0 commit comments

Comments
 (0)