diff --git a/Lab5Client/build/libs/lab5.xml b/Lab5Client/build/libs/lab5.xml index 3f34189..9b16c6e 100644 --- a/Lab5Client/build/libs/lab5.xml +++ b/Lab5Client/build/libs/lab5.xml @@ -1,5 +1,23 @@ + + san + + 2.0 + 2.0 + + 2022-05-16 + 321 + 321321321231 + BLACK + CHINA + + 2.0 + 2.0 + 2 + 2 + + wasd diff --git a/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin index a95fe0f..e376eb7 100644 Binary files a/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/Lab5Core/build/classes/java/main/common/commandline/Executables.class b/Lab5Core/build/classes/java/main/common/commandline/Executables.class index 28a0429..fa60598 100644 Binary files a/Lab5Core/build/classes/java/main/common/commandline/Executables.class and b/Lab5Core/build/classes/java/main/common/commandline/Executables.class differ diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html index d7ffee1..b7ee41a 100644 --- a/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html +++ b/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html @@ -126,8 +126,8 @@
  • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html index c1246ab..0463406 100644 --- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html +++ b/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html @@ -97,8 +97,8 @@ diff --git a/Lab5Core/build/docs/javadoc/common/data/Person.html b/Lab5Core/build/docs/javadoc/common/data/Person.html index 0e300f9..90ec88c 100644 --- a/Lab5Core/build/docs/javadoc/common/data/Person.html +++ b/Lab5Core/build/docs/javadoc/common/data/Person.html @@ -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<

Method Summary

- + @@ -176,24 +176,28 @@ implements java.lang.Comparable<formatted()  + + + + - + - + - +
All Methods Instance Methods Concrete Methods All Methods Static Methods Instance Methods Concrete Methods 
Modifier and Type Method and Description
static voidincrementExistingPeople() 
void setHeight(java.lang.Integer height)
Сеттер для поля height
void setName(java.lang.String name)
Сеттер для поля name
void setPassportID(java.lang.String passportID)
Сеттер для поля passportID
void update(Person newPerson)
Метод, меняющий все значения полей человека (кроме id и creationDate) в соответствии @@ -277,6 +281,15 @@ implements java.lang.Comparable< + + + +
    +
  • +

    incrementExistingPeople

    +
    public static void incrementExistingPeople()
    +
    • +
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-tree.html b/Lab5Core/build/docs/javadoc/common/data/package-tree.html index 181af5e..34a5ecc 100644 --- a/Lab5Core/build/docs/javadoc/common/data/package-tree.html +++ b/Lab5Core/build/docs/javadoc/common/data/package-tree.html @@ -91,8 +91,8 @@
  • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
      -
    • common.data.Country (implements java.io.Serializable)
    • common.data.Color (implements java.io.Serializable)
      • +
    • common.data.Country (implements java.io.Serializable)
diff --git a/Lab5Core/build/docs/javadoc/index-all.html b/Lab5Core/build/docs/javadoc/index-all.html index 999b67a..5cd5655 100644 --- a/Lab5Core/build/docs/javadoc/index-all.html +++ b/Lab5Core/build/docs/javadoc/index-all.html @@ -380,6 +380,8 @@

I

+
incrementExistingPeople() - Static method in class common.data.Person
+
 
info() - Method in class common.collection.PeopleDatabase
 
input() - Method in class common.commandline.CommandLineHandler
diff --git a/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin index 5c50243..0f9e056 100644 Binary files a/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/Lab5Core/src/main/java/common/commandline/Executables.java b/Lab5Core/src/main/java/common/commandline/Executables.java index 6c48f47..c36c8bd 100644 --- a/Lab5Core/src/main/java/common/commandline/Executables.java +++ b/Lab5Core/src/main/java/common/commandline/Executables.java @@ -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); }), diff --git a/Lab5Core/src/main/java/common/data/Person.java b/Lab5Core/src/main/java/common/data/Person.java index 7055dba..280b3f6 100644 --- a/Lab5Core/src/main/java/common/data/Person.java +++ b/Lab5Core/src/main/java/common/data/Person.java @@ -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, 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, 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, Serializable { this.setPassportID(newPerson.passportID); } + public static void incrementExistingPeople() { + existingPeople++; + } + /** * Сеттер для поля name * diff --git a/Lab5Server/build/libs/lab5.xml b/Lab5Server/build/libs/lab5.xml index 48bc1c5..2cbb2fa 100644 --- a/Lab5Server/build/libs/lab5.xml +++ b/Lab5Server/build/libs/lab5.xml @@ -1,4 +1,58 @@ + + pop + + 2.0 + 2.0 + + 2022-05-16 + 1321 + 321312321312 + BLACK + CHINA + + 2.0 + 2.0 + 2 + 2 + + + + san + + 2.0 + 2.0 + + 2022-05-16 + 3123 + 3213213321 + BLACK + CHINA + + 2.0 + 2.0 + 2 + 2 + + + + wasd + + 2.0 + 2.0 + + 2022-05-16 + 321 + 321312321321 + BLACK + CHINA + + 2.0 + 2.0 + 2 + 2 + + 2022-05-10 diff --git a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin index 0d942fb..6567e59 100644 Binary files a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin differ