erius/proglab5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed issue when person id wouldn't be unique when adding new person on server

Browse source
This commit is contained in:
Egor 2022-05-16 16:42:21 +03:00
parent d19dd08ec9
commit 34381ddba5
13 changed files with 110 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Lab5Client/build/libs/lab5.xml
View file

@ -1,5 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<peopleDatabase>
<person>
<name>san</name>
<coordinates>
<x>2.0</x>
<y>2.0</y>
</coordinates>
<creationDate>2022-05-16</creationDate>
<height>321</height>
<passportID>321321321231</passportID>
<eyeColor>BLACK</eyeColor>
<nationality>CHINA</nationality>
<location>
<x>2.0</x>
<y>2.0</y>
<z>2</z>
<name>2</name>
</location>
</person>
<person>
<name>wasd</name>
<coordinates>

BIN
Lab5Client/build/tmp/compileJava/previous-compilation-data.bin
View file

Binary file not shown.

BIN
Lab5Core/build/classes/java/main/common/commandline/Executables.class
View file

Binary file not shown.

2
Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
View file

@ -126,8 +126,8 @@
<ul>
<li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
<ul>
<li type="circle">common.commandline.<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline"><span class="typeNameLink">LongStrings</span></a></li>
<li type="circle">common.commandline.<a href="../../common/commandline/Executables.html" title="enum in common.commandline"><span class="typeNameLink">Executables</span></a></li>
<li type="circle">common.commandline.<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline"><span class="typeNameLink">LongStrings</span></a></li>
</ul>
</li>
</ul>

2
Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
View file

@ -97,8 +97,8 @@
<ul>
<li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
<ul>
<li type="circle">common.commandline.response.<a href="../../../common/commandline/response/PeopleDatabaseResponse.html" title="enum in common.commandline.response"><span class="typeNameLink">PeopleDatabaseResponse</span></a> (implements common.commandline.response.<a href="../../../common/commandline/response/Response.html" title="interface in common.commandline.response">Response</a>)</li>
<li type="circle">common.commandline.response.<a href="../../../common/commandline/response/DefaultResponse.html" title="enum in common.commandline.response"><span class="typeNameLink">DefaultResponse</span></a> (implements common.commandline.response.<a href="../../../common/commandline/response/Response.html" title="interface in common.commandline.response">Response</a>)</li>
<li type="circle">common.commandline.response.<a href="../../../common/commandline/response/PeopleDatabaseResponse.html" title="enum in common.commandline.response"><span class="typeNameLink">PeopleDatabaseResponse</span></a> (implements common.commandline.response.<a href="../../../common/commandline/response/Response.html" title="interface in common.commandline.response">Response</a>)</li>
</ul>
</li>
</ul>

25
Lab5Core/build/docs/javadoc/common/data/Person.html
View file

@ -17,8 +17,8 @@
catch(err) {
}
//-->
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
var tableTab = "tableTab";
@ -158,7 +158,7 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
</a>
<h3>Method Summary</h3>
<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
<th class="colLast" scope="col">Method and Description</th>
@ -176,24 +176,28 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#formatted--">formatted</a></span>()</code>&nbsp;</td>
</tr>
<tr id="i2" class="altColor">
<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#incrementExistingPeople--">incrementExistingPeople</a></span>()</code>&nbsp;</td>
</tr>
<tr id="i3" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#setHeight-java.lang.Integer-">setHeight</a></span>(java.lang.Integer&nbsp;height)</code>
<div class="block">Сеттер для поля height</div>
</td>
</tr>
<tr id="i3" class="rowColor">
<tr id="i4" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#setName-java.lang.String-">setName</a></span>(java.lang.String&nbsp;name)</code>
<div class="block">Сеттер для поля name</div>
</td>
</tr>
<tr id="i4" class="altColor">
<tr id="i5" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#setPassportID-java.lang.String-">setPassportID</a></span>(java.lang.String&nbsp;passportID)</code>
<div class="block">Сеттер для поля passportID</div>
</td>
</tr>
<tr id="i5" class="rowColor">
<tr id="i6" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#update-common.data.Person-">update</a></span>(<a href="../../common/data/Person.html" title="class in common.data">Person</a>&nbsp;newPerson)</code>
<div class="block">Метод, меняющий все значения полей человека (кроме <a href="../../common/data/Person.html#id"><code>id</code></a> и <a href="../../common/data/Person.html#creationDate"><code>creationDate</code></a>) в соответствии
@ -277,6 +281,15 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
</dl>
</li>
</ul>
<a name="incrementExistingPeople--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>incrementExistingPeople</h4>
<pre>public static&nbsp;void&nbsp;incrementExistingPeople()</pre>
</li>
</ul>
<a name="setName-java.lang.String-">
<!-- -->
</a>

2
Lab5Core/build/docs/javadoc/common/data/package-tree.html
View file

@ -91,8 +91,8 @@
<ul>
<li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
<ul>
<li type="circle">common.data.<a href="../../common/data/Country.html" title="enum in common.data"><span class="typeNameLink">Country</span></a> (implements java.io.Serializable)</li>
<li type="circle">common.data.<a href="../../common/data/Color.html" title="enum in common.data"><span class="typeNameLink">Color</span></a> (implements java.io.Serializable)</li>
<li type="circle">common.data.<a href="../../common/data/Country.html" title="enum in common.data"><span class="typeNameLink">Country</span></a> (implements java.io.Serializable)</li>
</ul>
</li>
</ul>

2
Lab5Core/build/docs/javadoc/index-all.html
View file

@ -380,6 +380,8 @@
</a>
<h2 class="title">I</h2>
<dl>
<dt><span class="memberNameLink"><a href="common/data/Person.html#incrementExistingPeople--">incrementExistingPeople()</a></span> - Static method in class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="common/collection/PeopleDatabase.html#info--">info()</a></span> - Method in class common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#input--">input()</a></span> - Method in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>

BIN
Lab5Core/build/tmp/compileJava/previous-compilation-data.bin
View file

Binary file not shown.

7
Lab5Core/src/main/java/common/commandline/Executables.java
View file

@ -15,7 +15,12 @@ public enum Executables {
PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
Person person = (Person) args[1];
boolean success = peopleDatabase.getCollection().add(person);
Response response = success ? DefaultResponse.OK : PeopleDatabaseResponse.FAILED_TO_ADD;
Response response = PeopleDatabaseResponse.FAILED_TO_ADD;
if (success) {
Person.incrementExistingPeople();
person.setId(Person.getExistingPeople());
response = DefaultResponse.OK;
}
return new CommandResult(response.getMsg(), response);
}),

15
Lab5Core/src/main/java/common/data/Person.java
View file

@ -1,9 +1,6 @@
package common.data;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.ToString;
import lombok.*;
import common.parser.Adapters;
import javax.xml.bind.annotation.*;
@ -24,13 +21,13 @@ public class Person implements Comparable<Person>, Serializable {
* Количество созданных людей, используется для задания
* уникального id для каждого объекта данного класса
*/
@XmlTransient
@XmlTransient @Getter
private static long existingPeople = 0;
/**
* Id человека, не может быть null, значение поля должно быть больше 0,
* значение этого поля должно быть уникальным, значение этого поля должно генерироваться автоматически
*/
@XmlTransient
@XmlTransient @Setter
private Long id;
/**
* Имя человека, не может быть null, строка не может быть пустой
@ -103,7 +100,7 @@ public class Person implements Comparable<Person>, Serializable {
*/
public Person(@NonNull String name, @NonNull Coordinates coordinates, Integer height, String passportID,
@NonNull Color eyeColor, @NonNull Country nationality, Location location) {
this.id = ++existingPeople;
this.id = existingPeople;
this.creationDate = LocalDate.now();
this.location = location;
this.coordinates = coordinates;
@ -130,6 +127,10 @@ public class Person implements Comparable<Person>, Serializable {
this.setPassportID(newPerson.passportID);
}
public static void incrementExistingPeople() {
existingPeople++;
}
/**
* Сеттер для поля name
*

54
Lab5Server/build/libs/lab5.xml
View file

@ -1,4 +1,58 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<peopleDatabase>
<person>
<name>pop</name>
<coordinates>
<x>2.0</x>
<y>2.0</y>
</coordinates>
<creationDate>2022-05-16</creationDate>
<height>1321</height>
<passportID>321312321312</passportID>
<eyeColor>BLACK</eyeColor>
<nationality>CHINA</nationality>
<location>
<x>2.0</x>
<y>2.0</y>
<z>2</z>
<name>2</name>
</location>
</person>
<person>
<name>san</name>
<coordinates>
<x>2.0</x>
<y>2.0</y>
</coordinates>
<creationDate>2022-05-16</creationDate>
<height>3123</height>
<passportID>3213213321</passportID>
<eyeColor>BLACK</eyeColor>
<nationality>CHINA</nationality>
<location>
<x>2.0</x>
<y>2.0</y>
<z>2</z>
<name>2</name>
</location>
</person>
<person>
<name>wasd</name>
<coordinates>
<x>2.0</x>
<y>2.0</y>
</coordinates>
<creationDate>2022-05-16</creationDate>
<height>321</height>
<passportID>321312321321</passportID>
<eyeColor>BLACK</eyeColor>
<nationality>CHINA</nationality>
<location>
<x>2.0</x>
<y>2.0</y>
<z>2</z>
<name>2</name>
</location>
</person>
<initDate>2022-05-10</initDate>
</peopleDatabase>

BIN
Lab5Server/build/tmp/compileJava/previous-compilation-data.bin
View file

Binary file not shown.