Skip to content

Commit 3d488ec

Browse files
iluwatariluwatar
committed
iluwatar#108 Consistent package naming throughout the examples
1 parent af92d8d commit 3d488ec

File tree

128 files changed

+939
-849
lines changed

Some content is hidden

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

128 files changed

+939
-849
lines changed

‎business-delegate/etc/business-delegate.ucls

+53-30
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,69 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
33
realizations="true" associations="true" dependencies="false" nesting-relationships="true">
4-
<class id="1" language="java" name="com.iluwatar.BusinessDelegate" project="business-delegate"
5-
file="/business-delegate/src/main/java/com/iluwatar/BusinessDelegate.java" binary="false" corner="BOTTOM_RIGHT">
4+
<class id="1" language="java" name="com.iluwatar.business.delegate.BusinessDelegate" project="business-delegate"
5+
file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.java" binary="false"
6+
corner="BOTTOM_RIGHT">
67
<position height="-1" width="-1" x="272" y="219"/>
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>
1213
</class>
13-
<class id="2" language="java" name="com.iluwatar.Client" project="business-delegate"
14-
file="/business-delegate/src/main/java/com/iluwatar/Client.java" binary="false" corner="BOTTOM_RIGHT">
14+
<class id="2" language="java" name="com.iluwatar.business.delegate.Client" project="business-delegate"
15+
file="/business-delegate/src/main/java/com/iluwatar/business/delegate/Client.java" binary="false"
16+
corner="BOTTOM_RIGHT">
1517
<position height="-1" width="-1" x="272" y="64"/>
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
</class>
22-
<enumeration id="3" language="java" name="com.iluwatar.ServiceType" project="business-delegate"
23-
file="/business-delegate/src/main/java/com/iluwatar/ServiceType.java" binary="false" corner="BOTTOM_RIGHT">
24+
<enumeration id="3" language="java" name="com.iluwatar.business.delegate.ServiceType" project="business-delegate"
25+
file="/business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.java" binary="false"
26+
corner="BOTTOM_RIGHT">
2427
<position height="-1" width="-1" x="89" y="383"/>
2528
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
2629
sort-features="false" accessors="true" visibility="true">
2730
<attributes public="true" package="true" protected="true" private="true" static="true"/>
2831
<operations public="true" package="true" protected="true" private="true" static="true"/>
2932
</display>
3033
</enumeration>
31-
<interface id="4" language="java" name="com.iluwatar.BusinessService" project="business-delegate"
32-
file="/business-delegate/src/main/java/com/iluwatar/BusinessService.java" binary="false" corner="BOTTOM_RIGHT">
34+
<interface id="4" language="java" name="com.iluwatar.business.delegate.BusinessService" project="business-delegate"
35+
file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessService.java" binary="false"
36+
corner="BOTTOM_RIGHT">
3337
<position height="-1" width="-1" x="630" y="365"/>
3438
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
3539
sort-features="false" accessors="true" visibility="true">
3640
<attributes public="true" package="true" protected="true" private="true" static="true"/>
3741
<operations public="true" package="true" protected="true" private="true" static="true"/>
3842
</display>
3943
</interface>
40-
<class id="5" language="java" name="com.iluwatar.JmsService" project="business-delegate"
41-
file="/business-delegate/src/main/java/com/iluwatar/JmsService.java" binary="false" corner="BOTTOM_RIGHT">
44+
<class id="5" language="java" name="com.iluwatar.business.delegate.JmsService" project="business-delegate"
45+
file="/business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.java" binary="false"
46+
corner="BOTTOM_RIGHT">
4247
<position height="-1" width="-1" x="489" y="210"/>
4348
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
4449
sort-features="false" accessors="true" visibility="true">
4550
<attributes public="true" package="true" protected="true" private="true" static="true"/>
4651
<operations public="true" package="true" protected="true" private="true" static="true"/>
4752
</display>
4853
</class>
49-
<class id="6" language="java" name="com.iluwatar.BusinessLookup" project="business-delegate"
50-
file="/business-delegate/src/main/java/com/iluwatar/BusinessLookup.java" binary="false" corner="BOTTOM_RIGHT">
54+
<class id="6" language="java" name="com.iluwatar.business.delegate.BusinessLookup" project="business-delegate"
55+
file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.java" binary="false"
56+
corner="BOTTOM_RIGHT">
5157
<position height="-1" width="-1" x="360" y="399"/>
5258
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
5359
sort-features="false" accessors="true" visibility="true">
5460
<attributes public="true" package="true" protected="true" private="true" static="true"/>
5561
<operations public="true" package="true" protected="true" private="true" static="true"/>
5662
</display>
5763
</class>
58-
<class id="7" language="java" name="com.iluwatar.EjbService" project="business-delegate"
59-
file="/business-delegate/src/main/java/com/iluwatar/EjbService.java" binary="false" corner="BOTTOM_RIGHT">
64+
<class id="7" language="java" name="com.iluwatar.business.delegate.EjbService" project="business-delegate"
65+
file="/business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.java" binary="false"
66+
corner="BOTTOM_RIGHT">
6067
<position height="-1" width="-1" x="668" y="210"/>
6168
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
6269
sort-features="false" accessors="true" visibility="true">
@@ -68,40 +75,56 @@
6875
<end type="SOURCE" refId="7"/>
6976
<end type="TARGET" refId="4"/>
7077
</realization>
71-
<realization id="9">
72-
<end type="SOURCE" refId="5"/>
73-
<end type="TARGET" refId="4"/>
74-
</realization>
75-
<association id="10">
78+
<association id="9">
7679
<end type="SOURCE" refId="1" navigable="false">
77-
<attribute id="11" name="lookupService"/>
78-
<multiplicity id="12" minimum="0" maximum="1"/>
80+
<attribute id="10" name="lookupService">
81+
<position height="0" width="0" x="0" y="0"/>
82+
</attribute>
83+
<multiplicity id="11" minimum="0" maximum="1">
84+
<position height="0" width="0" x="0" y="0"/>
85+
</multiplicity>
7986
</end>
8087
<end type="TARGET" refId="6" navigable="true"/>
8188
<display labels="true" multiplicity="true"/>
8289
</association>
83-
<association id="13">
90+
<association id="12">
8491
<end type="SOURCE" refId="1" navigable="false">
85-
<attribute id="14" name="businessService"/>
86-
<multiplicity id="15" minimum="0" maximum="1"/>
92+
<attribute id="13" name="serviceType">
93+
<position height="0" width="0" x="0" y="0"/>
94+
</attribute>
95+
<multiplicity id="14" minimum="0" maximum="1">
96+
<position height="0" width="0" x="0" y="0"/>
97+
</multiplicity>
8798
</end>
88-
<end type="TARGET" refId="4" navigable="true"/>
99+
<end type="TARGET" refId="3" navigable="true"/>
89100
<display labels="true" multiplicity="true"/>
90101
</association>
102+
<realization id="15">
103+
<end type="SOURCE" refId="5"/>
104+
<end type="TARGET" refId="4"/>
105+
</realization>
91106
<association id="16">
92107
<end type="SOURCE" refId="2" navigable="false">
93-
<attribute id="17" name="businessDelegate"/>
94-
<multiplicity id="18" minimum="0" maximum="1"/>
108+
<attribute id="17" name="businessDelegate">
109+
<position height="0" width="0" x="0" y="0"/>
110+
</attribute>
111+
<multiplicity id="18" minimum="0" maximum="1">
112+
<position height="0" width="0" x="0" y="0"/>
113+
</multiplicity>
95114
</end>
96115
<end type="TARGET" refId="1" navigable="true"/>
97116
<display labels="true" multiplicity="true"/>
98117
</association>
99118
<association id="19">
100119
<end type="SOURCE" refId="1" navigable="false">
101-
<attribute id="20" name="serviceType"/>
102-
<multiplicity id="21" minimum="0" maximum="1"/>
120+
<attribute id="20" name="businessService">
121+
<position height="0" width="0" x="0" y="0"/>
122+
</attribute>
123+
<multiplicity id="21" minimum="0" maximum="1">
124+
<position height="0" width="0" x="0" y="0"/>
125+
</multiplicity>
103126
</end>
104-
<end type="TARGET" refId="3" navigable="true"/>
127+
<end type="TARGET" refId="4" navigable="true"/>
105128
<display labels="true" multiplicity="true"/>
106129
</association>
107130
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"

‎business-delegate/src/main/java/com/iluwatar/App.java ‎business-delegate/src/main/java/com/iluwatar/business/delegate/App.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.business.delegate;
22

33
/**
44
*

‎business-delegate/src/main/java/com/iluwatar/BusinessDelegate.java ‎business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.business.delegate;
22

33
/**
44
*

‎business-delegate/src/main/java/com/iluwatar/BusinessLookup.java ‎business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.business.delegate;
22

33
/**
44
*

‎business-delegate/src/main/java/com/iluwatar/BusinessService.java ‎business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.business.delegate;
22

33
/**
44
*

‎business-delegate/src/main/java/com/iluwatar/Client.java ‎business-delegate/src/main/java/com/iluwatar/business/delegate/Client.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.business.delegate;
22

33
/**
44
*

‎business-delegate/src/main/java/com/iluwatar/EjbService.java ‎business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.business.delegate;
22

33
/**
44
*

‎business-delegate/src/main/java/com/iluwatar/JmsService.java ‎business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.business.delegate;
22

33
/**
44
*

‎business-delegate/src/main/java/com/iluwatar/ServiceType.java ‎business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.business.delegate;
22

33
/**
44
*

‎object-pool/src/test/java/com/iluwatar/objectpool/AppTest.java ‎business-delegate/src/test/java/com/iluwatar/business/delegate/AppTest.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.iluwatar.objectpool;
2-
3-
import org.junit.Test;
4-
5-
import com.iluwatar.objectpool.App;
6-
7-
public class AppTest {
8-
9-
@Test
10-
public void test() {
11-
String[] args = {};
12-
App.main(args);
13-
}
14-
}
1+
package com.iluwatar.business.delegate;
2+
3+
import org.junit.Test;
4+
5+
import com.iluwatar.business.delegate.App;
6+
7+
public class AppTest {
8+
9+
@Test
10+
public void test() {
11+
String[] args = {};
12+
App.main(args);
13+
}
14+
}

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/AdvancedWizard.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/AdvancedWizard.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
/**
44
*

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/App.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/App.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
import com.google.inject.Guice;
44
import com.google.inject.Injector;

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/GuiceWizard.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/GuiceWizard.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
import javax.inject.Inject;
44

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/OldTobyTobacco.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/OldTobyTobacco.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
/**
44
*

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/RivendellTobacco.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/RivendellTobacco.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
/**
44
*

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/SecondBreakfastTobacco.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/SecondBreakfastTobacco.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
/**
44
*

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/SimpleWizard.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/SimpleWizard.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
/**
44
*

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/Tobacco.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/Tobacco.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
/**
44
*

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/TobaccoModule.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/TobaccoModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
import com.google.inject.AbstractModule;
44

‎dependency-injection/src/main/java/com/iluwatar/dependencyinjection/Wizard.java ‎dependency-injection/src/main/java/com/iluwatar/dependency/injection/Wizard.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
/**
44
*

‎dependency-injection/src/test/java/com/iluwatar/dependencyinjection/AppTest.java ‎dependency-injection/src/test/java/com/iluwatar/dependency/injection/AppTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.iluwatar.dependencyinjection;
1+
package com.iluwatar.dependency.injection;
22

33
import org.junit.Test;
44

5-
import com.iluwatar.dependencyinjection.App;
5+
import com.iluwatar.dependency.injection.App;
66

77
public class AppTest {
88

‎double-checked-locking/etc/double-checked-locking.ucls

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
33
realizations="true" associations="true" dependencies="false" nesting-relationships="true">
4-
<class id="1" language="java" name="com.iluwatar.doublecheckedlocking.Item" project="double-checked-locking"
5-
file="/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java" binary="false"
4+
<class id="1" language="java" name="com.iluwatar.doublechecked.locking.Item" project="double-checked-locking"
5+
file="/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java" binary="false"
66
corner="BOTTOM_RIGHT">
77
<position height="124" width="205" x="146" y="504"/>
88
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -11,8 +11,8 @@
1111
<operations public="true" package="true" protected="true" private="true" static="true"/>
1212
</display>
1313
</class>
14-
<class id="2" language="java" name="com.iluwatar.doublecheckedlocking.Inventory" project="double-checked-locking"
15-
file="/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java" binary="false"
14+
<class id="2" language="java" name="com.iluwatar.doublechecked.locking.Inventory" project="double-checked-locking"
15+
file="/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java" binary="false"
1616
corner="BOTTOM_RIGHT">
1717
<position height="142" width="205" x="146" y="322"/>
1818
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -23,8 +23,12 @@
2323
</class>
2424
<association id="3">
2525
<end type="SOURCE" refId="2" navigable="false">
26-
<attribute id="4" name="items"/>
27-
<multiplicity id="5" minimum="0" maximum="2147483647"/>
26+
<attribute id="4" name="items">
27+
<position height="0" width="0" x="0" y="0"/>
28+
</attribute>
29+
<multiplicity id="5" minimum="0" maximum="2147483647">
30+
<position height="0" width="0" x="0" y="0"/>
31+
</multiplicity>
2832
</end>
2933
<end type="TARGET" refId="1" navigable="true"/>
3034
<display labels="true" multiplicity="true"/>

‎double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/App.java ‎double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.doublecheckedlocking;
1+
package com.iluwatar.doublechecked.locking;
22

33
import java.util.concurrent.ExecutorService;
44
import java.util.concurrent.Executors;

‎double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java ‎double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.doublecheckedlocking;
1+
package com.iluwatar.doublechecked.locking;
22

33
import java.util.ArrayList;
44
import java.util.List;

‎double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java ‎double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.doublecheckedlocking;
1+
package com.iluwatar.doublechecked.locking;
22

33
public class Item {
44
String name;

‎factory-method/src/test/java/com/iluwatar/factorymethod/AppTest.java ‎double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/AppTest.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.iluwatar.factorymethod;
2-
3-
import org.junit.Test;
4-
5-
import com.iluwatar.factorymethod.App;
6-
7-
public class AppTest {
8-
9-
@Test
10-
public void test() {
11-
String[] args = {};
12-
App.main(args);
13-
}
14-
}
1+
package com.iluwatar.doublechecked.locking;
2+
3+
import org.junit.Test;
4+
5+
import com.iluwatar.doublechecked.locking.App;
6+
7+
public class AppTest {
8+
9+
@Test
10+
public void test() {
11+
String[] args = {};
12+
App.main(args);
13+
}
14+
}

0 commit comments

Comments
 (0)