Monnethic/java-api
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

update new user

Browse source
This commit is contained in:
GME 2018-12-02 12:32:44 +01:00
parent 584349e931
commit 2ede4c231c
5 changed files with 281 additions and 405 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

680
.idea/workspace.xml
View file

@ -3,94 +3,54 @@
<component name="ChangeListManager">
<list default="true" id="7c8802f8-163e-48a6-9d7a-9324ac89091d" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/restService/StringResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restService/StringResponse.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FUSProjectUsageTrigger">
<session id="-1607393105">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="2" />
<entry key="project.open.time.5" value="1" />
<entry key="project.open.time.6" value="2" />
<entry key="project.opened" value="3" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="class" value="1" />
<entry key="java" value="7" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CLASS" value="1" />
<entry key="JAVA" value="7" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="45" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JAVA" value="45" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="DatabaseUserResource.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="587">
<caret line="91" column="34" lean-forward="true" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
<folding>
<element signature="e#4324#4325#0" expanded="true" />
<element signature="e#4386#4387#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DatabaseTransactionResource.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseTransactionResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BlockchainQueryResource.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BlockchainQueryImplementation.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WelcomeResource.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/restService/WelcomeResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="StringResponse.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/restService/StringResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="13" column="37" lean-forward="true" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DatabaseUserImplementation.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1045">
<caret line="64" column="55" selection-start-line="64" selection-start-column="55" selection-end-line="64" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
@ -125,11 +85,8 @@
<option value="$PROJECT_DIR$/log4j.properties" />
<option value="$PROJECT_DIR$/src/main/java/blockchain/utility/Util.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/utility/UtilTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" />
<option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
@ -140,6 +97,9 @@
<option value="$PROJECT_DIR$/src/main/java/restService/StringResponse.java" />
<option value="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" />
<option value="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
<option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" />
</list>
</option>
</component>
@ -149,9 +109,6 @@
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="15" />
<option name="y" value="-10" />
@ -163,6 +120,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
@ -244,6 +202,23 @@
<item name="blockchain" type="462c0819:PsiDirectoryNode" />
<item name="utility" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="database" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="database" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
@ -260,17 +235,55 @@
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="restService" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="blockchain" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="blockchain" type="462c0819:PsiDirectoryNode" />
<item name="client" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="blockchain" type="462c0819:PsiDirectoryNode" />
<item name="utility" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543747284804" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
@ -296,32 +309,12 @@
</list>
</option>
</component>
<component name="RunManager" selected="JUnit.QueryChannelTest">
<component name="RunManager" selected="JUnit.ReadUserTest">
<configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration name="ChaincodeTransactionTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="blockchain.query.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="blockchain.query" />
<option name="MAIN_CLASS_NAME" value="blockchain.query.ChaincodeTransactionTest" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="QueryChannelTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
@ -331,20 +324,12 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="blockchain.query" />
<option name="MAIN_CLASS_NAME" value="blockchain.query.QueryChannelTest" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="QueryTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
@ -354,20 +339,27 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="blockchain.query" />
<option name="MAIN_CLASS_NAME" value="blockchain.query.QueryTest" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ReadUserTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="blockchain.utility.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="blockchain.utility" />
<option name="MAIN_CLASS_NAME" value="blockchain.utility.ReadUserTest" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TestEnrollAdmin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
@ -377,20 +369,12 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="blockchain.client" />
<option name="MAIN_CLASS_NAME" value="blockchain.client.TestEnrollAdmin" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TestRegisterEnrollUser" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
@ -400,78 +384,49 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="blockchain.client" />
<option name="MAIN_CLASS_NAME" value="blockchain.client.TestRegisterEnrollUser" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="App" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="java-api" />
<option name="SPRING_BOOT_MAIN_CLASS" value="application.App" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="OUTPUT_DIRECTORY" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<properties />
<listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Spring Boot.App" />
<item itemvalue="JUnit.QueryTest" />
<item itemvalue="JUnit.TestRegisterEnrollUser" />
<item itemvalue="JUnit.TestEnrollAdmin" />
<item itemvalue="JUnit.ChaincodeTransactionTest" />
<item itemvalue="JUnit.QueryChannelTest" />
<item itemvalue="JUnit.ReadUserTest" />
</list>
<recent_temporary>
<list>
<item itemvalue="JUnit.ReadUserTest" />
<item itemvalue="JUnit.TestRegisterEnrollUser" />
<item itemvalue="JUnit.QueryChannelTest" />
<item itemvalue="JUnit.QueryTest" />
<item itemvalue="JUnit.TestEnrollAdmin" />
<item itemvalue="JUnit.ChaincodeTransactionTest" />
<item itemvalue="JUnit.TestRegisterEnrollUser" />
</list>
</recent_temporary>
</component>
@ -499,16 +454,13 @@
<workItem from="1542448248868" duration="299000" />
<workItem from="1543219415115" duration="2335000" />
<workItem from="1543224100704" duration="2118000" />
<workItem from="1543744990946" duration="2101000" />
<workItem from="1543747427112" duration="38000" />
<workItem from="1543749977543" duration="299000" />
</task>
<servers />
</component>
<component name="TestHistory">
<history-entry file="TestEnrollAdmin - 2018.11.16 at 19h 38m 57s.xml">
<configuration name="TestEnrollAdmin" configurationId="JUnit" />
</history-entry>
<history-entry file="QueryTest - 2018.11.16 at 19h 39m 44s.xml">
<configuration name="QueryTest" configurationId="JUnit" />
</history-entry>
<history-entry file="QueryTest - 2018.11.16 at 19h 41m 17s.xml">
<configuration name="QueryTest" configurationId="JUnit" />
</history-entry>
@ -533,47 +485,52 @@
<history-entry file="QueryChannelTest - 2018.11.16 at 19h 51m 50s.xml">
<configuration name="QueryChannelTest" configurationId="JUnit" />
</history-entry>
<history-entry file="TestRegisterEnrollUser - 2018.12.02 at 11h 12m 14s.xml">
<configuration name="TestRegisterEnrollUser" configurationId="JUnit" />
</history-entry>
<history-entry file="ReadUserTest - 2018.12.02 at 11h 31m 41s.xml">
<configuration name="ReadUserTest" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="30645000" />
<option name="totallyTimeSpent" value="33083000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
<layout>
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.15625" side_tool="true" visible="true" weight="0.1455898" />
<window_info anchor="right" id="Maven Projects" order="9" />
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
<window_info id="Capture Tool" order="8" />
<window_info id="Designer" order="2" />
<window_info anchor="right" id="Database" order="5" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25596184" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" order="4" />
<window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Palette&#9;" order="6" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
<window_info anchor="bottom" id="Java Enterprise" order="13" />
<window_info anchor="right" id="Capture Analysis" order="4" />
<window_info anchor="bottom" id="Version Control" order="10" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.84375" weight="0.51115835" />
<window_info anchor="bottom" id="Spring" order="12" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="right" id="Bean Validation" order="8" />
<window_info id="Web" order="7" side_tool="true" />
<window_info id="Learn" order="6" />
<window_info anchor="right" id="Theme Preview" order="7" />
<window_info id="UI Designer" order="4" />
<window_info id="Favorites" order="5" side_tool="true" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Messages" order="8" />
<window_info id="Learn" order="6" />
<window_info id="Web" order="7" side_tool="true" />
<window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.8434022" weight="0.40405616" />
<window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
<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="Terminal" order="7" />
<window_info anchor="bottom" id="Messages" order="8" />
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.15659778" side_tool="true" visible="true" weight="0.31123245" />
<window_info anchor="bottom" id="Spring" order="12" />
<window_info anchor="bottom" id="Java Enterprise" order="13" />
<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" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Capture Analysis" order="4" />
<window_info anchor="right" id="Database" order="5" />
<window_info anchor="right" id="Palette&#9;" order="6" />
<window_info anchor="right" id="Theme Preview" order="7" />
<window_info anchor="right" id="Bean Validation" order="8" />
<window_info anchor="right" id="Maven Projects" order="9" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -592,115 +549,9 @@
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
<option name="time" value="2" />
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="35" column="46" lean-forward="true" selection-start-line="35" selection-start-column="46" selection-end-line="35" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="782">
<caret line="46" selection-start-line="46" selection-end-line="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/CAClientWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="46" column="38" lean-forward="true" selection-start-line="46" selection-start-column="38" selection-end-line="46" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="29" column="50" lean-forward="true" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1190">
<caret line="70" column="9" lean-forward="true" selection-start-line="70" selection-start-column="9" selection-end-line="70" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="44" selection-start-line="44" selection-end-line="44" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/hyperledger/fabric-sdk-java/fabric-sdk-java/1.2.1/fabric-sdk-java-1.2.1.jar!/org/hyperledger/fabric/sdk/HFClient.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="833">
<caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="19" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="25" column="74" lean-forward="true" selection-start-line="25" selection-start-column="74" selection-end-line="25" selection-end-column="74" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="29" column="39" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="29" column="50" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="20" column="45" lean-forward="true" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="45" selection-start-line="6" selection-start-column="45" selection-end-line="6" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="17" column="10" lean-forward="true" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/java-api.iml" />
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor" />
@ -732,27 +583,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/utility/Util.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/user/UserContext.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="30" column="16" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="52" selection-start-line="15" selection-start-column="52" selection-end-line="15" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runners/model/FrameworkMethod.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="421">
@ -803,13 +633,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="24" column="48" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
@ -824,13 +647,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697">
<caret line="41" column="31" selection-start-line="41" selection-start-column="31" selection-end-line="41" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
@ -859,16 +675,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1045">
<caret line="64" column="55" selection-start-line="64" selection-start-column="55" selection-end-line="64" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
@ -876,35 +682,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restService/StringResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="13" column="37" lean-forward="true" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restService/WelcomeResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="587">
<caret line="91" column="34" lean-forward="true" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
<folding>
<element signature="e#4324#4325#0" expanded="true" />
<element signature="e#4386#4387#0" expanded="true" />
</folding>
<state relative-caret-position="1394">
<caret line="92" column="34" selection-start-line="92" selection-start-column="34" selection-end-line="92" selection-end-column="34" />
</state>
</provider>
</entry>
@ -916,9 +697,102 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="8" column="38" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restService/WelcomeResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restService/StringResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1014">
<caret line="68" column="13" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="49" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/utility/Util.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="58" column="84" lean-forward="true" selection-start-line="58" selection-start-column="84" selection-end-line="58" selection-end-column="84" />
</state>
</provider>
</entry>
<entry file="jar://C:/Program Files/Java/jdk1.8.0_172/src.zip!/java/lang/System.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/user/UserContext.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="16" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/database/user/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/hyperledger/fabric-sdk-java/fabric-sdk-java/1.2.1/fabric-sdk-java-1.2.1.jar!/org/hyperledger/fabric/sdk/Enrollment.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="9" column="6" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
</state>
</provider>
</entry>

BIN
msp/org1/User2-org1.context Normal file
View file

Binary file not shown.

2
src/main/java/blockchain/configuration/Config.java
View file

@ -1,6 +1,8 @@
package blockchain.configuration;
public class Config {
//TEST
public static final String u2 = "woEXRrZdwXiu";
//ORGANIZATION
public static final String ORG1_MSP = "Org1MSP";

2
src/test/java/blockchain/client/TestRegisterEnrollUser.java
View file

@ -21,7 +21,7 @@ public class TestRegisterEnrollUser {
caClientWrapper.setAdminContext(admin);
UserContext userContext = new UserContext();
userContext.setName("User-org1");
userContext.setName("User2-org1");
userContext.setAffiliation(Config.ORG1);
userContext.setMspId(Config.ORG1_MSP);
String userSecret = caClientWrapper.registerUser(userContext.getName(),userContext.getAffiliation());

2
src/test/java/blockchain/utility/ReadUserTest.java
View file

@ -11,7 +11,7 @@ public class ReadUserTest {
@Test
public void testReadUserOrg1(){
try{
UserContext userContext = Util.readUserContext(Config.ORG1, "User-org1");
UserContext userContext = Util.readUserContext(Config.ORG1, "User2-org1");
System.out.println(userContext.getAffiliation());
System.out.println(userContext.getMspId());
System.out.println(userContext.getEnrollment().getCert());