From 34381ddba504032072f8703cdebc2838a5733cba Mon Sep 17 00:00:00 2001 From: erius Date: Mon, 16 May 2022 16:42:21 +0300 Subject: [PATCH] fixed issue when person id wouldn't be unique when adding new person on server --- Lab5Client/build/libs/lab5.xml | 18 ++++++ .../compileJava/previous-compilation-data.bin | Bin 7433 -> 7433 bytes .../main/common/commandline/Executables.class | Bin 11839 -> 11979 bytes .../common/commandline/package-tree.html | 2 +- .../commandline/response/package-tree.html | 2 +- .../docs/javadoc/common/data/Person.html | 25 ++++++-- .../javadoc/common/data/package-tree.html | 2 +- Lab5Core/build/docs/javadoc/index-all.html | 2 + .../compileJava/previous-compilation-data.bin | Bin 8069 -> 8069 bytes .../java/common/commandline/Executables.java | 7 ++- .../src/main/java/common/data/Person.java | 15 ++--- Lab5Server/build/libs/lab5.xml | 54 ++++++++++++++++++ .../compileJava/previous-compilation-data.bin | Bin 1138 -> 1138 bytes 13 files changed, 110 insertions(+), 17 deletions(-) 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 a95fe0f4f18398ec67fedd7217bc95524617f8eb..e376eb7a95cc9412ec1f4ccc5e7c6298228f124d 100644 GIT binary patch delta 51 zcmV-30L=f1I*B^4c?S@B$V`bdO&tY8)hF6HSMZ3li3chL5PRz?8_4jpDMgOzGi)&E J*0aM5Mi3Rw6@&l) delta 51 zcmV-30L=f1I*B^4c?S^R%8vm>tqn8EmGJ JB(uW|Mi2$%6f6J$ diff --git a/Lab5Core/build/classes/java/main/common/commandline/Executables.class b/Lab5Core/build/classes/java/main/common/commandline/Executables.class index 28a0429e889479f4cfa87c295efd997d48f4a555..fa6059860b74b0ed64ceb849280bef008a755eea 100644 GIT binary patch delta 4405 zcmb7HcX(9Q693KJ-Q1haNwQfWAtZr-Kp>%pA_fE$kuFGVK|v`IK?p4%inxM^SPh5- z2Y~KQPAY=*q9=ot(cVeT&sAthZTzF zc(_h+wTG38=XzM>!Pn(H57#Tcz{6_A^If^Hc9fGDka4x=gr1g2t*ugyD;K%4fCZ@S z>ShHpZqklhW8`94C}{5Q3^ea#aJyV$uuftIH{eEBE;X`978|)tmKeEQmKwQ2SIcCv zpnxI;F(X$h;a1MCoH)0-(#TbM{%Qr+=tkuD88fQqRL>qib3|qJc{3)>$xM;u5o{#7 zHo!{|QUHU$v7W3Ie6HiOlFuqWKA-FPtmbnApBwqyBxp5t{Jim8o{dK%?Qw$7GW$n~iLdtwtV~I)kflwUKS|gulq-2i9S)zt#-txm|Wd7mU298GT7!cI6c#ugVg?MS5}JYm|CDLe27qQ1ngNY2+F-b!LlLilq-G?OTDvXdLn+%Y9DqUjT>+|3+kmx8D&Z9Dk*oTYE{?yN=@oYENxkB#smGFKKeAVfm8%&DGIHF;F!jG5Ca1zD3T|G^8*sjMC{Nzka>@ML_QhtH^*+`Ij0t`jy+ znv-ep4Z8;KD0of5mkK^ruv@_g3N|R%bBw}W3f?4eB2JdU%Xr1$4VDCN;cbKWNjg!d zk->-f$l!B)VelE=_TOvTOPbVX=B^jX_8)I{QtV1zzx4jO+M56|t7S0@W-)7KG0SE# zD`zo_XECpW#jK;nETzS)CN)QOjsTHn;J6{(6sfoww?J?!sa6nwX3hc+yyS8 zl?6z{#aK%!o06*W9_y*D)Yky+CD*}yv~+(8)>~IbzJ z$i?|6z%;bQbd;b9rI>-EF%zRO3u7=F^DqZXP|Zl@T6?46QT}e!pqALhZFmfuXd#RD zZ8NqozFeN&ipQC=Qp(q18$#4L9Z#Hv?M%}c48;y^yHwo?PvR*me445>>bSr&6wp9g z!8uGnQd~Ui;<=!U=Uu$u;zi&fx>@QaW{2%*1N^B?LDwV6nckof>X`lvUZrJ+QoILN z>fED7j8v&+^b9zgUY&y+j7JMhKx<6oSHUE!snC|WPcrNtiLkp+=j&`4)yX?zbvmtE zmmcwC!jUqek+mN$QwUDli9#{nG%I#S>%N0jjNeIwXV8@jW_1jj54qY*Nm?JVd|kB+M+ znVqzp8MjPH4rD92s_6XjM`Gzg$)3EkNAt4u;srSdy-~*KdNZ0nR%5a4moZ6=<%w7_ z7^_Y*hmsv^Q~_GysJ2$dwJWTb=ic>v%S?7iX0k&#<*n4C?V8n-Dyt`znwXs6oYhOF zx!~KyN*!odTCcM^F`~|ls0%y2tJM&%M$2Rb%@PstyV>@SUM{|~tge2=g}&duhwan& zrENofZK>TCIb`0(}rp#em{K z=~L)Dyf{cyI-+DVx^>u$nSEx zMCf=Hr(P8KoKS^mjH7sQI`TDE%Gc^zo{A@OK(au6k}cLFk;ojjm|pq-brjj6#S@tg zIZQR7_zY(@g;zgDl^(vu-gq=}ww)=Eyln_pM5_aJ%pE88+*%B@oO!`IRyEGKz;fn? z>NuX`oC_`IqLeyzL7cO|axQl3&?doIXgQa7b?gjmiK*(CWnCJfTv6iGBFkDFpf)<`SaR8Z0FW*I-$BEkr*#gs)pLorW-j^~z%s zTC78k^CQVI=>&ru{x7^9n;w^@sE%1@I83I!4Hmp2ZSMxaT+`6 z$Q6?K0gXiX7u}HnpP+;il-q#v8c?YXsBi-+tpQ~c6u)xSM0$hGj0RL@11gfB@(_@G uDUjx(tKQN_jjRlb~**gaWBOL=0qLdGO^$Lp>~;lVOdhW-~D1vOUy delta 4279 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 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 5c50243f7bcdd8bc2e208831f9f86a4b801d1d34..0f9e056a9af8b8bf3d7ab6e8fc2c914902b86231 100644 GIT binary patch delta 59 zcmV-B0L1@=KZQTAYXT5^>na<_@UtmJj_NaPFzD8kdjg#h!E7+Z&ue`0^P_=W2F, 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 0d942fb8947b82c0df54446b4c767788889140f9..6567e59519e185f261229036a2d747abd5b3b603 100644 GIT binary patch delta 28 kcmeyw@rh$Y0kc5W37<}5Us+b?tLnEb!#{LPZeacd0H^f~3IG5A delta 28 kcmeyw@rh$Y0kgpUQ~iw2wk~mp-!X{Qu!(J$+`#+^0IZq|ng9R*