From e9d2855546f1c06ab06727014e915e7eaafa125d Mon Sep 17 00:00:00 2001 From: jonahkh <jonah@omnitracs.com> Date: Thu, 14 May 2020 20:18:22 +0200 Subject: [PATCH] removed json ignore annotations which prevented proper serializaton --- adopt-a-pup/.idea/workspace.xml | 349 ++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 205 insertions(+), 144 deletions(-) diff --git a/adopt-a-pup/.idea/workspace.xml b/adopt-a-pup/.idea/workspace.xml index 40156bc..08a730b 100644 --- a/adopt-a-pup/.idea/workspace.xml +++ b/adopt-a-pup/.idea/workspace.xml @@ -2,7 +2,10 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="f788b161-9af5-4988-b67e-058c2cc6689b" name="Default Changelist" comment=""> - <change beforePath="$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/ShelterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/ShelterController.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Animal.java" beforeDir="false" afterPath="$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Animal.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/adoption-service/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/adoption-service/src/main/resources/application.properties" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/model/Animal.java" beforeDir="false" afterPath="$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/model/Animal.java" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/user-service/target/" /> <ignored path="$PROJECT_DIR$/adoption-service/target/" /> @@ -19,14 +22,14 @@ <favorites_list name="adopt-a-pup" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.9"> + <splitter split-orientation="horizontal" split-proportion="0.39863482"> <split-first> <leaf> <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/AnimalController.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="275"> - <caret line="35" column="26" selection-start-line="35" selection-start-column="26" selection-end-line="35" selection-end-column="26" /> + <state relative-caret-position="90"> + <caret line="22" column="14" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" /> <folding> <element signature="e#1748#1749#0" expanded="true" /> <element signature="e#1809#1810#0" expanded="true" /> @@ -38,7 +41,7 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/service/AnimalService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1484"> + <state relative-caret-position="457"> <caret line="139" column="24" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" /> <folding> <element signature="e#6776#6777#0" expanded="true" /> @@ -49,31 +52,10 @@ </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/AnimalServiceApplication.java"> + <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_15.txt"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="360"> - <caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/animal-service/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="330"> - <caret line="25" column="20" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/service/ShelterService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="36" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" /> + <state> + <caret column="56" selection-end-column="58" /> </state> </provider> </entry> @@ -90,11 +72,11 @@ </provider> </entry> </file> - <file pinned="false" current-in-tab="false"> + <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/service/AdoptionService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="320"> - <caret line="32" column="135" selection-start-line="32" selection-start-column="120" selection-end-line="32" selection-end-column="135" /> + <state relative-caret-position="475"> + <caret line="44" selection-start-line="44" selection-end-line="44" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -102,20 +84,29 @@ </provider> </entry> </file> - <file pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/ShelterController.java"> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/adoption-service/src/main/resources/application.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="14" column="26" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" /> + <state relative-caret-position="105"> + <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_21.json"> + <entry file="file://$PROJECT_DIR$/animal-service/src/main/resources/application.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" /> + <state> + <caret selection-end-line="6" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/ShelterController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" /> </state> </provider> </entry> @@ -123,8 +114,17 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_22.json"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="77"> - <caret line="8" column="33" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" /> + <state relative-caret-position="165"> + <caret line="11" column="3" selection-start-line="1" selection-start-column="2" selection-end-line="11" selection-end-column="3" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_21.json"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="210"> + <caret line="14" column="2" lean-forward="true" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" /> </state> </provider> </entry> @@ -133,11 +133,20 @@ </split-first> <split-second> <leaf> - <file pinned="false" current-in-tab="true"> + <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/model/Animal.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="21" column="29" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" /> + <state relative-caret-position="135"> + <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Shelter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="195"> + <caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" /> </state> </provider> </entry> @@ -146,7 +155,16 @@ <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/model/Shelter.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="285"> - <caret line="23" selection-start-line="23" selection-end-line="23" /> + <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Animal.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="180"> + <caret line="17" column="7" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" /> </state> </provider> </entry> @@ -196,19 +214,21 @@ <option value="$PROJECT_DIR$/user-service/src/main/resources/application.properties" /> <option value="$PROJECT_DIR$/shelter-service/src/main/resources/application.properties" /> <option value="$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/model/Shelter.java" /> - <option value="$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Animal.java" /> - <option value="$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/model/Animal.java" /> <option value="$PROJECT_DIR$/user-service/src/main/java/com/redhat/do328/adoptApup/userservice/model/User.java" /> <option value="$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Shelter.java" /> <option value="$PROJECT_DIR$/user-service/.gitignore" /> - <option value="$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/service/AnimalService.java" /> <option value="$PROJECT_DIR$/.gitignore" /> - <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_21.json" /> <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_22.json" /> <option value="$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/AnimalController.java" /> <option value="$PROJECT_DIR$/animal-service/pom.xml" /> <option value="$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/AnimalServiceApplication.java" /> <option value="$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/ShelterController.java" /> + <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_15.txt" /> + <option value="$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/service/AnimalService.java" /> + <option value="$PROJECT_DIR$/adoption-service/src/main/resources/application.properties" /> + <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_21.json" /> + <option value="$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/model/Animal.java" /> + <option value="$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Animal.java" /> </list> </option> </component> @@ -298,7 +318,25 @@ <item name="main" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" /> <item name="adoptionservice" type="462c0819:PsiDirectoryNode" /> + <item name="model" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="adopt-a-pup" type="b2602c69:ProjectViewProjectNode" /> + <item name="adopt-a-pup" type="462c0819:PsiDirectoryNode" /> + <item name="adoption-service" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="adoptionservice" type="462c0819:PsiDirectoryNode" /> <item name="service" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="adopt-a-pup" type="b2602c69:ProjectViewProjectNode" /> + <item name="adopt-a-pup" type="462c0819:PsiDirectoryNode" /> + <item name="adoption-service" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> </path> <path> <item name="adopt-a-pup" type="b2602c69:ProjectViewProjectNode" /> @@ -354,6 +392,14 @@ <item name="java" type="462c0819:PsiDirectoryNode" /> <item name="animalservice" type="462c0819:PsiDirectoryNode" /> <item name="service" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="adopt-a-pup" type="b2602c69:ProjectViewProjectNode" /> + <item name="adopt-a-pup" type="462c0819:PsiDirectoryNode" /> + <item name="animal-service" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> </path> <path> <item name="adopt-a-pup" type="b2602c69:ProjectViewProjectNode" /> @@ -428,14 +474,15 @@ </panes> </component> <component name="PropertiesComponent"> + <property name="ExpandSpringBootJavaOptionsPanel" value="true" /> <property name="RequestMappingsPanelOrder0" value="0" /> <property name="RequestMappingsPanelOrder1" value="1" /> <property name="RequestMappingsPanelWidth0" value="75" /> <property name="RequestMappingsPanelWidth1" value="75" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1589478197405" /> - <property name="com.intellij.ide.scratch.LRUPopupBuilder$1/New Scratch File" value="JSON yaml" /> + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1589480251948" /> + <property name="com.intellij.ide.scratch.LRUPopupBuilder$1/New Scratch File" value="TEXT JSON yaml" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/animal-service/pom.xml" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" /> @@ -465,7 +512,7 @@ </list> </option> </component> - <component name="RunManager" selected="Spring Boot.ShelterServiceApplication"> + <component name="RunManager" selected="Spring Boot.AdoptionServiceApplication"> <configuration name="animal-service [spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven"> <MavenSettings> <option name="myGeneralSettings" /> @@ -520,6 +567,8 @@ <configuration name="AdoptionServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <module name="adoption-service" /> <option name="SPRING_BOOT_MAIN_CLASS" value="com.redhat.do328.adoptApup.adoptionservice.AdoptionServiceApplication" /> + <option name="VM_PARAMETERS" value="-Dserver.port=8081" /> + <option name="ALTERNATIVE_JRE_PATH" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -534,6 +583,8 @@ <configuration name="ShelterServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <module name="shelter-service" /> <option name="SPRING_BOOT_MAIN_CLASS" value="com.redhat.do328.adoptApup.shelterservice.ShelterServiceApplication" /> + <option name="VM_PARAMETERS" value="-Dserver.port=8082" /> + <option name="ALTERNATIVE_JRE_PATH" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -570,13 +621,13 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="27875000" /> + <option name="totallyTimeSpent" value="29906000" /> </component> <component name="ToolWindowManager"> <frame x="1920" y="27" width="1920" height="1053" extended-state="6" /> <editor active="true" /> <layout> - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993046" visible="true" weight="0.21504803" /> + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993046" visible="true" weight="0.21824974" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Image Layers" order="2" /> <window_info id="Designer" order="3" /> @@ -587,19 +638,19 @@ <window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Run" order="2" weight="0.58733624" /> - <window_info anchor="bottom" id="Debug" order="3" weight="0.2849345" /> + <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.3231441" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Database Changes" order="9" /> - <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.21506551" /> + <window_info anchor="bottom" id="Terminal" order="10" weight="0.03181336" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Spring" order="12" /> <window_info anchor="bottom" id="Run with VisualVM" order="13" /> <window_info anchor="bottom" id="Java Enterprise" order="14" /> - <window_info anchor="bottom" id="Messages" order="15" /> + <window_info anchor="bottom" id="Messages" order="15" weight="0.45174974" /> <window_info anchor="bottom" id="Debug with VisualVM" order="16" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> @@ -607,7 +658,7 @@ <window_info anchor="right" id="Palette" order="3" /> <window_info anchor="right" id="Jenkins" order="4" /> <window_info anchor="right" id="Theme Preview" order="5" /> - <window_info anchor="right" id="Maven" order="6" visible="true" weight="0.12753469" /> + <window_info anchor="right" id="Maven" order="6" weight="0.12753469" /> <window_info anchor="right" id="Capture Analysis" order="7" /> <window_info anchor="right" id="Palette	" order="8" /> <window_info anchor="right" id="Database" order="9" /> @@ -621,16 +672,12 @@ <breakpoint-manager> <breakpoints> <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/AnimalController.java</url> - <line>29</line> - <properties /> - <option name="timeStamp" value="2" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/AnimalController.java</url> - <line>28</line> - <properties /> - <option name="timeStamp" value="3" /> + <url>file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/service/AdoptionService.java</url> + <line>44</line> + <properties> + <option name="lambda-ordinal" value="-1" /> + </properties> + <option name="timeStamp" value="6" /> </line-breakpoint> </breakpoints> </breakpoint-manager> @@ -707,13 +754,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="30"> <caret line="2" column="32" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Shelter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="195"> - <caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" /> </state> </provider> </entry> @@ -828,13 +868,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Animal.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="135"> - <caret line="14" column="15" lean-forward="true" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/AnimalList.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="180"> @@ -842,13 +875,6 @@ <folding> <element signature="imports" expanded="true" /> </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/animal-service/src/main/resources/application.properties"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="90"> - <caret line="6" selection-start-line="6" selection-end-line="6" /> </state> </provider> </entry> @@ -866,60 +892,10 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/model/Shelter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="285"> - <caret line="23" selection-start-line="23" selection-end-line="23" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/model/Animal.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="21" column="29" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/service/ShelterService.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="75"> <caret line="5" column="36" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" /> - </state> - </provider> - </entry> - <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_21.json"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" /> - </state> - </provider> - </entry> - <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_22.json"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="77"> - <caret line="8" column="33" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/service/AnimalService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1484"> - <caret line="139" column="24" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" /> - <folding> - <element signature="e#6776#6777#0" expanded="true" /> - <element signature="e#6840#6841#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/AnimalController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="275"> - <caret line="35" column="26" selection-start-line="35" selection-start-column="26" selection-end-line="35" selection-end-column="26" /> - <folding> - <element signature="e#1748#1749#0" expanded="true" /> - <element signature="e#1809#1810#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -950,20 +926,105 @@ </state> </provider> </entry> + <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_15.txt"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="56" selection-end-column="58" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/service/AnimalService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="457"> + <caret line="139" column="24" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" /> + <folding> + <element signature="e#6776#6777#0" expanded="true" /> + <element signature="e#6840#6841#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/AnimalController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="90"> + <caret line="22" column="14" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" /> + <folding> + <element signature="e#1748#1749#0" expanded="true" /> + <element signature="e#1809#1810#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/animal-service/src/main/resources/application.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret selection-end-line="6" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/adoption-service/src/main/resources/application.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="105"> + <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/ShelterController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" /> + </state> + </provider> + </entry> + <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_21.json"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="210"> + <caret line="14" column="2" lean-forward="true" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" /> + </state> + </provider> + </entry> + <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_22.json"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="11" column="3" selection-start-line="1" selection-start-column="2" selection-end-line="11" selection-end-column="3" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/animal-service/src/main/java/com/redhat/do328/adoptApup/animalservice/model/Animal.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="135"> + <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Shelter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="195"> + <caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/service/AdoptionService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="320"> - <caret line="32" column="135" selection-start-line="32" selection-start-column="120" selection-end-line="32" selection-end-column="135" /> + <state relative-caret-position="475"> + <caret line="44" selection-start-line="44" selection-end-line="44" /> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/ShelterController.java"> + <entry file="file://$PROJECT_DIR$/shelter-service/src/main/java/com/redhat/do328/adoptApup/shelterservice/model/Shelter.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="14" column="26" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" /> + <state relative-caret-position="285"> + <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/adoption-service/src/main/java/com/redhat/do328/adoptApup/adoptionservice/model/Animal.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="180"> + <caret line="17" column="7" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" /> </state> </provider> </entry> -- Gitblit v1.9.3