sync with master branch

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

dhp-build/dhp-build-assembly-resources/pom.xml

@@ -12,6 +12,8 @@
     <artifactId>dhp-build-assembly-resources</artifactId>
     <packaging>jar</packaging>
 
+    <description>This module contains a set of scripts supporting the build lifecycle for the dnet-hadoop project</description>
+
     <build>
         <plugins>
             <plugin>

dhp-build/dhp-build-properties-maven-plugin/pom.xml

@@ -12,22 +12,29 @@
     <artifactId>dhp-build-properties-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
 
+    <description>This module is a maven plugin implementing custom properties substitutions in the build lifecycle</description>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
+            <version>3.6.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
-            <version>2.0</version>
+            <version>2.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.kuali.maven.plugins</groupId>
             <artifactId>properties-maven-plugin</artifactId>
-            <version>1.3.2</version>
+            <version>${properties.maven.plugin.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -73,44 +80,10 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <detectLinks>true</detectLinks>
+                    <doclint>none</doclint>
                 </configuration>
             </plugin>
         </plugins>
-        <pluginManagement>
-        	<plugins>
-        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        		<plugin>
-        			<groupId>org.eclipse.m2e</groupId>
-        			<artifactId>lifecycle-mapping</artifactId>
-        			<version>1.0.0</version>
-        			<configuration>
-        				<lifecycleMappingMetadata>
-        					<pluginExecutions>
-        						<pluginExecution>
-        							<pluginExecutionFilter>
-        								<groupId>
-        									org.apache.maven.plugins
-        								</groupId>
-        								<artifactId>
-        									maven-plugin-plugin
-        								</artifactId>
-        								<versionRange>
-        									[3.2,)
-        								</versionRange>
-        								<goals>
-        									<goal>descriptor</goal>
-        								</goals>
-        							</pluginExecutionFilter>
-        							<action>
-        								<ignore />
-        							</action>
-        						</pluginExecution>
-        					</pluginExecutions>
-        				</lifecycleMappingMetadata>
-        			</configuration>
-        		</plugin>
-        	</plugins>
-        </pluginManagement>
     </build>
 
 </project>

dhp-build/dhp-build-properties-maven-plugin/src/main/java/eu/dnetlib/maven/plugin/properties/GenerateOoziePropertiesMojo.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.maven.plugin.properties;
 
 import java.io.File;
@@ -12,8 +13,8 @@ import org.apache.maven.plugin.MojoFailureException;
 
 /**
  * Generates oozie properties which were not provided from commandline.
- * @author mhorst
  *
+ * @author mhorst
  * @goal generate-properties
  */
 public class GenerateOoziePropertiesMojo extends AbstractMojo {
@@ -21,43 +22,48 @@ public class GenerateOoziePropertiesMojo extends AbstractMojo {
 	public static final String PROPERTY_NAME_WF_SOURCE_DIR = "workflow.source.dir";
 	public static final String PROPERTY_NAME_SANDBOX_NAME = "sandboxName";
 
-	private final String[] limiters = {"dhp", "dnetlib", "eu"};
+	private final String[] limiters = {
+		"dhp", "dnetlib", "eu"
+	};
 
 	@Override
 	public void execute() throws MojoExecutionException, MojoFailureException {
-    	if (System.getProperties().containsKey(PROPERTY_NAME_WF_SOURCE_DIR) &&
+		if (System.getProperties().containsKey(PROPERTY_NAME_WF_SOURCE_DIR)
-    			!System.getProperties().containsKey(PROPERTY_NAME_SANDBOX_NAME)) {
+			&& !System.getProperties().containsKey(PROPERTY_NAME_SANDBOX_NAME)) {
-    		String generatedSandboxName = generateSandboxName(System.getProperties().getProperty(
+			String generatedSandboxName = generateSandboxName(
-					PROPERTY_NAME_WF_SOURCE_DIR));
-    		if (generatedSandboxName!=null) {
-    			System.getProperties().setProperty(PROPERTY_NAME_SANDBOX_NAME, 
-        				generatedSandboxName);	
-    		} else {
-    			System.out.println("unable to generate sandbox name from path: " + 
 				System.getProperties().getProperty(PROPERTY_NAME_WF_SOURCE_DIR));
+			if (generatedSandboxName != null) {
+				System.getProperties().setProperty(PROPERTY_NAME_SANDBOX_NAME, generatedSandboxName);
+			} else {
+				System.out
+					.println(
+						"unable to generate sandbox name from path: "
+							+ System.getProperties().getProperty(PROPERTY_NAME_WF_SOURCE_DIR));
 			}
 		}
 	}
 
 	/**
 	 * Generates sandbox name from workflow source directory.
+	 *
 	 * @param wfSourceDir
 	 * @return generated sandbox name
 	 */
 	private String generateSandboxName(String wfSourceDir) {
-//    	utilize all dir names until finding one of the limiters 
+		// utilize all dir names until finding one of the limiters
 		List<String> sandboxNameParts = new ArrayList<String>();
 		String[] tokens = StringUtils.split(wfSourceDir, File.separatorChar);
 		ArrayUtils.reverse(tokens);
-    	if (tokens.length>0) {
+		if (tokens.length > 0) {
 			for (String token : tokens) {
 				for (String limiter : limiters) {
 					if (limiter.equals(token)) {
-    					return sandboxNameParts.size()>0?
+						return sandboxNameParts.size() > 0
-    							StringUtils.join(sandboxNameParts.toArray()):null;
+							? StringUtils.join(sandboxNameParts.toArray())
+							: null;
 					}
 				}
-    			if (sandboxNameParts.size()>0) {
+				if (sandboxNameParts.size() > 0) {
 					sandboxNameParts.add(0, File.separator);
 				}
 				sandboxNameParts.add(0, token);
@@ -67,5 +73,4 @@ public class GenerateOoziePropertiesMojo extends AbstractMojo {
 			return null;
 		}
 	}
-
 }

dhp-build/dhp-build-properties-maven-plugin/src/main/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectProperties.java

@@ -1,17 +1,15 @@
 /**
+ * Licensed under the Educational Community License, Version 2.0 (the "License"); you may not use
+ * this file except in compliance with the License. You may obtain a copy of the License at
  *
- * Licensed under the Educational Community License, Version 2.0 (the "License");
+ * <p>http://www.opensource.org/licenses/ecl2.php
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- * http://www.opensource.org/licenses/ecl2.php
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- *
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * Unless required by applicable law or agreed to in writing, software
+ * express or implied. See the License for the specific language governing permissions and
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package eu.dnetlib.maven.plugin.properties;
 
 import java.io.File;
@@ -41,10 +39,9 @@ import org.springframework.core.io.ResourceLoader;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
- * Writes project properties for the keys listed in specified properties files.
+ * Writes project properties for the keys listed in specified properties files. Based on:
- * Based on: 
+ * http://site.kuali.org/maven/plugins/properties-maven-plugin/2.0.1/write-project-properties-mojo.html
- * http://site.kuali.org/maven/plugins/properties-maven-plugin/1.3.2/write-project-properties-mojo.html
+ *
-
  * @author mhorst
  * @goal write-project-properties
  */
@@ -56,9 +53,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 	protected static final String PROPERTY_PREFIX_ENV = "env.";
 	private static final String ENCODING_UTF8 = "utf8";
 
-	/**
+	/** @parameter property="properties.includePropertyKeysFromFiles" */
-	 * @parameter property="properties.includePropertyKeysFromFiles"
-	 */
 	private String[] includePropertyKeysFromFiles;
 
 	/**
@@ -123,11 +118,14 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 	 */
 	private String include;
 
-    /* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.apache.maven.plugin.AbstractMojo#execute()
 	 */
 	@Override
-    @SuppressFBWarnings({"NP_UNWRITTEN_FIELD","UWF_UNWRITTEN_FIELD"})
+	@SuppressFBWarnings({
+		"NP_UNWRITTEN_FIELD", "UWF_UNWRITTEN_FIELD"
+	})
 	public void execute() throws MojoExecutionException, MojoFailureException {
 		Properties properties = new Properties();
 		// Add project properties
@@ -153,6 +151,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Provides environment variables.
+	 *
 	 * @return environment variables
 	 */
 	protected static Properties getEnvironmentVariables() {
@@ -165,20 +164,22 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Removes properties which should not be written.
+	 *
 	 * @param properties
 	 * @param omitCSV
 	 * @param includeCSV
 	 * @throws MojoExecutionException
 	 */
-    protected void trim(Properties properties, String omitCSV, String includeCSV) throws MojoExecutionException {
+	protected void trim(Properties properties, String omitCSV, String includeCSV)
+		throws MojoExecutionException {
 		List<String> omitKeys = getListFromCSV(omitCSV);
 		for (String key : omitKeys) {
 			properties.remove(key);
 		}
 
 		List<String> includeKeys = getListFromCSV(includeCSV);
-//      mh: including keys from predefined properties
+		// mh: including keys from predefined properties
-        if (includePropertyKeysFromFiles!=null && includePropertyKeysFromFiles.length>0) {
+		if (includePropertyKeysFromFiles != null && includePropertyKeysFromFiles.length > 0) {
 			for (String currentIncludeLoc : includePropertyKeysFromFiles) {
 				if (validate(currentIncludeLoc)) {
 					Properties p = getProperties(currentIncludeLoc);
@@ -188,8 +189,8 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 				}
 			}
 		}
-        if (includeKeys!=null && !includeKeys.isEmpty()) {
+		if (includeKeys != null && !includeKeys.isEmpty()) {
-//        	removing only when include keys provided
+			// removing only when include keys provided
 			Set<String> keys = properties.stringPropertyNames();
 			for (String key : keys) {
 				if (!includeKeys.contains(key)) {
@@ -201,6 +202,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Checks whether file exists.
+	 *
 	 * @param location
 	 * @return true when exists, false otherwise.
 	 */
@@ -219,6 +221,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Validates resource location.
+	 *
 	 * @param location
 	 * @return true when valid, false otherwise
 	 * @throws MojoExecutionException
@@ -238,6 +241,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Provides input stream.
+	 *
 	 * @param location
 	 * @return input stream
 	 * @throws IOException
@@ -254,6 +258,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Creates properties for given location.
+	 *
 	 * @param location
 	 * @return properties for given location
 	 * @throws MojoExecutionException
@@ -278,6 +283,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Provides escape characters.
+	 *
 	 * @param escapeChars
 	 * @return escape characters
 	 */
@@ -293,6 +299,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Provides real token.
+	 *
 	 * @param token
 	 * @return real token
 	 */
@@ -310,6 +317,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Returns content.
+	 *
 	 * @param comment
 	 * @param properties
 	 * @param escapeTokens
@@ -332,13 +340,15 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Writes properties to given file.
+	 *
 	 * @param file
 	 * @param comment
 	 * @param properties
 	 * @param escapeTokens
 	 * @throws MojoExecutionException
 	 */
-    protected void writeProperties(File file, String comment, Properties properties, List<String> escapeTokens)
+	protected void writeProperties(
+		File file, String comment, Properties properties, List<String> escapeTokens)
 		throws MojoExecutionException {
 		try {
 			String content = getContent(comment, properties, escapeTokens);
@@ -350,6 +360,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Escapes characters.
+	 *
 	 * @param s
 	 * @param escapeChars
 	 * @return
@@ -364,6 +375,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Provides replacement token.
+	 *
 	 * @param escapeChar
 	 * @return replacement token
 	 */
@@ -381,6 +393,7 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Returns list from csv.
+	 *
 	 * @param csv
 	 * @return list of values generated from CSV
 	 */
@@ -422,15 +435,13 @@ public class WritePredefinedProjectProperties extends AbstractMojo {
 
 	/**
 	 * Sets property files for which keys properties should be included.
+	 *
 	 * @param includePropertyKeysFromFiles
 	 */
-	public void setIncludePropertyKeysFromFiles(
+	public void setIncludePropertyKeysFromFiles(String[] includePropertyKeysFromFiles) {
-			String[] includePropertyKeysFromFiles) {
+		if (includePropertyKeysFromFiles != null) {
-		if (includePropertyKeysFromFiles!=null) {
+			this.includePropertyKeysFromFiles = Arrays
-			this.includePropertyKeysFromFiles = Arrays.copyOf(
+				.copyOf(includePropertyKeysFromFiles, includePropertyKeysFromFiles.length);
-					includePropertyKeysFromFiles, 
-					includePropertyKeysFromFiles.length);	
 		}
 	}
-	
 }

dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/GenerateOoziePropertiesMojoTest.java

@@ -1,19 +1,17 @@
-package eu.dnetlib.maven.plugin.properties;
 
-import org.junit.jupiter.api.BeforeEach;
+package eu.dnetlib.maven.plugin.properties;
-import org.junit.jupiter.api.Test;
 
 import static eu.dnetlib.maven.plugin.properties.GenerateOoziePropertiesMojo.PROPERTY_NAME_SANDBOX_NAME;
 import static eu.dnetlib.maven.plugin.properties.GenerateOoziePropertiesMojo.PROPERTY_NAME_WF_SOURCE_DIR;
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
+import org.junit.jupiter.api.BeforeEach;
- * @author mhorst, claudio.atzori
+import org.junit.jupiter.api.Test;
- *
+
- */
+/** @author mhorst, claudio.atzori */
 public class GenerateOoziePropertiesMojoTest {
 
-    private GenerateOoziePropertiesMojo mojo = new GenerateOoziePropertiesMojo();
+	private final GenerateOoziePropertiesMojo mojo = new GenerateOoziePropertiesMojo();
 
 	@BeforeEach
 	public void clearSystemProperties() {
@@ -96,5 +94,4 @@ public class GenerateOoziePropertiesMojoTest {
 		// assert
 		assertEquals("wf/transformers", System.getProperty(PROPERTY_NAME_SANDBOX_NAME));
 	}
-    
 }

dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectPropertiesTest.java

@@ -1,5 +1,14 @@
+
 package eu.dnetlib.maven.plugin.properties;
 
+import static eu.dnetlib.maven.plugin.properties.WritePredefinedProjectProperties.PROPERTY_PREFIX_ENV;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
+
+import java.io.*;
+import java.util.Properties;
+
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.junit.jupiter.api.*;
@@ -9,18 +18,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.*;
+/** @author mhorst, claudio.atzori */
-import java.util.Properties;
-
-import static eu.dnetlib.maven.plugin.properties.WritePredefinedProjectProperties.PROPERTY_PREFIX_ENV;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.lenient;
-
-/**
- * @author mhorst, claudio.atzori
- *
- */
 @ExtendWith(MockitoExtension.class)
 public class WritePredefinedProjectPropertiesTest {
 
@@ -150,7 +148,9 @@ public class WritePredefinedProjectPropertiesTest {
 		includedProperties.setProperty(includedKey, "irrelevantValue");
 		includedProperties.store(new FileWriter(includedPropertiesFile), null);
 
-        mojo.setIncludePropertyKeysFromFiles(new String[] {includedPropertiesFile.getAbsolutePath()});
+		mojo.setIncludePropertyKeysFromFiles(new String[] {
+			includedPropertiesFile.getAbsolutePath()
+		});
 
 		// execute
 		mojo.execute();
@@ -164,7 +164,8 @@ public class WritePredefinedProjectPropertiesTest {
 	}
 
 	@Test
-    public void testExecuteIncludingPropertyKeysFromClasspathResource(@TempDir File testFolder) throws Exception {
+	public void testExecuteIncludingPropertyKeysFromClasspathResource(@TempDir File testFolder)
+		throws Exception {
 		// given
 		String key = "projectPropertyKey";
 		String value = "projectPropertyValue";
@@ -175,7 +176,11 @@ public class WritePredefinedProjectPropertiesTest {
 		projectProperties.setProperty(includedKey, includedValue);
 		doReturn(projectProperties).when(mavenProject).getProperties();
 
-        mojo.setIncludePropertyKeysFromFiles(new String[] {"/eu/dnetlib/maven/plugin/properties/included.properties"});
+		mojo
+			.setIncludePropertyKeysFromFiles(
+				new String[] {
+					"/eu/dnetlib/maven/plugin/properties/included.properties"
+				});
 
 		// execute
 		mojo.execute();
@@ -200,14 +205,17 @@ public class WritePredefinedProjectPropertiesTest {
 		projectProperties.setProperty(includedKey, includedValue);
 		doReturn(projectProperties).when(mavenProject).getProperties();
 
-        mojo.setIncludePropertyKeysFromFiles(new String[] {""});
+		mojo.setIncludePropertyKeysFromFiles(new String[] {
+			""
+		});
 
 		// execute
 		Assertions.assertThrows(MojoExecutionException.class, () -> mojo.execute());
 	}
 
 	@Test
-    public void testExecuteIncludingPropertyKeysFromXmlFile(@TempDir File testFolder) throws Exception {
+	public void testExecuteIncludingPropertyKeysFromXmlFile(@TempDir File testFolder)
+		throws Exception {
 		// given
 		String key = "projectPropertyKey";
 		String value = "projectPropertyValue";
@@ -223,7 +231,9 @@ public class WritePredefinedProjectPropertiesTest {
 		includedProperties.setProperty(includedKey, "irrelevantValue");
 		includedProperties.storeToXML(new FileOutputStream(includedPropertiesFile), null);
 
-        mojo.setIncludePropertyKeysFromFiles(new String[] {includedPropertiesFile.getAbsolutePath()});
+		mojo.setIncludePropertyKeysFromFiles(new String[] {
+			includedPropertiesFile.getAbsolutePath()
+		});
 
 		// execute
 		mojo.execute();
@@ -237,7 +247,8 @@ public class WritePredefinedProjectPropertiesTest {
 	}
 
 	@Test
-    public void testExecuteIncludingPropertyKeysFromInvalidXmlFile(@TempDir File testFolder) throws Exception {
+	public void testExecuteIncludingPropertyKeysFromInvalidXmlFile(@TempDir File testFolder)
+		throws Exception {
 		// given
 		String key = "projectPropertyKey";
 		String value = "projectPropertyValue";
@@ -253,7 +264,9 @@ public class WritePredefinedProjectPropertiesTest {
 		includedProperties.setProperty(includedKey, "irrelevantValue");
 		includedProperties.store(new FileOutputStream(includedPropertiesFile), null);
 
-        mojo.setIncludePropertyKeysFromFiles(new String[] {includedPropertiesFile.getAbsolutePath()});
+		mojo.setIncludePropertyKeysFromFiles(new String[] {
+			includedPropertiesFile.getAbsolutePath()
+		});
 
 		// execute
 		Assertions.assertThrows(MojoExecutionException.class, () -> mojo.execute());
@@ -263,7 +276,9 @@ public class WritePredefinedProjectPropertiesTest {
 	public void testExecuteWithQuietModeOn(@TempDir File testFolder) throws Exception {
 		// given
 		mojo.setQuiet(true);
-        mojo.setIncludePropertyKeysFromFiles(new String[] {"invalid location"});
+		mojo.setIncludePropertyKeysFromFiles(new String[] {
+			"invalid location"
+		});
 
 		// execute
 		mojo.execute();
@@ -277,7 +292,9 @@ public class WritePredefinedProjectPropertiesTest {
 	@Test
 	public void testExecuteIncludingPropertyKeysFromInvalidFile() {
 		// given
-        mojo.setIncludePropertyKeysFromFiles(new String[] {"invalid location"});
+		mojo.setIncludePropertyKeysFromFiles(new String[] {
+			"invalid location"
+		});
 
 		// execute
 		Assertions.assertThrows(MojoExecutionException.class, () -> mojo.execute());
@@ -296,7 +313,7 @@ public class WritePredefinedProjectPropertiesTest {
 		Properties storedProperties = getStoredProperties(testFolder);
 		assertTrue(storedProperties.size() > 0);
 		for (Object currentKey : storedProperties.keySet()) {
-            assertTrue(((String)currentKey).startsWith(PROPERTY_PREFIX_ENV));
+			assertTrue(((String) currentKey).startsWith(PROPERTY_PREFIX_ENV));
 		}
 	}
 
@@ -320,7 +337,8 @@ public class WritePredefinedProjectPropertiesTest {
 	}
 
 	@Test
-    public void testExecuteWithSystemPropertiesAndEscapeChars(@TempDir File testFolder) throws Exception {
+	public void testExecuteWithSystemPropertiesAndEscapeChars(@TempDir File testFolder)
+		throws Exception {
 		// given
 		String key = "systemPropertyKey ";
 		String value = "systemPropertyValue";
@@ -347,7 +365,8 @@ public class WritePredefinedProjectPropertiesTest {
 		return new File(testFolder, "test.properties");
 	}
 
-    private Properties getStoredProperties(File testFolder) throws FileNotFoundException, IOException {
+	private Properties getStoredProperties(File testFolder)
+		throws IOException {
 		Properties properties = new Properties();
 		properties.load(new FileInputStream(getPropertiesFileLocation(testFolder)));
 		return properties;

dhp-build/dhp-code-style/pom.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>eu.dnetlib.dhp</groupId>
+    <artifactId>dhp-code-style</artifactId>
+    <version>1.1.7-SNAPSHOT</version>
+
+    <packaging>jar</packaging>
+
+    <description>This module contains resources supporting common code style conventions</description>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>dnet45-snapshots</id>
+            <name>DNet45 Snapshots</name>
+            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-snapshots</url>
+            <layout>default</layout>
+        </snapshotRepository>
+        <repository>
+            <id>dnet45-releases</id>
+            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases</url>
+        </repository>
+    </distributionManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-project-info-reports-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.7.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_aosp.xml

@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="10">
+    <profile kind="CodeFormatterProfile" name="Android" version="10">
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+    </profile>
+</profiles>

dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_dnet.xml

@@ -0,0 +1,727 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="18">
+    <profile kind="CodeFormatterProfile" name="Android_custom" version="18">
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="32"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+    </profile>
+    <profile kind="CodeFormatterProfile" name="Dnet" version="18">
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="140"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+    </profile>
+</profiles>

dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_google.xml

@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="13">
+    <profile kind="CodeFormatterProfile" name="GoogleStyle" version="13">
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments.count_dependent" value="16|-1|16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_comment_inline_tags" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_local_variable_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="1040"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type.count_dependent" value="1585|-1|1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields.count_dependent" value="16|-1|16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent" value="16|4|80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration.count_dependent" value="16|4|49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
+        <setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants.count_dependent" value="16|5|48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation.count_dependent" value="16|4|48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+        <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_field_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment_new_line_at_start_of_html_paragraph" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comment_prefix" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation.count_dependent" value="16|5|80"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter.count_dependent" value="1040|-1|1040"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package.count_dependent" value="1585|-1|1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.force_if_else_statement_brace" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent" value="16|-1|16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
+        <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_new_anonymous_class" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable.count_dependent" value="1585|-1|1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent" value="1585|-1|1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration.count_dependent" value="16|5|80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent" value="16|-1|16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer.count_dependent" value="16|5|80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration.count_dependent" value="16|4|48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method.count_dependent" value="1585|-1|1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression.count_dependent" value="16|-1|16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="1585"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments.count_dependent" value="16|-1|16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression.count_dependent" value="16|5|80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration.count_dependent" value="16|5|80"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_for_statement" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+    </profile>
+</profiles>

dhp-build/pom.xml

@@ -8,7 +8,11 @@
 	</parent>
 	<artifactId>dhp-build</artifactId>
 	<packaging>pom</packaging>
+
+	<description>This module is a container for the build tools used in dnet-hadoop</description>
+
 	<modules>
+		<module>dhp-code-style</module>
 		<module>dhp-build-assembly-resources</module>
 		<module>dhp-build-properties-maven-plugin</module>
 	</modules>

dhp-common/pom.xml

@@ -12,6 +12,8 @@
 	<artifactId>dhp-common</artifactId>
 	<packaging>jar</packaging>
 
+	<description>This module contains common utilities meant to be used across the dnet-hadoop submodules</description>
+
 	<dependencies>
 
 		<dependency>

dhp-common/src/main/java/eu/dnetlib/collector/worker/model/ApiDescriptor.java

@@ -1,9 +1,9 @@
+
 package eu.dnetlib.collector.worker.model;
 
 import java.util.HashMap;
 import java.util.Map;
 
-
 public class ApiDescriptor {
 
 	private String id;
@@ -45,5 +45,4 @@ public class ApiDescriptor {
 	public void setProtocol(final String protocol) {
 		this.protocol = protocol;
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStore.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
@@ -12,9 +13,7 @@ import javax.persistence.Table;
 @Table(name = "mdstores")
 public class MDStore implements Serializable {
 
-	/**
+	/** */
-	 *
-	 */
 	private static final long serialVersionUID = 3160530489149700055L;
 
 	@Id
@@ -95,11 +94,13 @@ public class MDStore implements Serializable {
 		this.apiId = apiId;
 	}
 
-	public static MDStore newInstance(final String format, final String layout, final String interpretation) {
+	public static MDStore newInstance(
+		final String format, final String layout, final String interpretation) {
 		return newInstance(format, layout, interpretation, null, null, null);
 	}
 
-	public static MDStore newInstance(final String format,
+	public static MDStore newInstance(
+		final String format,
 		final String layout,
 		final String interpretation,
 		final String dsName,
@@ -115,5 +116,4 @@ public class MDStore implements Serializable {
 		md.setApiId(apiId);
 		return md;
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreCurrentVersion.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
@@ -11,9 +12,7 @@ import javax.persistence.Table;
 @Table(name = "mdstore_current_versions")
 public class MDStoreCurrentVersion implements Serializable {
 
-	/**
+	/** */
-	 *
-	 */
 	private static final long serialVersionUID = -4757725888593745773L;
 
 	@Id

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreVersion.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
@@ -14,9 +15,7 @@ import javax.persistence.TemporalType;
 @Table(name = "mdstore_versions")
 public class MDStoreVersion implements Serializable {
 
-	/**
+	/** */
-	 *
-	 */
 	private static final long serialVersionUID = -4763494442274298339L;
 
 	@Id
@@ -97,5 +96,4 @@ public class MDStoreVersion implements Serializable {
 	public void setSize(final long size) {
 		this.size = size;
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreWithInfo.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
@@ -14,9 +15,7 @@ import javax.persistence.TemporalType;
 @Table(name = "mdstores_with_info")
 public class MDStoreWithInfo implements Serializable {
 
-	/**
+	/** */
-	 *
-	 */
 	private static final long serialVersionUID = -8445784770687571492L;
 
 	@Id
@@ -141,5 +140,4 @@ public class MDStoreWithInfo implements Serializable {
 	public void setNumberOfVersions(final long numberOfVersions) {
 		this.numberOfVersions = numberOfVersions;
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/application/ArgumentApplicationParser.java

@@ -1,9 +1,5 @@
-package eu.dnetlib.dhp.application;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+package eu.dnetlib.dhp.application;
-import org.apache.commons.cli.*;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.IOUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -12,7 +8,12 @@ import java.io.StringWriter;
 import java.util.*;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
-import java.util.zip.Inflater;
+
+import org.apache.commons.cli.*;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class ArgumentApplicationParser implements Serializable {
 
@@ -33,7 +34,10 @@ public class ArgumentApplicationParser implements Serializable {
 
 	private void createOptionMap(final OptionsParameter[] configuration) {
 
-        Arrays.stream(configuration).map(conf -> {
+		Arrays
+			.stream(configuration)
+			.map(
+				conf -> {
 					final Option o = new Option(conf.getParamName(), true, conf.getParamDescription());
 					o.setLongOpt(conf.getParamLongName());
 					o.setRequired(conf.isParamRequired());
@@ -41,15 +45,14 @@ public class ArgumentApplicationParser implements Serializable {
 						compressedValues.add(conf.getParamLongName());
 					}
 					return o;
-        }).forEach(options::addOption);
+				})
-
+			.forEach(options::addOption);
-//        HelpFormatter formatter = new HelpFormatter();
-//        formatter.printHelp("myapp", null, options, null, true);
 
+		// HelpFormatter formatter = new HelpFormatter();
+		// formatter.printHelp("myapp", null, options, null, true);
 
 	}
 
-
 	public static String decompressValue(final String abstractCompressed) {
 		try {
 			byte[] byteArray = Base64.decodeBase64(abstractCompressed.getBytes());
@@ -63,7 +66,7 @@ public class ArgumentApplicationParser implements Serializable {
 		}
 	}
 
-    public static String compressArgument(final String value)  throws Exception{
+	public static String compressArgument(final String value) throws Exception {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		GZIPOutputStream gzip = new GZIPOutputStream(out);
 		gzip.write(value.getBytes());
@@ -74,7 +77,15 @@ public class ArgumentApplicationParser implements Serializable {
 	public void parseArgument(final String[] args) throws Exception {
 		CommandLineParser parser = new BasicParser();
 		CommandLine cmd = parser.parse(options, args);
-        Arrays.stream(cmd.getOptions()).forEach(it -> objectMap.put(it.getLongOpt(), compressedValues.contains(it.getLongOpt())? decompressValue(it.getValue()): it.getValue()));
+		Arrays
+			.stream(cmd.getOptions())
+			.forEach(
+				it -> objectMap
+					.put(
+						it.getLongOpt(),
+						compressedValues.contains(it.getLongOpt())
+							? decompressValue(it.getValue())
+							: it.getValue()));
 	}
 
 	public String get(final String key) {

dhp-common/src/main/java/eu/dnetlib/dhp/application/OptionsParameter.java

@@ -1,5 +1,5 @@
-package eu.dnetlib.dhp.application;
 
+package eu.dnetlib.dhp.application;
 
 public class OptionsParameter {
 

dhp-common/src/main/java/eu/dnetlib/dhp/common/FunctionalInterfaceSupport.java

@@ -1,11 +1,10 @@
+
 package eu.dnetlib.dhp.common;
 
 import java.io.Serializable;
 import java.util.function.Supplier;
 
-/**
+/** Provides serializable and throwing extensions to standard functional interfaces. */
- * Provides serializable and throwing extensions to standard functional interfaces.
- */
 public class FunctionalInterfaceSupport {
 
 	private FunctionalInterfaceSupport() {
@@ -52,5 +51,4 @@ public class FunctionalInterfaceSupport {
 	public interface ThrowingRunnable<E extends Exception> {
 		void run() throws E;
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/common/HdfsSupport.java

@@ -1,5 +1,12 @@
+
 package eu.dnetlib.dhp.common;
 
+import static eu.dnetlib.dhp.common.ThrowingSupport.rethrowAsRuntimeException;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
@@ -7,21 +14,29 @@ import org.apache.hadoop.fs.Path;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
+/** HDFS utility methods. */
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static eu.dnetlib.dhp.common.ThrowingSupport.rethrowAsRuntimeException;
-
-/**
- * HDFS utility methods.
- */
 public class HdfsSupport {
 	private static final Logger logger = LoggerFactory.getLogger(HdfsSupport.class);
 
 	private HdfsSupport() {
 	}
 
+	/**
+	 * Checks a path (file or dir) exists on HDFS.
+	 *
+	 * @param path Path to be checked
+	 * @param configuration Configuration of hadoop env
+	 */
+	public static boolean exists(String path, Configuration configuration) {
+		logger.info("Removing path: {}", path);
+		return rethrowAsRuntimeException(
+			() -> {
+				Path f = new Path(path);
+				FileSystem fileSystem = FileSystem.get(configuration);
+				return fileSystem.exists(f);
+			});
+	}
+
 	/**
 	 * Removes a path (file or dir) from HDFS.
 	 *
@@ -30,7 +45,8 @@ public class HdfsSupport {
 	 */
 	public static void remove(String path, Configuration configuration) {
 		logger.info("Removing path: {}", path);
-        rethrowAsRuntimeException(() -> {
+		rethrowAsRuntimeException(
+			() -> {
 				Path f = new Path(path);
 				FileSystem fileSystem = FileSystem.get(configuration);
 				if (fileSystem.exists(f)) {
@@ -48,7 +64,8 @@ public class HdfsSupport {
 	 */
 	public static List<String> listFiles(String path, Configuration configuration) {
 		logger.info("Listing files in path: {}", path);
-        return rethrowAsRuntimeException(() -> Arrays
+		return rethrowAsRuntimeException(
+			() -> Arrays
 				.stream(FileSystem.get(configuration).listStatus(new Path(path)))
 				.filter(FileStatus::isDirectory)
 				.map(x -> x.getPath().toString())

dhp-common/src/main/java/eu/dnetlib/dhp/common/SparkSessionSupport.java

@@ -1,15 +1,15 @@
-package eu.dnetlib.dhp.common;
 
-import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.ThrowingConsumer;
+package eu.dnetlib.dhp.common;
-import org.apache.spark.SparkConf;
-import org.apache.spark.sql.SparkSession;
 
 import java.util.Objects;
 import java.util.function.Function;
 
-/**
+import org.apache.spark.SparkConf;
- * SparkSession utility methods.
+import org.apache.spark.sql.SparkSession;
- */
+
+import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.ThrowingConsumer;
+
+/** SparkSession utility methods. */
 public class SparkSessionSupport {
 
 	private SparkSessionSupport() {
@@ -23,36 +23,40 @@ public class SparkSessionSupport {
 	 * @param isSparkSessionManaged When true will stop SparkSession
 	 * @param fn Consumer to be applied to constructed SparkSession
 	 */
-    public static void runWithSparkSession(SparkConf conf,
+	public static void runWithSparkSession(
-                                           Boolean isSparkSessionManaged,
+		SparkConf conf, Boolean isSparkSessionManaged, ThrowingConsumer<SparkSession, Exception> fn) {
-                                           ThrowingConsumer<SparkSession, Exception> fn) {
+		runWithSparkSession(
-        runWithSparkSession(c -> SparkSession.builder().config(c).getOrCreate(), conf, isSparkSessionManaged, fn);
+			c -> SparkSession.builder().config(c).getOrCreate(), conf, isSparkSessionManaged, fn);
 	}
 
 	/**
-     * Runs a given function using SparkSession created with hive support and using default builder and supplied SparkConf.
+	 * Runs a given function using SparkSession created with hive support and using default builder and supplied
-     * Stops SparkSession when SparkSession is managed. Allows to reuse SparkSession created externally.
+	 * SparkConf. Stops SparkSession when SparkSession is managed. Allows to reuse SparkSession created externally.
 	 *
 	 * @param conf SparkConf instance
 	 * @param isSparkSessionManaged When true will stop SparkSession
 	 * @param fn Consumer to be applied to constructed SparkSession
 	 */
-    public static void runWithSparkHiveSession(SparkConf conf,
+	public static void runWithSparkHiveSession(
-                                           Boolean isSparkSessionManaged,
+		SparkConf conf, Boolean isSparkSessionManaged, ThrowingConsumer<SparkSession, Exception> fn) {
-                                           ThrowingConsumer<SparkSession, Exception> fn) {
+		runWithSparkSession(
-        runWithSparkSession(c -> SparkSession.builder().config(c).enableHiveSupport().getOrCreate(), conf, isSparkSessionManaged, fn);
+			c -> SparkSession.builder().config(c).enableHiveSupport().getOrCreate(),
+			conf,
+			isSparkSessionManaged,
+			fn);
 	}
 
 	/**
-     * Runs a given function using SparkSession created using supplied builder and supplied SparkConf. Stops SparkSession
+	 * Runs a given function using SparkSession created using supplied builder and supplied SparkConf. Stops
-     * when SparkSession is managed. Allows to reuse SparkSession created externally.
+	 * SparkSession when SparkSession is managed. Allows to reuse SparkSession created externally.
 	 *
 	 * @param sparkSessionBuilder Builder of SparkSession
 	 * @param conf SparkConf instance
 	 * @param isSparkSessionManaged When true will stop SparkSession
 	 * @param fn Consumer to be applied to constructed SparkSession
 	 */
-    public static void runWithSparkSession(Function<SparkConf, SparkSession> sparkSessionBuilder,
+	public static void runWithSparkSession(
+		Function<SparkConf, SparkSession> sparkSessionBuilder,
 		SparkConf conf,
 		Boolean isSparkSessionManaged,
 		ThrowingConsumer<SparkSession, Exception> fn) {

dhp-common/src/main/java/eu/dnetlib/dhp/common/ThrowingSupport.java

@@ -1,11 +1,10 @@
+
 package eu.dnetlib.dhp.common;
 
 import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.ThrowingRunnable;
 import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.ThrowingSupplier;
 
-/**
+/** Exception handling utility methods. */
- * Exception handling utility methods.
- */
 public class ThrowingSupport {
 
 	private ThrowingSupport() {
@@ -32,7 +31,8 @@ public class ThrowingSupport {
 	 * @param msg Message to be set for rethrown exception
 	 * @param <E> Type of exception thrown
 	 */
-    public static <E extends Exception> void rethrowAsRuntimeException(ThrowingRunnable<E> fn, String msg) {
+	public static <E extends Exception> void rethrowAsRuntimeException(
+		ThrowingRunnable<E> fn, String msg) {
 		try {
 			fn.run();
 		} catch (Exception e) {
@@ -65,12 +65,12 @@ public class ThrowingSupport {
 	 * @param <E> Type of exception thrown
 	 * @return Result of supplier execution
 	 */
-    public static <T, E extends Exception> T rethrowAsRuntimeException(ThrowingSupplier<T, E> fn, String msg) {
+	public static <T, E extends Exception> T rethrowAsRuntimeException(
+		ThrowingSupplier<T, E> fn, String msg) {
 		try {
 			return fn.get();
 		} catch (Exception e) {
 			throw new RuntimeException(msg, e);
 		}
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/MetadataRecord.java

@@ -1,66 +1,53 @@
-package eu.dnetlib.dhp.model.mdstore;
 
-import eu.dnetlib.dhp.utils.DHPUtils;
+package eu.dnetlib.dhp.model.mdstore;
 
 import java.io.Serializable;
 
+import eu.dnetlib.dhp.utils.DHPUtils;
 
-/**
+/** This class models a record inside the new Metadata store collection on HDFS * */
- * This class models a record inside the new Metadata store collection on HDFS *
- *
- */
 public class MetadataRecord implements Serializable {
 
-    /**
+	/** The D-Net Identifier associated to the record */
-     * The D-Net Identifier associated to the record
-     */
 	private String id;
 
-    /**
+	/** The original Identifier of the record */
-     * The original Identifier of the record
-     */
 	private String originalId;
 
-
+	/** The encoding of the record, should be JSON or XML */
-    /**
-     * The encoding of the record, should be JSON or XML
-     */
 	private String encoding;
 
 	/**
-     * The information about the provenance of the record see @{@link Provenance}
+	 * The information about the provenance of the record see @{@link Provenance} for the model of this information
-     * for the model of this information
 	 */
 	private Provenance provenance;
 
-    /**
+	/** The content of the metadata */
-     * The content of the metadata
-     */
 	private String body;
 
-    /**
+	/** the date when the record has been stored */
-     * the date when the record has been stored
-     */
 	private long dateOfCollection;
 
-    /**
+	/** the date when the record has been stored */
-     * the date when the record has been stored
-     */
 	private long dateOfTransformation;
 
-
 	public MetadataRecord() {
 		this.dateOfCollection = System.currentTimeMillis();
 	}
 
-    public MetadataRecord(String originalId, String encoding, Provenance provenance, String body, long dateOfCollection) {
+	public MetadataRecord(
+		String originalId,
+		String encoding,
+		Provenance provenance,
+		String body,
+		long dateOfCollection) {
 
 		this.originalId = originalId;
 		this.encoding = encoding;
 		this.provenance = provenance;
 		this.body = body;
 		this.dateOfCollection = dateOfCollection;
-        this.id = DHPUtils.generateIdentifier(originalId,this.provenance.getNsPrefix());
+		this.id = DHPUtils.generateIdentifier(originalId, this.provenance.getNsPrefix());
 	}
 
 	public String getId() {
@@ -71,7 +58,6 @@ public class MetadataRecord implements Serializable {
 		this.id = id;
 	}
 
-
 	public String getOriginalId() {
 		return originalId;
 	}
@@ -96,7 +82,6 @@ public class MetadataRecord implements Serializable {
 		this.provenance = provenance;
 	}
 
-
 	public String getBody() {
 		return body;
 	}
@@ -127,7 +112,6 @@ public class MetadataRecord implements Serializable {
 			return false;
 		}
 		return ((MetadataRecord) o).getId().equalsIgnoreCase(id);
-
 	}
 
 	@Override

dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/Provenance.java

@@ -1,27 +1,23 @@
+
 package eu.dnetlib.dhp.model.mdstore;
 
 import java.io.Serializable;
 
-
 /**
  * @author Sandro La Bruzzo
- *
+ *         <p>
- * Provenace class models the provenance of the record in the metadataStore
+ *         Provenace class models the provenance of the record in the metadataStore It contains the identifier and the
- * It contains the identifier and the name of the datasource that gives the
+ *         name of the datasource that gives the record
- * record
- *
  */
 public class Provenance implements Serializable {
 
 	private String datasourceId;
 
-
 	private String datasourceName;
 
 	private String nsPrefix;
 
 	public Provenance() {
-
 	}
 
 	public Provenance(String datasourceId, String datasourceName, String nsPrefix) {

dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdException.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.parser.utility;
 
 public class VtdException extends Exception {

dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdUtilityParser.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.parser.utility;
 
 import java.util.ArrayList;
@@ -5,16 +6,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 import com.ximpleware.AutoPilot;
 import com.ximpleware.VTDNav;
 
-/**
+/** Created by sandro on 9/29/16. */
- * Created by sandro on 9/29/16.
- */
 public class VtdUtilityParser {
 
-    public static List<Node> getTextValuesWithAttributes(final AutoPilot ap, final VTDNav vn, final String xpath, final List<String> attributes)
+	public static List<Node> getTextValuesWithAttributes(
+		final AutoPilot ap, final VTDNav vn, final String xpath, final List<String> attributes)
 		throws VtdException {
 		final List<Node> results = new ArrayList<>();
 		try {
@@ -39,7 +38,9 @@ public class VtdUtilityParser {
 		final Map<String, String> currentAttributes = new HashMap<>();
 		if (attributes != null) {
 
-            attributes.forEach(attributeKey -> {
+			attributes
+				.forEach(
+					attributeKey -> {
 						try {
 							int attr = vn.getAttrVal(attributeKey);
 							if (attr > -1) {
@@ -53,13 +54,15 @@ public class VtdUtilityParser {
 		return currentAttributes;
 	}
 
-    public static List<String> getTextValue(final AutoPilot ap, final VTDNav vn, final String xpath) throws VtdException {
+	public static List<String> getTextValue(final AutoPilot ap, final VTDNav vn, final String xpath)
+		throws VtdException {
 		List<String> results = new ArrayList<>();
 		try {
 			ap.selectXPath(xpath);
 			while (ap.evalXPath() != -1) {
 				int t = vn.getText();
-                if (t > -1) results.add(vn.toNormalizedString(t));
+				if (t > -1)
+					results.add(vn.toNormalizedString(t));
 			}
 			return results;
 		} catch (Exception e) {
@@ -67,7 +70,8 @@ public class VtdUtilityParser {
 		}
 	}
 
-    public static String getSingleValue(final AutoPilot ap, final VTDNav nav, final String xpath) throws VtdException {
+	public static String getSingleValue(final AutoPilot ap, final VTDNav nav, final String xpath)
+		throws VtdException {
 		try {
 			ap.selectXPath(xpath);
 			while (ap.evalXPath() != -1) {
@@ -103,5 +107,4 @@ public class VtdUtilityParser {
 			this.attributes = attributes;
 		}
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java

@@ -1,11 +1,5 @@
-package eu.dnetlib.dhp.utils;
 
-import com.jayway.jsonpath.JsonPath;
+package eu.dnetlib.dhp.utils;
-import net.minidev.json.JSONArray;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.binary.Base64OutputStream;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -14,12 +8,20 @@ import java.security.MessageDigest;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Base64OutputStream;
+import org.apache.commons.codec.binary.Hex;
+
+import com.jayway.jsonpath.JsonPath;
+
+import net.minidev.json.JSONArray;
+
 public class DHPUtils {
 
 	public static String md5(final String s) {
 		try {
 			final MessageDigest md = MessageDigest.getInstance("MD5");
-            md.update(s.getBytes("UTF-8"));
+			md.update(s.getBytes(StandardCharsets.UTF_8));
 			return new String(Hex.encodeHex(md.digest()));
 		} catch (final Exception e) {
 			System.err.println("Error creating id");
@@ -28,34 +30,34 @@ public class DHPUtils {
 	}
 
 	public static String generateIdentifier(final String originalId, final String nsPrefix) {
-        return String.format("%s::%s",nsPrefix, DHPUtils.md5(originalId));
+		return String.format("%s::%s", nsPrefix, DHPUtils.md5(originalId));
 	}
 
-    public static String compressString(final String input ) {
+	public static String compressString(final String input) {
-        try ( ByteArrayOutputStream out = new ByteArrayOutputStream();  Base64OutputStream b64os = new Base64OutputStream(out)) {
+		try (ByteArrayOutputStream out = new ByteArrayOutputStream();
+			Base64OutputStream b64os = new Base64OutputStream(out)) {
 			GZIPOutputStream gzip = new GZIPOutputStream(b64os);
 			gzip.write(input.getBytes(StandardCharsets.UTF_8));
 			gzip.close();
 			return out.toString();
-        } catch (Throwable e ) {
+		} catch (Throwable e) {
 			return null;
 		}
 	}
 
-
 	public static String decompressString(final String input) {
 		byte[] byteArray = Base64.decodeBase64(input.getBytes());
 		int len;
-        try (GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream((byteArray))); ByteArrayOutputStream bos = new ByteArrayOutputStream(byteArray.length)) {
+		try (GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream((byteArray)));
+			ByteArrayOutputStream bos = new ByteArrayOutputStream(byteArray.length)) {
 			byte[] buffer = new byte[1024];
-            while((len = gis.read(buffer)) != -1){
+			while ((len = gis.read(buffer)) != -1) {
 				bos.write(buffer, 0, len);
 			}
 			return bos.toString();
 		} catch (Exception e) {
 			return null;
 		}
-
 	}
 
 	public static String getJPathString(final String jsonPath, final String json) {
@@ -70,5 +72,4 @@ public class DHPUtils {
 			return "";
 		}
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java

@@ -1,10 +1,12 @@
+
 package eu.dnetlib.dhp.utils;
 
-import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
+
 public class ISLookupClientFactory {
 
 	private static final Log log = LogFactory.getLog(ISLookupClientFactory.class);

dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/AbstractExtensionFunction.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.utils.saxon;
 
 import net.sf.saxon.expr.XPathContext;
@@ -12,6 +13,7 @@ public abstract class AbstractExtensionFunction extends ExtensionFunctionDefinit
 	public static String DEFAULT_SAXON_EXT_NS_URI = "http://www.d-net.research-infrastructures.eu/saxon-extension";
 
 	public abstract String getName();
+
 	public abstract Sequence doCall(XPathContext context, Sequence[] arguments) throws XPathException;
 
 	@Override
@@ -28,5 +30,4 @@ public abstract class AbstractExtensionFunction extends ExtensionFunctionDefinit
 			}
 		};
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/ExtractYear.java

@@ -1,5 +1,11 @@
+
 package eu.dnetlib.dhp.utils.saxon;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
 import net.sf.saxon.expr.XPathContext;
 import net.sf.saxon.om.Item;
 import net.sf.saxon.om.Sequence;
@@ -7,14 +13,11 @@ import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.value.SequenceType;
 import net.sf.saxon.value.StringValue;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
 public class ExtractYear extends AbstractExtensionFunction {
 
-    private static final String[] dateFormats = { "yyyy-MM-dd", "yyyy/MM/dd" };
+	private static final String[] dateFormats = {
+		"yyyy-MM-dd", "yyyy/MM/dd"
+	};
 
 	@Override
 	public String getName() {
@@ -45,7 +48,9 @@ public class ExtractYear extends AbstractExtensionFunction {
 
 	@Override
 	public SequenceType[] getArgumentTypes() {
-        return new SequenceType[] { SequenceType.OPTIONAL_ITEM };
+		return new SequenceType[] {
+			SequenceType.OPTIONAL_ITEM
+		};
 	}
 
 	@Override
@@ -60,7 +65,8 @@ public class ExtractYear extends AbstractExtensionFunction {
 				c.setTime(new SimpleDateFormat(format).parse(s));
 				String year = String.valueOf(c.get(Calendar.YEAR));
 				return year;
-            } catch (ParseException e) {}
+			} catch (ParseException e) {
+			}
 		}
 		return "";
 	}

dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java

@@ -1,20 +1,23 @@
+
 package eu.dnetlib.dhp.utils.saxon;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import net.sf.saxon.expr.XPathContext;
 import net.sf.saxon.om.Sequence;
 import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.value.SequenceType;
 import net.sf.saxon.value.StringValue;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 public class NormalizeDate extends AbstractExtensionFunction {
 
-    private static final String[] normalizeDateFormats = { "yyyy-MM-dd'T'hh:mm:ss", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy" };
+	private static final String[] normalizeDateFormats = {
+		"yyyy-MM-dd'T'hh:mm:ss", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy"
+	};
 
-    private static final String normalizeOutFormat = new String("yyyy-MM-dd'T'hh:mm:ss'Z'");
+	private static final String normalizeOutFormat = "yyyy-MM-dd'T'hh:mm:ss'Z'";
 
 	@Override
 	public String getName() {
@@ -42,7 +45,9 @@ public class NormalizeDate extends AbstractExtensionFunction {
 
 	@Override
 	public SequenceType[] getArgumentTypes() {
-        return new SequenceType[] { SequenceType.OPTIONAL_ITEM };
+		return new SequenceType[] {
+			SequenceType.OPTIONAL_ITEM
+		};
 	}
 
 	@Override
@@ -58,9 +63,9 @@ public class NormalizeDate extends AbstractExtensionFunction {
 				Date parse = new SimpleDateFormat(format).parse(date);
 				String res = new SimpleDateFormat(normalizeOutFormat).format(parse);
 				return res;
-            } catch (ParseException e) {}
+			} catch (ParseException e) {
+			}
 		}
 		return "";
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/PickFirst.java

@@ -1,12 +1,14 @@
+
 package eu.dnetlib.dhp.utils.saxon;
 
+import org.apache.commons.lang3.StringUtils;
+
 import net.sf.saxon.expr.XPathContext;
 import net.sf.saxon.om.Item;
 import net.sf.saxon.om.Sequence;
 import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.value.SequenceType;
 import net.sf.saxon.value.StringValue;
-import org.apache.commons.lang3.StringUtils;
 
 public class PickFirst extends AbstractExtensionFunction {
 
@@ -49,12 +51,13 @@ public class PickFirst extends AbstractExtensionFunction {
 
 	@Override
 	public SequenceType[] getArgumentTypes() {
-        return new SequenceType[] { SequenceType.OPTIONAL_ITEM };
+		return new SequenceType[] {
+			SequenceType.OPTIONAL_ITEM
+		};
 	}
 
 	@Override
 	public SequenceType getResultType(SequenceType[] suppliedArgumentTypes) {
 		return SequenceType.SINGLE_STRING;
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/SaxonTransformerFactory.java

@@ -1,17 +1,20 @@
+
 package eu.dnetlib.dhp.utils.saxon;
 
-import net.sf.saxon.Configuration;
+import java.io.StringReader;
-import net.sf.saxon.TransformerFactoryImpl;
 
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamSource;
-import java.io.StringReader;
+
+import net.sf.saxon.Configuration;
+import net.sf.saxon.TransformerFactoryImpl;
 
 public class SaxonTransformerFactory {
 
 	/**
 	 * Creates the index record transformer from the given XSLT
+	 *
 	 * @param xslt
 	 * @return
 	 * @throws TransformerException
@@ -26,5 +29,4 @@ public class SaxonTransformerFactory {
 
 		return factory.newTransformer(new StreamSource(new StringReader(xslt)));
 	}
-
 }

dhp-common/src/main/java/eu/dnetlib/message/Message.java

@@ -1,11 +1,12 @@
-package eu.dnetlib.message;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+package eu.dnetlib.message;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 public class Message {
 
 	private String workflowId;
@@ -16,19 +17,12 @@ public class Message {
 
 	private Map<String, String> body;
 
-
 	public static Message fromJson(final String json) throws IOException {
 		final ObjectMapper jsonMapper = new ObjectMapper();
 		return jsonMapper.readValue(json, Message.class);
-
-
 	}
 
-
 	public Message() {
-
-
-
 	}
 
 	public Message(String workflowId, String jobName, MessageType type, Map<String, String> body) {

dhp-common/src/main/java/eu/dnetlib/message/MessageConsumer.java

@@ -1,19 +1,19 @@
+
 package eu.dnetlib.message;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.LinkedBlockingQueue;
+
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.Envelope;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.LinkedBlockingQueue;
-
 public class MessageConsumer extends DefaultConsumer {
 
 	final LinkedBlockingQueue<Message> queueMessages;
 
-
 	/**
 	 * Constructs a new instance and records its association to the passed-in channel.
 	 *
@@ -25,19 +25,20 @@ public class MessageConsumer extends DefaultConsumer {
 		this.queueMessages = queueMessages;
 	}
 
-
 	@Override
-    public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException {
+	public void handleDelivery(
+		String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body)
+		throws IOException {
 		final String json = new String(body, StandardCharsets.UTF_8);
 		Message message = Message.fromJson(json);
 		try {
 			this.queueMessages.put(message);
-            System.out.println("Receiving Message "+message);
+			System.out.println("Receiving Message " + message);
 		} catch (InterruptedException e) {
-            if (message.getType()== MessageType.REPORT)
+			if (message.getType() == MessageType.REPORT)
 				throw new RuntimeException("Error on sending message");
 			else {
-                //TODO LOGGING EXCEPTION
+				// TODO LOGGING EXCEPTION
 			}
 		} finally {
 			getChannel().basicAck(envelope.getDeliveryTag(), false);

dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java

@@ -1,9 +1,5 @@
-package eu.dnetlib.message;
 
-import com.rabbitmq.client.Channel;
+package eu.dnetlib.message;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-import sun.rmi.runtime.Log;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -11,6 +7,10 @@ import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeoutException;
 
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+
 public class MessageManager {
 
 	private final String messageHost;
@@ -21,23 +21,32 @@ public class MessageManager {
 
 	private Connection connection;
 
-    private Map<String , Channel> channels = new HashMap<>();
+	private final Map<String, Channel> channels = new HashMap<>();
 
 	private boolean durable;
 
 	private boolean autodelete;
 
-    final private LinkedBlockingQueue<Message> queueMessages;
+	private final LinkedBlockingQueue<Message> queueMessages;
 
-    public MessageManager(String messageHost, String username, String password, final LinkedBlockingQueue<Message> queueMessages) {
+	public MessageManager(
+		String messageHost,
+		String username,
+		String password,
+		final LinkedBlockingQueue<Message> queueMessages) {
 		this.queueMessages = queueMessages;
 		this.messageHost = messageHost;
 		this.username = username;
 		this.password = password;
 	}
 
-
+	public MessageManager(
-    public MessageManager(String messageHost, String username, String password, boolean durable, boolean autodelete, final LinkedBlockingQueue<Message> queueMessages) {
+		String messageHost,
+		String username,
+		String password,
+		boolean durable,
+		boolean autodelete,
+		final LinkedBlockingQueue<Message> queueMessages) {
 		this.queueMessages = queueMessages;
 		this.messageHost = messageHost;
 		this.username = username;
@@ -55,7 +64,12 @@ public class MessageManager {
 		return factory.newConnection();
 	}
 
-    private Channel createChannel(final Connection connection, final String queueName, final boolean durable, final boolean autodelete ) throws Exception {
+	private Channel createChannel(
+		final Connection connection,
+		final String queueName,
+		final boolean durable,
+		final boolean autodelete)
+		throws Exception {
 		Map<String, Object> args = new HashMap<>();
 		args.put("x-message-ttl", 10000);
 		Channel channel = connection.createChannel();
@@ -63,7 +77,8 @@ public class MessageManager {
 		return channel;
 	}
 
-    private Channel getOrCreateChannel(final String queueName, boolean durable, boolean autodelete) throws Exception {
+	private Channel getOrCreateChannel(final String queueName, boolean durable, boolean autodelete)
+		throws Exception {
 		if (channels.containsKey(queueName)) {
 			return channels.get(queueName);
 		}
@@ -75,14 +90,15 @@ public class MessageManager {
 		return channels.get(queueName);
 	}
 
-
-
 	public void close() throws IOException {
-        channels.values().forEach(ch-> {
+		channels
+			.values()
+			.forEach(
+				ch -> {
 					try {
 						ch.close();
 					} catch (Exception e) {
-                //TODO LOG
+						// TODO LOG
 					}
 				});
 
@@ -92,26 +108,29 @@ public class MessageManager {
 	public boolean sendMessage(final Message message, String queueName) throws Exception {
 		try {
 			Channel channel = getOrCreateChannel(queueName, this.durable, this.autodelete);
-            channel.basicPublish("", queueName,null, message.toString().getBytes());
+			channel.basicPublish("", queueName, null, message.toString().getBytes());
 			return true;
 		} catch (Throwable e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-    public boolean sendMessage(final Message message, String queueName, boolean durable_var, boolean autodelete_var) throws Exception {
+	public boolean sendMessage(
+		final Message message, String queueName, boolean durable_var, boolean autodelete_var)
+		throws Exception {
 		try {
 			Channel channel = getOrCreateChannel(queueName, durable_var, autodelete_var);
-            channel.basicPublish("", queueName,null, message.toString().getBytes());
+			channel.basicPublish("", queueName, null, message.toString().getBytes());
 			return true;
 		} catch (Throwable e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-    public void startConsumingMessage(final String queueName, final boolean durable, final boolean autodelete)  throws Exception{
+	public void startConsumingMessage(
+		final String queueName, final boolean durable, final boolean autodelete) throws Exception {
 
 		Channel channel = createChannel(createConnection(), queueName, durable, autodelete);
-        channel.basicConsume(queueName, false, new MessageConsumer(channel,queueMessages));
+		channel.basicConsume(queueName, false, new MessageConsumer(channel, queueMessages));
 	}
 }

dhp-common/src/main/java/eu/dnetlib/message/MessageType.java

@@ -1,8 +1,6 @@
+
 package eu.dnetlib.message;
 
 public enum MessageType {
-
+	ONGOING, REPORT
-    ONGOING,
-    REPORT
-
 }

dhp-common/src/main/java/eu/dnetlib/scholexplorer/relation/RelInfo.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.scholexplorer.relation;
 
 import java.io.Serializable;

dhp-common/src/main/java/eu/dnetlib/scholexplorer/relation/RelationMapper.java

@@ -1,12 +1,14 @@
-package eu.dnetlib.scholexplorer.relation;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+package eu.dnetlib.scholexplorer.relation;
-import org.apache.commons.io.IOUtils;
 
 import java.io.Serializable;
 import java.util.HashMap;
 
-public class RelationMapper extends HashMap<String,RelInfo > implements Serializable {
+import org.apache.commons.io.IOUtils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class RelationMapper extends HashMap<String, RelInfo> implements Serializable {
 
 	public static RelationMapper load() throws Exception {
 
@@ -15,5 +17,4 @@ public class RelationMapper extends HashMap<String,RelInfo > implements Serializ
 		ObjectMapper mapper = new ObjectMapper();
 		return mapper.readValue(json, RelationMapper.class);
 	}
-
 }

dhp-common/src/test/java/eu/dnetlib/dhp/application/ArgumentApplicationParserTest.java

@@ -1,29 +1,46 @@
-package eu.dnetlib.dhp.application;
 
-import org.apache.commons.io.IOUtils;
+package eu.dnetlib.dhp.application;
-import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Test;
+
 public class ArgumentApplicationParserTest {
 
 	@Test
 	public void testParseParameter() throws Exception {
-        final String jsonConfiguration = IOUtils.toString(this.getClass().getResourceAsStream("/eu/dnetlib/application/parameters.json"));
+		final String jsonConfiguration = IOUtils
+			.toString(
+				this.getClass().getResourceAsStream("/eu/dnetlib/application/parameters.json"));
 		assertNotNull(jsonConfiguration);
 		ArgumentApplicationParser parser = new ArgumentApplicationParser(jsonConfiguration);
-        parser.parseArgument(new String[]{"-p", "value0",
+		parser
-                "-a", "value1",
+			.parseArgument(
-                "-n", "value2",
+				new String[] {
-                "-u", "value3",
+					"-p",
-                "-ru", "value4",
+					"value0",
-                "-rp", "value5",
+					"-a",
-                "-rh", "value6",
+					"value1",
-                "-ro", "value7",
+					"-n",
-                "-rr", "value8",
+					"value2",
-                "-w", "value9",
+					"-u",
-                "-cc", ArgumentApplicationParser.compressArgument(jsonConfiguration)
+					"value3",
+					"-ru",
+					"value4",
+					"-rp",
+					"value5",
+					"-rh",
+					"value6",
+					"-ro",
+					"value7",
+					"-rr",
+					"value8",
+					"-w",
+					"value9",
+					"-cc",
+					ArgumentApplicationParser.compressArgument(jsonConfiguration)
 				});
 		assertNotNull(parser.get("hdfsPath"));
 		assertNotNull(parser.get("apidescriptor"));
@@ -47,10 +64,4 @@ public class ArgumentApplicationParserTest {
 		assertEquals("value9", parser.get("workflowId"));
 		assertEquals(jsonConfiguration, parser.get("ccCoco"));
 	}
-
-
-
-
-
-
 }

dhp-common/src/test/java/eu/dnetlib/dhp/common/HdfsSupportTest.java

@@ -1,9 +1,7 @@
+
 package eu.dnetlib.dhp.common;
 
-import org.apache.hadoop.conf.Configuration;
+import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -12,7 +10,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.apache.hadoop.conf.Configuration;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class HdfsSupportTest {
 
@@ -22,8 +23,7 @@ public class HdfsSupportTest {
 		@Test
 		public void shouldThrowARuntimeExceptionOnError() {
 			// when
-            assertThrows(RuntimeException.class, () ->
+			assertThrows(RuntimeException.class, () -> HdfsSupport.remove(null, new Configuration()));
-                    HdfsSupport.remove(null, new Configuration()));
 		}
 
 		@Test
@@ -54,8 +54,7 @@ public class HdfsSupportTest {
 		@Test
 		public void shouldThrowARuntimeExceptionOnError() {
 			// when
-            assertThrows(RuntimeException.class, () ->
+			assertThrows(RuntimeException.class, () -> HdfsSupport.listFiles(null, new Configuration()));
-                    HdfsSupport.listFiles(null, new Configuration()));
 		}
 
 		@Test
@@ -68,8 +67,11 @@ public class HdfsSupportTest {
 
 			// then
 			assertEquals(2, paths.size());
-            List<String> expecteds = Arrays.stream(new String[]{subDir1.toString(), subDir2.toString()})
+			List<String> expecteds = Arrays.stream(new String[] {
-                    .sorted().collect(Collectors.toList());
+				subDir1.toString(), subDir2.toString()
+			})
+				.sorted()
+				.collect(Collectors.toList());
 			List<String> actuals = paths.stream().sorted().collect(Collectors.toList());
 			assertTrue(actuals.get(0).contains(expecteds.get(0)));
 			assertTrue(actuals.get(1).contains(expecteds.get(1)));

dhp-common/src/test/java/eu/dnetlib/dhp/common/SparkSessionSupportTest.java

@@ -1,14 +1,16 @@
+
 package eu.dnetlib.dhp.common;
 
-import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.ThrowingConsumer;
+import static org.mockito.Mockito.*;
+
+import java.util.function.Function;
+
 import org.apache.spark.SparkConf;
 import org.apache.spark.sql.SparkSession;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-import java.util.function.Function;
+import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.ThrowingConsumer;
-
-import static org.mockito.Mockito.*;
 
 public class SparkSessionSupportTest {
 
@@ -16,7 +18,8 @@ public class SparkSessionSupportTest {
 	class RunWithSparkSession {
 
 		@Test
-        public void shouldExecuteFunctionAndNotStopSparkSessionWhenSparkSessionIsNotManaged() throws Exception {
+		public void shouldExecuteFunctionAndNotStopSparkSessionWhenSparkSessionIsNotManaged()
+			throws Exception {
 			// given
 			SparkSession spark = mock(SparkSession.class);
 			SparkConf conf = mock(SparkConf.class);
@@ -34,7 +37,8 @@ public class SparkSessionSupportTest {
 		}
 
 		@Test
-        public void shouldExecuteFunctionAndStopSparkSessionWhenSparkSessionIsManaged() throws Exception {
+		public void shouldExecuteFunctionAndStopSparkSessionWhenSparkSessionIsManaged()
+			throws Exception {
 			// given
 			SparkSession spark = mock(SparkSession.class);
 			SparkConf conf = mock(SparkConf.class);

dhp-common/src/test/java/eu/dnetlib/dhp/model/mdstore/MetadataRecordTest.java

@@ -1,9 +1,10 @@
+
 package eu.dnetlib.dhp.model.mdstore;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 public class MetadataRecordTest {
 
 	@Test

dhp-common/src/test/java/eu/dnetlib/message/MessageTest.java

@@ -1,12 +1,13 @@
+
 package eu.dnetlib.message;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class MessageTest {
 
@@ -16,7 +17,7 @@ public class MessageTest {
 		m.setWorkflowId("wId");
 		m.setType(MessageType.ONGOING);
 		m.setJobName("Collection");
-        Map<String,String> body= new HashMap<>();
+		Map<String, String> body = new HashMap<>();
 		body.put("parsedItem", "300");
 		body.put("ExecutionTime", "30s");
 
@@ -34,22 +35,17 @@ public class MessageTest {
 
 	@Test
 	public void toStringTest() {
-        final String expectedJson= "{\"workflowId\":\"wId\",\"jobName\":\"Collection\",\"type\":\"ONGOING\",\"body\":{\"ExecutionTime\":\"30s\",\"parsedItem\":\"300\"}}";
+		final String expectedJson = "{\"workflowId\":\"wId\",\"jobName\":\"Collection\",\"type\":\"ONGOING\",\"body\":{\"ExecutionTime\":\"30s\",\"parsedItem\":\"300\"}}";
 		Message m = new Message();
 		m.setWorkflowId("wId");
 		m.setType(MessageType.ONGOING);
 		m.setJobName("Collection");
-        Map<String,String> body= new HashMap<>();
+		Map<String, String> body = new HashMap<>();
 		body.put("parsedItem", "300");
 		body.put("ExecutionTime", "30s");
 
 		m.setBody(body);
 
-        assertEquals(expectedJson,m.toString());
+		assertEquals(expectedJson, m.toString());
-
-
 	}
-
-
-
 }

dhp-common/src/test/java/eu/dnetlib/scholexplorer/relation/RelationMapperTest.java

@@ -1,15 +1,14 @@
+
 package eu.dnetlib.scholexplorer.relation;
 
 import org.junit.jupiter.api.Test;
 
-
 public class RelationMapperTest {
 
 	@Test
-    public void testLoadRels() throws Exception{
+	public void testLoadRels() throws Exception {
 
 		RelationMapper relationMapper = RelationMapper.load();
 		relationMapper.keySet().forEach(System.out::println);
-
 	}
 }

dhp-schemas/pom.xml

@@ -12,7 +12,7 @@
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
 
-
+    <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>
 
     <dependencies>
 

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicAction.java

@@ -1,10 +1,12 @@
+
 package eu.dnetlib.dhp.schema.action;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import eu.dnetlib.dhp.schema.oaf.Oaf;
-
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import eu.dnetlib.dhp.schema.oaf.Oaf;
+
 @JsonDeserialize(using = AtomicActionDeserializer.class)
 public class AtomicAction<T extends Oaf> implements Serializable {
 

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java

@@ -1,19 +1,22 @@
+
 package eu.dnetlib.dhp.schema.action;
 
+import java.io.IOException;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.dnetlib.dhp.schema.oaf.Oaf;
 
-import java.io.IOException;
+import eu.dnetlib.dhp.schema.oaf.Oaf;
 
 public class AtomicActionDeserializer extends JsonDeserializer {
 
 	@Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+	public Object deserialize(JsonParser jp, DeserializationContext ctxt)
+		throws IOException {
 		JsonNode node = jp.getCodec().readTree(jp);
 		String classTag = node.get("clazz").asText();
 		JsonNode payload = node.get("payload");

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java

@@ -1,16 +1,15 @@
+
 package eu.dnetlib.dhp.schema.common;
 
 import eu.dnetlib.dhp.schema.oaf.OafEntity;
 
-/**
+/** Actual entity types in the Graph */
- * Actual entity types in the Graph
- */
 public enum EntityType {
-
 	publication, dataset, otherresearchproduct, software, datasource, organization, project;
 
 	/**
 	 * Resolves the EntityType, given the relative class name
+	 *
 	 * @param clazz the given class name
 	 * @param <T> actual OafEntity subclass
 	 * @return the EntityType associated to the given class
@@ -19,5 +18,4 @@ public enum EntityType {
 
 		return EntityType.valueOf(clazz.getSimpleName().toLowerCase());
 	}
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/MainEntityType.java

@@ -1,9 +1,7 @@
+
 package eu.dnetlib.dhp.schema.common;
 
-/**
+/** Main entity types in the Graph */
- * Main entity types in the Graph
- */
 public enum MainEntityType {
-
 	result, datasource, organization, project
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java

@@ -0,0 +1,41 @@
+
+package eu.dnetlib.dhp.schema.common;
+
+import eu.dnetlib.dhp.schema.oaf.Qualifier;
+
+public class ModelConstants {
+
+	public static final String DNET_RESULT_TYPOLOGIES = "dnet:result_typologies";
+
+	public static final String DATASET_RESULTTYPE_CLASSID = "dataset";
+	public static final String PUBLICATION_RESULTTYPE_CLASSID = "publication";
+	public static final String SOFTWARE_RESULTTYPE_CLASSID = "software";
+	public static final String ORP_RESULTTYPE_CLASSID = "other";
+
+	public static Qualifier PUBLICATION_DEFAULT_RESULTTYPE = new Qualifier();
+	public static Qualifier DATASET_DEFAULT_RESULTTYPE = new Qualifier();
+	public static Qualifier SOFTWARE_DEFAULT_RESULTTYPE = new Qualifier();
+	public static Qualifier ORP_DEFAULT_RESULTTYPE = new Qualifier();
+
+	static {
+		PUBLICATION_DEFAULT_RESULTTYPE.setClassid(PUBLICATION_RESULTTYPE_CLASSID);
+		PUBLICATION_DEFAULT_RESULTTYPE.setClassname(PUBLICATION_RESULTTYPE_CLASSID);
+		PUBLICATION_DEFAULT_RESULTTYPE.setSchemeid(DNET_RESULT_TYPOLOGIES);
+		PUBLICATION_DEFAULT_RESULTTYPE.setSchemename(DNET_RESULT_TYPOLOGIES);
+
+		DATASET_DEFAULT_RESULTTYPE.setClassid(DATASET_RESULTTYPE_CLASSID);
+		DATASET_DEFAULT_RESULTTYPE.setClassname(DATASET_RESULTTYPE_CLASSID);
+		DATASET_DEFAULT_RESULTTYPE.setSchemeid(DNET_RESULT_TYPOLOGIES);
+		DATASET_DEFAULT_RESULTTYPE.setSchemename(DNET_RESULT_TYPOLOGIES);
+
+		SOFTWARE_DEFAULT_RESULTTYPE.setClassid(SOFTWARE_RESULTTYPE_CLASSID);
+		SOFTWARE_DEFAULT_RESULTTYPE.setClassname(SOFTWARE_RESULTTYPE_CLASSID);
+		SOFTWARE_DEFAULT_RESULTTYPE.setSchemeid(DNET_RESULT_TYPOLOGIES);
+		SOFTWARE_DEFAULT_RESULTTYPE.setSchemename(DNET_RESULT_TYPOLOGIES);
+
+		ORP_DEFAULT_RESULTTYPE.setClassid(ORP_RESULTTYPE_CLASSID);
+		ORP_DEFAULT_RESULTTYPE.setClassname(ORP_RESULTTYPE_CLASSID);
+		ORP_DEFAULT_RESULTTYPE.setSchemeid(DNET_RESULT_TYPOLOGIES);
+		ORP_DEFAULT_RESULTTYPE.setSchemename(DNET_RESULT_TYPOLOGIES);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java

@@ -1,19 +1,19 @@
+
 package eu.dnetlib.dhp.schema.common;
 
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
 import com.google.common.collect.Maps;
+
 import eu.dnetlib.dhp.schema.oaf.*;
 
-import java.util.Map;
+/** Oaf model utility methods. */
-
-/**
- * Oaf model utility methods.
- */
 public class ModelSupport {
 
-    /**
+	/** Defines the mapping between the actual entity type and the main entity type */
-     * Defines the mapping between the actual entity type and the main entity type
+	private static final Map<EntityType, MainEntityType> entityMapping = Maps.newHashMap();
-     */
-    private static Map<EntityType, MainEntityType> entityMapping = Maps.newHashMap();
 
 	static {
 		entityMapping.put(EntityType.publication, MainEntityType.result);
@@ -28,7 +28,7 @@ public class ModelSupport {
 	/**
 	 * Defines the mapping between the actual entity types and the relative classes implementing them
 	 */
-    public final static Map<EntityType, Class> entityTypes = Maps.newHashMap();
+	public static final Map<EntityType, Class> entityTypes = Maps.newHashMap();
 
 	static {
 		entityTypes.put(EntityType.datasource, Datasource.class);
@@ -40,7 +40,7 @@ public class ModelSupport {
 		entityTypes.put(EntityType.publication, Publication.class);
 	}
 
-    public final static Map<String, Class> oafTypes = Maps.newHashMap();
+	public static final Map<String, Class> oafTypes = Maps.newHashMap();
 
 	static {
 		oafTypes.put("datasource", Datasource.class);
@@ -67,7 +67,8 @@ public class ModelSupport {
 	 * @param <Y> Superclass type
 	 * @return True if X is a subclass of Y
 	 */
-    public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(X subClazzObject, Y superClazzObject) {
+	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
+		X subClazzObject, Y superClazzObject) {
 		return isSubClass(subClazzObject.getClass(), superClazzObject.getClass());
 	}
 
@@ -80,7 +81,8 @@ public class ModelSupport {
 	 * @param <Y> Superclass type
 	 * @return True if X is a subclass of Y
 	 */
-    public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(X subClazzObject, Class<Y> superClazz) {
+	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
+		X subClazzObject, Class<Y> superClazz) {
 		return isSubClass(subClazzObject.getClass(), superClazz);
 	}
 
@@ -93,7 +95,8 @@ public class ModelSupport {
 	 * @param <Y> Superclass type
 	 * @return True if X is a subclass of Y
 	 */
-    public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(Class<X> subClazz, Class<Y> superClazz) {
+	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
+		Class<X> subClazz, Class<Y> superClazz) {
 		return superClazz.isAssignableFrom(subClazz);
 	}
 
@@ -104,7 +107,7 @@ public class ModelSupport {
 	 * @return
 	 */
 	public static <T extends Oaf> Class<T>[] getOafModelClasses() {
-        return new Class[]{
+		return new Class[] {
 			Author.class,
 			Context.class,
 			Country.class,
@@ -143,9 +146,60 @@ public class ModelSupport {
 	}
 
 	public static String getScheme(final String sourceType, final String targetType) {
-        return String.format(schemeTemplate,
+		return String
+			.format(
+				schemeTemplate,
 				entityMapping.get(EntityType.valueOf(sourceType)).name(),
 				entityMapping.get(EntityType.valueOf(targetType)).name());
 	}
 
+	public static <T extends Oaf> Function<T, String> idFn() {
+		return x -> {
+			if (isSubClass(x, Relation.class)) {
+				return idFnForRelation(x);
+			}
+			return idFnForOafEntity(x);
+		};
+	}
+
+	private static <T extends Oaf> String idFnForRelation(T t) {
+		Relation r = (Relation) t;
+		return Optional
+			.ofNullable(r.getSource())
+			.map(
+				source -> Optional
+					.ofNullable(r.getTarget())
+					.map(
+						target -> Optional
+							.ofNullable(r.getRelType())
+							.map(
+								relType -> Optional
+									.ofNullable(r.getSubRelType())
+									.map(
+										subRelType -> Optional
+											.ofNullable(r.getRelClass())
+											.map(
+												relClass -> String
+													.join(
+														source,
+														target,
+														relType,
+														subRelType,
+														relClass))
+											.orElse(
+												String
+													.join(
+														source,
+														target,
+														relType,
+														subRelType)))
+									.orElse(String.join(source, target, relType)))
+							.orElse(String.join(source, target)))
+					.orElse(source))
+			.orElse(null);
+	}
+
+	private static <T extends Oaf> String idFnForOafEntity(T t) {
+		return ((OafEntity) t).getId();
+	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -68,15 +69,17 @@ public class Author implements Serializable {
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		Author author = (Author) o;
-        return Objects.equals(fullname, author.fullname) &&
+		return Objects.equals(fullname, author.fullname)
-                Objects.equals(name, author.name) &&
+			&& Objects.equals(name, author.name)
-                Objects.equals(surname, author.surname) &&
+			&& Objects.equals(surname, author.surname)
-                Objects.equals(rank, author.rank) &&
+			&& Objects.equals(rank, author.rank)
-                Objects.equals(pid, author.pid) &&
+			&& Objects.equals(pid, author.pid)
-                Objects.equals(affiliation, author.affiliation);
+			&& Objects.equals(affiliation, author.affiliation);
 	}
 
 	@Override

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -26,7 +27,7 @@ public class Context implements Serializable {
 
 	@Override
 	public int hashCode() {
-        return id ==null? 0 : id.hashCode();
+		return id == null ? 0 : id.hashCode();
 	}
 
 	@Override

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Country.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.util.Objects;
@@ -16,9 +17,12 @@ public class Country extends Qualifier {
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
-        if (!super.equals(o)) return false;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		if (!super.equals(o))
+			return false;
 		Country country = (Country) o;
 		return Objects.equals(dataInfo, country.dataInfo);
 	}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java

@@ -1,7 +1,7 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
-import java.util.List;
 import java.util.Objects;
 
 public class DataInfo implements Serializable {
@@ -13,7 +13,6 @@ public class DataInfo implements Serializable {
 	private String inferenceprovenance;
 	private Qualifier provenanceaction;
 
-
 	public Boolean getInvisible() {
 		return invisible;
 	}
@@ -64,19 +63,23 @@ public class DataInfo implements Serializable {
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		DataInfo dataInfo = (DataInfo) o;
-        return Objects.equals(invisible, dataInfo.invisible) &&
+		return Objects.equals(invisible, dataInfo.invisible)
-                Objects.equals(inferred, dataInfo.inferred) &&
+			&& Objects.equals(inferred, dataInfo.inferred)
-                Objects.equals(deletedbyinference, dataInfo.deletedbyinference) &&
+			&& Objects.equals(deletedbyinference, dataInfo.deletedbyinference)
-                Objects.equals(trust, dataInfo.trust) &&
+			&& Objects.equals(trust, dataInfo.trust)
-                Objects.equals(inferenceprovenance, dataInfo.inferenceprovenance) &&
+			&& Objects.equals(inferenceprovenance, dataInfo.inferenceprovenance)
-                Objects.equals(provenanceaction, dataInfo.provenanceaction);
+			&& Objects.equals(provenanceaction, dataInfo.provenanceaction);
 	}
 
 	@Override
 	public int hashCode() {
-        return Objects.hash(invisible, inferred, deletedbyinference, trust, inferenceprovenance, provenanceaction);
+		return Objects
+			.hash(
+				invisible, inferred, deletedbyinference, trust, inferenceprovenance, provenanceaction);
 	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java

@@ -1,8 +1,10 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
 
 public class Dataset extends Result implements Serializable {
 
@@ -20,6 +22,10 @@ public class Dataset extends Result implements Serializable {
 
 	private List<GeoLocation> geolocation;
 
+	public Dataset() {
+		setResulttype(ModelConstants.DATASET_DEFAULT_RESULTTYPE);
+	}
+
 	public Field<String> getStoragedate() {
 		return storagedate;
 	}
@@ -80,46 +86,30 @@ public class Dataset extends Result implements Serializable {
 	public void mergeFrom(OafEntity e) {
 		super.mergeFrom(e);
 
-        if (!Dataset.class.isAssignableFrom(e.getClass())){
+		if (!Dataset.class.isAssignableFrom(e.getClass())) {
 			return;
 		}
 
 		final Dataset d = (Dataset) e;
 
-        storagedate = d.getStoragedate() != null && compareTrust(this, e)<0? d.getStoragedate() : storagedate;
+		storagedate = d.getStoragedate() != null && compareTrust(this, e) < 0 ? d.getStoragedate() : storagedate;
 
-        device= d.getDevice() != null && compareTrust(this, e)<0? d.getDevice() : device;
+		device = d.getDevice() != null && compareTrust(this, e) < 0 ? d.getDevice() : device;
 
-        size= d.getSize() != null && compareTrust(this, e)<0? d.getSize() : size;
+		size = d.getSize() != null && compareTrust(this, e) < 0 ? d.getSize() : size;
 
-        version= d.getVersion() != null && compareTrust(this, e)<0? d.getVersion() : version;
+		version = d.getVersion() != null && compareTrust(this, e) < 0 ? d.getVersion() : version;
 
-        lastmetadataupdate= d.getLastmetadataupdate() != null && compareTrust(this, e)<0? d.getLastmetadataupdate() :lastmetadataupdate;
+		lastmetadataupdate = d.getLastmetadataupdate() != null && compareTrust(this, e) < 0
+			? d.getLastmetadataupdate()
+			: lastmetadataupdate;
 
-        metadataversionnumber= d.getMetadataversionnumber() != null && compareTrust(this, e)<0? d.getMetadataversionnumber() : metadataversionnumber;
+		metadataversionnumber = d.getMetadataversionnumber() != null && compareTrust(this, e) < 0
+			? d.getMetadataversionnumber()
+			: metadataversionnumber;
 
 		geolocation = mergeLists(geolocation, d.getGeolocation());
 
 		mergeOAFDataInfo(d);
 	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        Dataset dataset = (Dataset) o;
-        return Objects.equals(storagedate, dataset.storagedate) &&
-                Objects.equals(device, dataset.device) &&
-                Objects.equals(size, dataset.size) &&
-                Objects.equals(version, dataset.version) &&
-                Objects.equals(lastmetadataupdate, dataset.lastmetadataupdate) &&
-                Objects.equals(metadataversionnumber, dataset.metadataversionnumber) &&
-                Objects.equals(geolocation, dataset.geolocation);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), storagedate, device, size, version, lastmetadataupdate, metadataversionnumber, geolocation);
-    }
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java

@@ -1,8 +1,8 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
 
 public class Datasource extends OafEntity implements Serializable {
 
@@ -72,7 +72,7 @@ public class Datasource extends OafEntity implements Serializable {
 
 	private Field<String> citationguidelineurl;
 
-    //{yes, no, uknown}
+	// {yes, no, uknown}
 	private Field<String> qualitymanagementkind;
 
 	private Field<String> pidsystems;
@@ -367,114 +367,106 @@ public class Datasource extends OafEntity implements Serializable {
 	public void mergeFrom(OafEntity e) {
 		super.mergeFrom(e);
 
-        if (!Datasource.class.isAssignableFrom(e.getClass())){
+		if (!Datasource.class.isAssignableFrom(e.getClass())) {
 			return;
 		}
 
-        Datasource d = (Datasource)e;
+		Datasource d = (Datasource) e;
 
-        datasourcetype = d.getDatasourcetype() != null && compareTrust(this, e)<0? d.getDatasourcetype() : datasourcetype;
+		datasourcetype = d.getDatasourcetype() != null && compareTrust(this, e) < 0
-        openairecompatibility = d.getOpenairecompatibility() != null && compareTrust(this, e)<0? d.getOpenairecompatibility() : openairecompatibility;
+			? d.getDatasourcetype()
-        officialname = d.getOfficialname() != null && compareTrust(this, e)<0? d.getOfficialname() : officialname;
+			: datasourcetype;
-        englishname = d.getEnglishname() != null && compareTrust(this, e)<0? d.getEnglishname() : officialname;
+		openairecompatibility = d.getOpenairecompatibility() != null && compareTrust(this, e) < 0
-        websiteurl = d.getWebsiteurl() != null && compareTrust(this, e)<0? d.getWebsiteurl() : websiteurl;
+			? d.getOpenairecompatibility()
-        logourl = d.getLogourl() != null && compareTrust(this, e)<0? d.getLogourl() : getLogourl();
+			: openairecompatibility;
-        contactemail = d.getContactemail() != null && compareTrust(this, e)<0? d.getContactemail() : contactemail;
+		officialname = d.getOfficialname() != null && compareTrust(this, e) < 0
-        namespaceprefix = d.getNamespaceprefix() != null && compareTrust(this, e)<0? d.getNamespaceprefix() : namespaceprefix;
+			? d.getOfficialname()
-        latitude = d.getLatitude() != null && compareTrust(this, e)<0? d.getLatitude() : latitude;
+			: officialname;
-        longitude = d.getLongitude() != null && compareTrust(this, e)<0? d.getLongitude() : longitude;
+		englishname = d.getEnglishname() != null && compareTrust(this, e) < 0 ? d.getEnglishname() : officialname;
-        dateofvalidation = d.getDateofvalidation() != null && compareTrust(this, e)<0? d.getDateofvalidation() : dateofvalidation;
+		websiteurl = d.getWebsiteurl() != null && compareTrust(this, e) < 0 ? d.getWebsiteurl() : websiteurl;
-        description = d.getDescription() != null && compareTrust(this, e)<0? d.getDescription() : description;
+		logourl = d.getLogourl() != null && compareTrust(this, e) < 0 ? d.getLogourl() : getLogourl();
+		contactemail = d.getContactemail() != null && compareTrust(this, e) < 0
+			? d.getContactemail()
+			: contactemail;
+		namespaceprefix = d.getNamespaceprefix() != null && compareTrust(this, e) < 0
+			? d.getNamespaceprefix()
+			: namespaceprefix;
+		latitude = d.getLatitude() != null && compareTrust(this, e) < 0 ? d.getLatitude() : latitude;
+		longitude = d.getLongitude() != null && compareTrust(this, e) < 0 ? d.getLongitude() : longitude;
+		dateofvalidation = d.getDateofvalidation() != null && compareTrust(this, e) < 0
+			? d.getDateofvalidation()
+			: dateofvalidation;
+		description = d.getDescription() != null && compareTrust(this, e) < 0 ? d.getDescription() : description;
 		subjects = mergeLists(subjects, d.getSubjects());
 
 		// opendoar specific fields (od*)
-        odnumberofitems = d.getOdnumberofitems() != null && compareTrust(this, e)<0? d.getOdnumberofitems() : odnumberofitems;
+		odnumberofitems = d.getOdnumberofitems() != null && compareTrust(this, e) < 0
-        odnumberofitemsdate = d.getOdnumberofitemsdate() != null && compareTrust(this, e)<0? d.getOdnumberofitemsdate() : odnumberofitemsdate;
+			? d.getOdnumberofitems()
-        odpolicies = d.getOdpolicies() != null && compareTrust(this, e)<0? d.getOdpolicies() : odpolicies;
+			: odnumberofitems;
+		odnumberofitemsdate = d.getOdnumberofitemsdate() != null && compareTrust(this, e) < 0
+			? d.getOdnumberofitemsdate()
+			: odnumberofitemsdate;
+		odpolicies = d.getOdpolicies() != null && compareTrust(this, e) < 0 ? d.getOdpolicies() : odpolicies;
 		odlanguages = mergeLists(odlanguages, d.getOdlanguages());
 		odcontenttypes = mergeLists(odcontenttypes, d.getOdcontenttypes());
 		accessinfopackage = mergeLists(accessinfopackage, d.getAccessinfopackage());
 
 		// re3data fields
-        releasestartdate = d.getReleasestartdate() != null && compareTrust(this, e)<0? d.getReleasestartdate() : releasestartdate;
+		releasestartdate = d.getReleasestartdate() != null && compareTrust(this, e) < 0
-        releaseenddate = d.getReleaseenddate() != null && compareTrust(this, e)<0? d.getReleaseenddate() : releaseenddate;
+			? d.getReleasestartdate()
-        missionstatementurl = d.getMissionstatementurl() != null && compareTrust(this, e)<0? d.getMissionstatementurl() : missionstatementurl;
+			: releasestartdate;
-        dataprovider = d.getDataprovider() != null && compareTrust(this, e)<0? d.getDataprovider() : dataprovider;
+		releaseenddate = d.getReleaseenddate() != null && compareTrust(this, e) < 0
-        serviceprovider = d.getServiceprovider() != null && compareTrust(this, e)<0? d.getServiceprovider() : serviceprovider;
+			? d.getReleaseenddate()
+			: releaseenddate;
+		missionstatementurl = d.getMissionstatementurl() != null && compareTrust(this, e) < 0
+			? d.getMissionstatementurl()
+			: missionstatementurl;
+		dataprovider = d.getDataprovider() != null && compareTrust(this, e) < 0
+			? d.getDataprovider()
+			: dataprovider;
+		serviceprovider = d.getServiceprovider() != null && compareTrust(this, e) < 0
+			? d.getServiceprovider()
+			: serviceprovider;
 
 		// {open, restricted or closed}
-        databaseaccesstype = d.getDatabaseaccesstype() != null && compareTrust(this, e)<0? d.getDatabaseaccesstype() : databaseaccesstype;
+		databaseaccesstype = d.getDatabaseaccesstype() != null && compareTrust(this, e) < 0
+			? d.getDatabaseaccesstype()
+			: databaseaccesstype;
 
 		// {open, restricted or closed}
-        datauploadtype = d.getDatauploadtype() != null && compareTrust(this, e)<0? d.getDatauploadtype() : datauploadtype;
+		datauploadtype = d.getDatauploadtype() != null && compareTrust(this, e) < 0
+			? d.getDatauploadtype()
+			: datauploadtype;
 
 		// {feeRequired, registration, other}
-        databaseaccessrestriction = d.getDatabaseaccessrestriction() != null && compareTrust(this, e)<0? d.getDatabaseaccessrestriction() : databaseaccessrestriction;
+		databaseaccessrestriction = d.getDatabaseaccessrestriction() != null && compareTrust(this, e) < 0
+			? d.getDatabaseaccessrestriction()
+			: databaseaccessrestriction;
 
 		// {feeRequired, registration, other}
-        datauploadrestriction = d.getDatauploadrestriction() != null && compareTrust(this, e)<0? d.getDatauploadrestriction() : datauploadrestriction;
+		datauploadrestriction = d.getDatauploadrestriction() != null && compareTrust(this, e) < 0
+			? d.getDatauploadrestriction()
+			: datauploadrestriction;
 
-        versioning = d.getVersioning() != null && compareTrust(this, e)<0? d.getVersioning() : versioning;
+		versioning = d.getVersioning() != null && compareTrust(this, e) < 0 ? d.getVersioning() : versioning;
-        citationguidelineurl = d.getCitationguidelineurl() != null && compareTrust(this, e)<0? d.getCitationguidelineurl() : citationguidelineurl;
+		citationguidelineurl = d.getCitationguidelineurl() != null && compareTrust(this, e) < 0
+			? d.getCitationguidelineurl()
+			: citationguidelineurl;
 
-        //{yes, no, unknown}
+		// {yes, no, unknown}
-        qualitymanagementkind = d.getQualitymanagementkind() != null && compareTrust(this, e)<0? d.getQualitymanagementkind() : qualitymanagementkind;
+		qualitymanagementkind = d.getQualitymanagementkind() != null && compareTrust(this, e) < 0
-        pidsystems = d.getPidsystems() != null && compareTrust(this, e)<0? d.getPidsystems() : pidsystems;
+			? d.getQualitymanagementkind()
+			: qualitymanagementkind;
+		pidsystems = d.getPidsystems() != null && compareTrust(this, e) < 0 ? d.getPidsystems() : pidsystems;
 
-        certificates = d.getCertificates() != null && compareTrust(this, e)<0? d.getCertificates() : certificates;
+		certificates = d.getCertificates() != null && compareTrust(this, e) < 0
+			? d.getCertificates()
+			: certificates;
 
 		policies = mergeLists(policies, d.getPolicies());
 
-        journal = d.getJournal() != null && compareTrust(this, e)<0? d.getJournal() : journal;
+		journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal;
 
 		mergeOAFDataInfo(e);
 	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        Datasource that = (Datasource) o;
-        return Objects.equals(datasourcetype, that.datasourcetype) &&
-                Objects.equals(openairecompatibility, that.openairecompatibility) &&
-                Objects.equals(officialname, that.officialname) &&
-                Objects.equals(englishname, that.englishname) &&
-                Objects.equals(websiteurl, that.websiteurl) &&
-                Objects.equals(logourl, that.logourl) &&
-                Objects.equals(contactemail, that.contactemail) &&
-                Objects.equals(namespaceprefix, that.namespaceprefix) &&
-                Objects.equals(latitude, that.latitude) &&
-                Objects.equals(longitude, that.longitude) &&
-                Objects.equals(dateofvalidation, that.dateofvalidation) &&
-                Objects.equals(description, that.description) &&
-                Objects.equals(subjects, that.subjects) &&
-                Objects.equals(odnumberofitems, that.odnumberofitems) &&
-                Objects.equals(odnumberofitemsdate, that.odnumberofitemsdate) &&
-                Objects.equals(odpolicies, that.odpolicies) &&
-                Objects.equals(odlanguages, that.odlanguages) &&
-                Objects.equals(odcontenttypes, that.odcontenttypes) &&
-                Objects.equals(accessinfopackage, that.accessinfopackage) &&
-                Objects.equals(releasestartdate, that.releasestartdate) &&
-                Objects.equals(releaseenddate, that.releaseenddate) &&
-                Objects.equals(missionstatementurl, that.missionstatementurl) &&
-                Objects.equals(dataprovider, that.dataprovider) &&
-                Objects.equals(serviceprovider, that.serviceprovider) &&
-                Objects.equals(databaseaccesstype, that.databaseaccesstype) &&
-                Objects.equals(datauploadtype, that.datauploadtype) &&
-                Objects.equals(databaseaccessrestriction, that.databaseaccessrestriction) &&
-                Objects.equals(datauploadrestriction, that.datauploadrestriction) &&
-                Objects.equals(versioning, that.versioning) &&
-                Objects.equals(citationguidelineurl, that.citationguidelineurl) &&
-                Objects.equals(qualitymanagementkind, that.qualitymanagementkind) &&
-                Objects.equals(pidsystems, that.pidsystems) &&
-                Objects.equals(certificates, that.certificates) &&
-                Objects.equals(policies, that.policies) &&
-                Objects.equals(journal, that.journal);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), datasourcetype, openairecompatibility, officialname, englishname, websiteurl, logourl, contactemail, namespaceprefix, latitude, longitude, dateofvalidation, description, subjects, odnumberofitems, odnumberofitemsdate, odpolicies, odlanguages, odcontenttypes, accessinfopackage, releasestartdate, releaseenddate, missionstatementurl, dataprovider, serviceprovider, databaseaccesstype, datauploadtype, databaseaccessrestriction, datauploadrestriction, versioning, citationguidelineurl, qualitymanagementkind, pidsystems, certificates, policies, journal);
-    }
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -94,21 +95,25 @@ public class ExternalReference implements Serializable {
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		ExternalReference that = (ExternalReference) o;
-        return Objects.equals(sitename, that.sitename) &&
+		return Objects.equals(sitename, that.sitename)
-                Objects.equals(label, that.label) &&
+			&& Objects.equals(label, that.label)
-                Objects.equals(url, that.url) &&
+			&& Objects.equals(url, that.url)
-                Objects.equals(description, that.description) &&
+			&& Objects.equals(description, that.description)
-                Objects.equals(qualifier, that.qualifier) &&
+			&& Objects.equals(qualifier, that.qualifier)
-                Objects.equals(refidentifier, that.refidentifier) &&
+			&& Objects.equals(refidentifier, that.refidentifier)
-                Objects.equals(query, that.query) &&
+			&& Objects.equals(query, that.query)
-                Objects.equals(dataInfo, that.dataInfo);
+			&& Objects.equals(dataInfo, that.dataInfo);
 	}
 
 	@Override
 	public int hashCode() {
-        return Objects.hash(sitename, label, url, description, qualifier, refidentifier, query, dataInfo);
+		return Objects
+			.hash(
+				sitename, label, url, description, qualifier, refidentifier, query, dataInfo);
 	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -57,14 +58,16 @@ public class ExtraInfo implements Serializable {
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		ExtraInfo extraInfo = (ExtraInfo) o;
-        return Objects.equals(name, extraInfo.name) &&
+		return Objects.equals(name, extraInfo.name)
-                Objects.equals(typology, extraInfo.typology) &&
+			&& Objects.equals(typology, extraInfo.typology)
-                Objects.equals(provenance, extraInfo.provenance) &&
+			&& Objects.equals(provenance, extraInfo.provenance)
-                Objects.equals(trust, extraInfo.trust) &&
+			&& Objects.equals(trust, extraInfo.trust)
-                Objects.equals(value, extraInfo.value);
+			&& Objects.equals(value, extraInfo.value);
 	}
 
 	@Override

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java

@@ -1,9 +1,11 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
+
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class GeoLocation implements Serializable {
 
@@ -39,13 +41,18 @@ public class GeoLocation implements Serializable {
 
 	@JsonIgnore
 	public boolean isBlank() {
-        return StringUtils.isBlank(point) &&
+		return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
-                StringUtils.isBlank(box) &&
-                StringUtils.isBlank(place);
 	}
 
 	public String toComparableString() {
-        return isBlank()?"":String.format("%s::%s%s", point != null ? point.toLowerCase() : "", box != null ? box.toLowerCase() : "", place != null ? place.toLowerCase() : "");
+		return isBlank()
+			? ""
+			: String
+				.format(
+					"%s::%s%s",
+					point != null ? point.toLowerCase() : "",
+					box != null ? box.toLowerCase() : "",
+					place != null ? place.toLowerCase() : "");
 	}
 
 	@Override
@@ -64,7 +71,6 @@ public class GeoLocation implements Serializable {
 
 		GeoLocation other = (GeoLocation) obj;
 
-        return toComparableString()
+		return toComparableString().equals(other.toComparableString());
-                .equals(other.toComparableString());
 	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -22,13 +23,15 @@ public class Instance implements Serializable {
 
 	private Field<String> dateofacceptance;
 
-    // ( article | book ) processing charges. Defined here to cope with possible wrongly typed results
+	// ( article | book ) processing charges. Defined here to cope with possible wrongly typed
+	// results
 	private Field<String> processingchargeamount;
 
-    // currency - alphabetic code describe in ISO-4217. Defined here to cope with possible wrongly typed results
+	// currency - alphabetic code describe in ISO-4217. Defined here to cope with possible wrongly
+	// typed results
 	private Field<String> processingchargecurrency;
 
-    private Field<String> refereed; //peer-review status
+	private Field<String> refereed; // peer-review status
 
 	public Field<String> getLicense() {
 		return license;
@@ -118,12 +121,14 @@ public class Instance implements Serializable {
 		this.refereed = refereed;
 	}
 
-    public String toComparableString(){
+	public String toComparableString() {
-        return String.format("%s::%s::%s::%s",
+		return String
-                hostedby != null && hostedby.getKey()!= null  ? hostedby.getKey().toLowerCase() : "",
+			.format(
-                accessright!= null && accessright.getClassid()!= null ? accessright.getClassid() : "",
+				"%s::%s::%s::%s",
-                instancetype!= null && instancetype.getClassid()!= null ? instancetype.getClassid() : "",
+				hostedby != null && hostedby.getKey() != null ? hostedby.getKey().toLowerCase() : "",
-                url != null ? url:"");
+				accessright != null && accessright.getClassid() != null ? accessright.getClassid() : "",
+				instancetype != null && instancetype.getClassid() != null ? instancetype.getClassid() : "",
+				url != null ? url : "");
 	}
 
 	@Override
@@ -142,7 +147,6 @@ public class Instance implements Serializable {
 
 		Instance other = (Instance) obj;
 
-        return toComparableString()
+		return toComparableString().equals(other.toComparableString());
-                .equals(other.toComparableString());
 	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -127,25 +128,40 @@ public class Journal implements Serializable {
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		Journal journal = (Journal) o;
-        return Objects.equals(name, journal.name) &&
+		return Objects.equals(name, journal.name)
-                Objects.equals(issnPrinted, journal.issnPrinted) &&
+			&& Objects.equals(issnPrinted, journal.issnPrinted)
-                Objects.equals(issnOnline, journal.issnOnline) &&
+			&& Objects.equals(issnOnline, journal.issnOnline)
-                Objects.equals(issnLinking, journal.issnLinking) &&
+			&& Objects.equals(issnLinking, journal.issnLinking)
-                Objects.equals(ep, journal.ep) &&
+			&& Objects.equals(ep, journal.ep)
-                Objects.equals(iss, journal.iss) &&
+			&& Objects.equals(iss, journal.iss)
-                Objects.equals(sp, journal.sp) &&
+			&& Objects.equals(sp, journal.sp)
-                Objects.equals(vol, journal.vol) &&
+			&& Objects.equals(vol, journal.vol)
-                Objects.equals(edition, journal.edition) &&
+			&& Objects.equals(edition, journal.edition)
-                Objects.equals(conferenceplace, journal.conferenceplace) &&
+			&& Objects.equals(conferenceplace, journal.conferenceplace)
-                Objects.equals(conferencedate, journal.conferencedate) &&
+			&& Objects.equals(conferencedate, journal.conferencedate)
-                Objects.equals(dataInfo, journal.dataInfo);
+			&& Objects.equals(dataInfo, journal.dataInfo);
 	}
 
 	@Override
 	public int hashCode() {
-        return Objects.hash(name, issnPrinted, issnOnline, issnLinking, ep, iss, sp, vol, edition, conferenceplace, conferencedate, dataInfo);
+		return Objects
+			.hash(
+				name,
+				issnPrinted,
+				issnOnline,
+				issnLinking,
+				ep,
+				iss,
+				sp,
+				vol,
+				edition,
+				conferenceplace,
+				conferencedate,
+				dataInfo);
 	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java

@@ -1,9 +1,11 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
+
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class KeyValue implements Serializable {
 
@@ -38,7 +40,12 @@ public class KeyValue implements Serializable {
 	}
 
 	public String toComparableString() {
-        return isBlank()?"":String.format("%s::%s", key != null ? key.toLowerCase() : "", value != null ? value.toLowerCase() : "");
+		return isBlank()
+			? ""
+			: String
+				.format(
+					"%s::%s",
+					key != null ? key.toLowerCase() : "", value != null ? value.toLowerCase() : "");
 	}
 
 	@JsonIgnore

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java

@@ -0,0 +1,4 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+public class Measure {
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -17,8 +18,10 @@ public class OAIProvenance  implements Serializable {
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		OAIProvenance that = (OAIProvenance) o;
 		return Objects.equals(originDescription, that.originDescription);
 	}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java

@@ -1,14 +1,29 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Objects;
 
 public abstract class Oaf implements Serializable {
 
+	/**
+	 * The list of datasource id/name pairs providing this relationship.
+	 */
+	protected List<KeyValue> collectedfrom;
+
 	private DataInfo dataInfo;
 
 	private Long lastupdatetimestamp;
 
+	public List<KeyValue> getCollectedfrom() {
+		return collectedfrom;
+	}
+
+	public void setCollectedfrom(List<KeyValue> collectedfrom) {
+		this.collectedfrom = collectedfrom;
+	}
+
 	public DataInfo getDataInfo() {
 		return dataInfo;
 	}
@@ -25,33 +40,30 @@ public abstract class Oaf implements Serializable {
 		this.lastupdatetimestamp = lastupdatetimestamp;
 	}
 
-
 	public void mergeOAFDataInfo(Oaf e) {
-        if (e.getDataInfo()!= null && compareTrust(this,e)<0)
+		if (e.getDataInfo() != null && compareTrust(this, e) < 0)
 			dataInfo = e.getDataInfo();
 	}
 
 	protected String extractTrust(Oaf e) {
-        if (e == null || e.getDataInfo()== null || e.getDataInfo().getTrust()== null)
+		if (e == null || e.getDataInfo() == null || e.getDataInfo().getTrust() == null)
 			return "0.0";
 		return e.getDataInfo().getTrust();
-
-
-
 	}
 
 	protected int compareTrust(Oaf a, Oaf b) {
 		return extractTrust(a).compareTo(extractTrust(b));
-
 	}
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		Oaf oaf = (Oaf) o;
-        return Objects.equals(dataInfo, oaf.dataInfo) &&
+		return Objects.equals(dataInfo, oaf.dataInfo)
-                Objects.equals(lastupdatetimestamp, oaf.lastupdatetimestamp);
+			&& Objects.equals(lastupdatetimestamp, oaf.lastupdatetimestamp);
 	}
 
 	@Override

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -10,8 +11,6 @@ public abstract class OafEntity extends Oaf implements Serializable {
 
 	private List<String> originalId;
 
-    private List<KeyValue> collectedfrom;
-
 	private List<StructuredProperty> pid;
 
 	private String dateofcollection;
@@ -38,14 +37,6 @@ public abstract class OafEntity extends Oaf implements Serializable {
 		this.originalId = originalId;
 	}
 
-    public List<KeyValue> getCollectedfrom() {
-        return collectedfrom;
-    }
-
-    public void setCollectedfrom(List<KeyValue> collectedfrom) {
-        this.collectedfrom = collectedfrom;
-    }
-
 	public List<StructuredProperty> getPid() {
 		return pid;
 	}
@@ -86,7 +77,6 @@ public abstract class OafEntity extends Oaf implements Serializable {
 		this.oaiprovenance = oaiprovenance;
 	}
 
-
 	public void mergeFrom(OafEntity e) {
 
 		if (e == null)
@@ -108,32 +98,32 @@ public abstract class OafEntity extends Oaf implements Serializable {
 
 		if (e.getOaiprovenance() != null && compareTrust(this, e) < 0)
 			oaiprovenance = e.getOaiprovenance();
-
 	}
 
 	protected <T> List<T> mergeLists(final List<T>... lists) {
 
-        return Arrays.stream(lists).filter(Objects::nonNull).flatMap(List::stream).distinct().collect(Collectors.toList());
+		return Arrays
+			.stream(lists)
+			.filter(Objects::nonNull)
+			.flatMap(List::stream)
+			.distinct()
+			.collect(Collectors.toList());
 	}
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
-        if (!super.equals(o)) return false;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		if (!super.equals(o))
+			return false;
 		OafEntity oafEntity = (OafEntity) o;
-        return Objects.equals(id, oafEntity.id) &&
+		return Objects.equals(id, oafEntity.id);
-                Objects.equals(originalId, oafEntity.originalId) &&
-                Objects.equals(collectedfrom, oafEntity.collectedfrom) &&
-                Objects.equals(pid, oafEntity.pid) &&
-                Objects.equals(dateofcollection, oafEntity.dateofcollection) &&
-                Objects.equals(dateoftransformation, oafEntity.dateoftransformation) &&
-                Objects.equals(extraInfo, oafEntity.extraInfo) &&
-                Objects.equals(oaiprovenance, oafEntity.oaiprovenance);
 	}
 
 	@Override
 	public int hashCode() {
-        return Objects.hash(super.hashCode(), id, originalId, collectedfrom, pid, dateofcollection, dateoftransformation, extraInfo, oaiprovenance);
+		return Objects.hash(super.hashCode(), id);
 	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java

@@ -1,8 +1,8 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
 
 public class Organization extends OafEntity implements Serializable {
 
@@ -122,7 +122,8 @@ public class Organization extends OafEntity implements Serializable {
 		return ecinternationalorganizationeurinterests;
 	}
 
-    public void setEcinternationalorganizationeurinterests(Field<String> ecinternationalorganizationeurinterests) {
+	public void setEcinternationalorganizationeurinterests(
+		Field<String> ecinternationalorganizationeurinterests) {
 		this.ecinternationalorganizationeurinterests = ecinternationalorganizationeurinterests;
 	}
 
@@ -166,61 +167,48 @@ public class Organization extends OafEntity implements Serializable {
 		this.country = country;
 	}
 
-
 	@Override
 	public void mergeFrom(OafEntity e) {
 		super.mergeFrom(e);
 
-        if (!Organization.class.isAssignableFrom(e.getClass())){
+		if (!Organization.class.isAssignableFrom(e.getClass())) {
 			return;
 		}
 
 		final Organization o = (Organization) e;
-        legalshortname = o.getLegalshortname() != null && compareTrust(this, e)<0? o.getLegalshortname() : legalshortname;
+		legalshortname = o.getLegalshortname() != null && compareTrust(this, e) < 0
-        legalname = o.getLegalname() != null && compareTrust(this, e)<0 ? o.getLegalname() : legalname;
+			? o.getLegalshortname()
+			: legalshortname;
+		legalname = o.getLegalname() != null && compareTrust(this, e) < 0 ? o.getLegalname() : legalname;
 		alternativeNames = mergeLists(o.getAlternativeNames(), alternativeNames);
-        websiteurl = o.getWebsiteurl() != null && compareTrust(this, e)<0? o.getWebsiteurl() : websiteurl;
+		websiteurl = o.getWebsiteurl() != null && compareTrust(this, e) < 0 ? o.getWebsiteurl() : websiteurl;
-        logourl = o.getLogourl() != null && compareTrust(this, e)<0? o.getLogourl() : logourl;
+		logourl = o.getLogourl() != null && compareTrust(this, e) < 0 ? o.getLogourl() : logourl;
-        eclegalbody = o.getEclegalbody() != null && compareTrust(this, e)<0? o.getEclegalbody() : eclegalbody;
+		eclegalbody = o.getEclegalbody() != null && compareTrust(this, e) < 0 ? o.getEclegalbody() : eclegalbody;
-        eclegalperson = o.getEclegalperson() != null && compareTrust(this, e)<0? o.getEclegalperson() : eclegalperson;
+		eclegalperson = o.getEclegalperson() != null && compareTrust(this, e) < 0
-        ecnonprofit = o.getEcnonprofit() != null && compareTrust(this, e)<0? o.getEcnonprofit() : ecnonprofit;
+			? o.getEclegalperson()
-        ecresearchorganization = o.getEcresearchorganization() != null && compareTrust(this, e)<0? o.getEcresearchorganization() : ecresearchorganization;
+			: eclegalperson;
-        echighereducation = o.getEchighereducation() != null && compareTrust(this, e)<0? o.getEchighereducation() : echighereducation;
+		ecnonprofit = o.getEcnonprofit() != null && compareTrust(this, e) < 0 ? o.getEcnonprofit() : ecnonprofit;
-        ecinternationalorganizationeurinterests = o.getEcinternationalorganizationeurinterests() != null && compareTrust(this, e)<0? o.getEcinternationalorganizationeurinterests() : ecinternationalorganizationeurinterests;
+		ecresearchorganization = o.getEcresearchorganization() != null && compareTrust(this, e) < 0
-        ecinternationalorganization = o.getEcinternationalorganization() != null && compareTrust(this, e)<0? o.getEcinternationalorganization() : ecinternationalorganization;
+			? o.getEcresearchorganization()
-        ecenterprise = o.getEcenterprise() != null && compareTrust(this, e)<0? o.getEcenterprise() :ecenterprise;
+			: ecresearchorganization;
-        ecsmevalidated = o.getEcsmevalidated() != null && compareTrust(this, e)<0? o.getEcsmevalidated() :ecsmevalidated;
+		echighereducation = o.getEchighereducation() != null && compareTrust(this, e) < 0
-        ecnutscode = o.getEcnutscode() != null && compareTrust(this, e)<0? o.getEcnutscode() :ecnutscode;
+			? o.getEchighereducation()
-        country = o.getCountry() != null && compareTrust(this, e)<0 ? o.getCountry() :country;
+			: echighereducation;
+		ecinternationalorganizationeurinterests = o.getEcinternationalorganizationeurinterests() != null
+			&& compareTrust(this, e) < 0
+				? o.getEcinternationalorganizationeurinterests()
+				: ecinternationalorganizationeurinterests;
+		ecinternationalorganization = o.getEcinternationalorganization() != null && compareTrust(this, e) < 0
+			? o.getEcinternationalorganization()
+			: ecinternationalorganization;
+		ecenterprise = o.getEcenterprise() != null && compareTrust(this, e) < 0
+			? o.getEcenterprise()
+			: ecenterprise;
+		ecsmevalidated = o.getEcsmevalidated() != null && compareTrust(this, e) < 0
+			? o.getEcsmevalidated()
+			: ecsmevalidated;
+		ecnutscode = o.getEcnutscode() != null && compareTrust(this, e) < 0 ? o.getEcnutscode() : ecnutscode;
+		country = o.getCountry() != null && compareTrust(this, e) < 0 ? o.getCountry() : country;
 		mergeOAFDataInfo(o);
 	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        Organization that = (Organization) o;
-        return Objects.equals(legalshortname, that.legalshortname) &&
-                Objects.equals(legalname, that.legalname) &&
-                Objects.equals(alternativeNames, that.alternativeNames) &&
-                Objects.equals(websiteurl, that.websiteurl) &&
-                Objects.equals(logourl, that.logourl) &&
-                Objects.equals(eclegalbody, that.eclegalbody) &&
-                Objects.equals(eclegalperson, that.eclegalperson) &&
-                Objects.equals(ecnonprofit, that.ecnonprofit) &&
-                Objects.equals(ecresearchorganization, that.ecresearchorganization) &&
-                Objects.equals(echighereducation, that.echighereducation) &&
-                Objects.equals(ecinternationalorganizationeurinterests, that.ecinternationalorganizationeurinterests) &&
-                Objects.equals(ecinternationalorganization, that.ecinternationalorganization) &&
-                Objects.equals(ecenterprise, that.ecenterprise) &&
-                Objects.equals(ecsmevalidated, that.ecsmevalidated) &&
-                Objects.equals(ecnutscode, that.ecnutscode) &&
-                Objects.equals(country, that.country);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), legalshortname, legalname, alternativeNames, websiteurl, logourl, eclegalbody, eclegalperson, ecnonprofit, ecresearchorganization, echighereducation, ecinternationalorganizationeurinterests, ecinternationalorganization, ecenterprise, ecsmevalidated, ecnutscode, country);
-    }
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -67,15 +68,17 @@ public class OriginDescription implements Serializable {
 
 	@Override
 	public boolean equals(Object o) {
-        if (this == o) return true;
+		if (this == o)
-        if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		OriginDescription that = (OriginDescription) o;
-        return Objects.equals(harvestDate, that.harvestDate) &&
+		return Objects.equals(harvestDate, that.harvestDate)
-                Objects.equals(altered, that.altered) &&
+			&& Objects.equals(altered, that.altered)
-                Objects.equals(baseURL, that.baseURL) &&
+			&& Objects.equals(baseURL, that.baseURL)
-                Objects.equals(identifier, that.identifier) &&
+			&& Objects.equals(identifier, that.identifier)
-                Objects.equals(datestamp, that.datestamp) &&
+			&& Objects.equals(datestamp, that.datestamp)
-                Objects.equals(metadataNamespace, that.metadataNamespace);
+			&& Objects.equals(metadataNamespace, that.metadataNamespace);
 	}
 
 	@Override

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProduct.java

@@ -1,8 +1,10 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
 
 public class OtherResearchProduct extends Result implements Serializable {
 
@@ -12,6 +14,10 @@ public class OtherResearchProduct extends Result implements Serializable {
 
 	private List<Field<String>> tool;
 
+	public OtherResearchProduct() {
+		setResulttype(ModelConstants.ORP_DEFAULT_RESULTTYPE);
+	}
+
 	public List<Field<String>> getContactperson() {
 		return contactperson;
 	}
@@ -40,31 +46,15 @@ public class OtherResearchProduct extends Result implements Serializable {
 	public void mergeFrom(OafEntity e) {
 		super.mergeFrom(e);
 
-        if (!OtherResearchProduct.class.isAssignableFrom(e.getClass())){
+		if (!OtherResearchProduct.class.isAssignableFrom(e.getClass())) {
 			return;
 		}
 
-        OtherResearchProduct o = (OtherResearchProduct)e;
+		OtherResearchProduct o = (OtherResearchProduct) e;
 
 		contactperson = mergeLists(contactperson, o.getContactperson());
 		contactgroup = mergeLists(contactgroup, o.getContactgroup());
 		tool = mergeLists(tool, o.getTool());
 		mergeOAFDataInfo(e);
 	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        OtherResearchProduct that = (OtherResearchProduct) o;
-        return Objects.equals(contactperson, that.contactperson) &&
-                Objects.equals(contactgroup, that.contactgroup) &&
-                Objects.equals(tool, that.tool);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), contactperson, contactgroup, tool);
-    }
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java

@@ -1,8 +1,8 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
 
 public class Project extends OafEntity implements Serializable {
 
@@ -266,82 +266,60 @@ public class Project extends OafEntity implements Serializable {
 		this.fundedamount = fundedamount;
 	}
 
-
 	@Override
 	public void mergeFrom(OafEntity e) {
 		super.mergeFrom(e);
 
-        if (!Project.class.isAssignableFrom(e.getClass())){
+		if (!Project.class.isAssignableFrom(e.getClass())) {
 			return;
 		}
 
-        Project p = (Project)e;
+		Project p = (Project) e;
 
-            websiteurl= p.getWebsiteurl()!= null && compareTrust(this,e)<0?p.getWebsiteurl():websiteurl;
+		websiteurl = p.getWebsiteurl() != null && compareTrust(this, e) < 0 ? p.getWebsiteurl() : websiteurl;
-            code= p.getCode()!=null && compareTrust(this,e)<0?p.getCode():code;
+		code = p.getCode() != null && compareTrust(this, e) < 0 ? p.getCode() : code;
-            acronym= p.getAcronym()!= null && compareTrust(this,e)<0?p.getAcronym():acronym;
+		acronym = p.getAcronym() != null && compareTrust(this, e) < 0 ? p.getAcronym() : acronym;
-            title= p.getTitle()!= null && compareTrust(this,e)<0?p.getTitle():title;
+		title = p.getTitle() != null && compareTrust(this, e) < 0 ? p.getTitle() : title;
-            startdate= p.getStartdate()!=null && compareTrust(this,e)<0?p.getStartdate():startdate;
+		startdate = p.getStartdate() != null && compareTrust(this, e) < 0 ? p.getStartdate() : startdate;
-            enddate= p.getEnddate()!=null && compareTrust(this,e)<0?p.getEnddate():enddate;
+		enddate = p.getEnddate() != null && compareTrust(this, e) < 0 ? p.getEnddate() : enddate;
-            callidentifier= p.getCallidentifier()!=null && compareTrust(this,e)<0?p.getCallidentifier():callidentifier;
+		callidentifier = p.getCallidentifier() != null && compareTrust(this, e) < 0
-            keywords= p.getKeywords()!=null && compareTrust(this,e)<0?p.getKeywords():keywords;
+			? p.getCallidentifier()
-            duration= p.getDuration()!=null && compareTrust(this,e)<0?p.getDuration():duration;
+			: callidentifier;
-            ecsc39= p.getEcsc39()!=null && compareTrust(this,e)<0?p.getEcsc39():ecsc39;
+		keywords = p.getKeywords() != null && compareTrust(this, e) < 0 ? p.getKeywords() : keywords;
-            oamandatepublications= p.getOamandatepublications()!=null && compareTrust(this,e)<0?p.getOamandatepublications():oamandatepublications;
+		duration = p.getDuration() != null && compareTrust(this, e) < 0 ? p.getDuration() : duration;
-            ecarticle29_3= p.getEcarticle29_3()!=null && compareTrust(this,e)<0?p.getEcarticle29_3():ecarticle29_3;
+		ecsc39 = p.getEcsc39() != null && compareTrust(this, e) < 0 ? p.getEcsc39() : ecsc39;
-            subjects= mergeLists(subjects, p.getSubjects());
+		oamandatepublications = p.getOamandatepublications() != null && compareTrust(this, e) < 0
-            fundingtree= mergeLists(fundingtree, p.getFundingtree());
+			? p.getOamandatepublications()
-            contracttype= p.getContracttype()!=null && compareTrust(this,e)<0?p.getContracttype():contracttype;
+			: oamandatepublications;
-            optional1= p.getOptional1()!=null && compareTrust(this,e)<0?p.getOptional1():optional1;
+		ecarticle29_3 = p.getEcarticle29_3() != null && compareTrust(this, e) < 0
-            optional2= p.getOptional2()!=null && compareTrust(this,e)<0?p.getOptional2():optional2;
+			? p.getEcarticle29_3()
-            jsonextrainfo= p.getJsonextrainfo()!=null && compareTrust(this,e)<0?p.getJsonextrainfo():jsonextrainfo;
+			: ecarticle29_3;
-            contactfullname= p.getContactfullname()!=null && compareTrust(this,e)<0?p.getContactfullname():contactfullname;
+		subjects = mergeLists(subjects, p.getSubjects());
-            contactfax= p.getContactfax()!=null && compareTrust(this,e)<0?p.getContactfax():contactfax;
+		fundingtree = mergeLists(fundingtree, p.getFundingtree());
-            contactphone= p.getContactphone()!=null && compareTrust(this,e)<0?p.getContactphone():contactphone;
+		contracttype = p.getContracttype() != null && compareTrust(this, e) < 0
-            contactemail= p.getContactemail()!=null && compareTrust(this,e)<0?p.getContactemail():contactemail;
+			? p.getContracttype()
-            summary= p.getSummary()!=null && compareTrust(this,e)<0?p.getSummary():summary;
+			: contracttype;
-            currency= p.getCurrency()!=null && compareTrust(this,e)<0?p.getCurrency():currency;
+		optional1 = p.getOptional1() != null && compareTrust(this, e) < 0 ? p.getOptional1() : optional1;
-            totalcost= p.getTotalcost()!=null && compareTrust(this,e)<0?p.getTotalcost():totalcost;
+		optional2 = p.getOptional2() != null && compareTrust(this, e) < 0 ? p.getOptional2() : optional2;
-            fundedamount= p.getFundedamount()!= null && compareTrust(this,e)<0?p.getFundedamount():fundedamount;
+		jsonextrainfo = p.getJsonextrainfo() != null && compareTrust(this, e) < 0
+			? p.getJsonextrainfo()
+			: jsonextrainfo;
+		contactfullname = p.getContactfullname() != null && compareTrust(this, e) < 0
+			? p.getContactfullname()
+			: contactfullname;
+		contactfax = p.getContactfax() != null && compareTrust(this, e) < 0 ? p.getContactfax() : contactfax;
+		contactphone = p.getContactphone() != null && compareTrust(this, e) < 0
+			? p.getContactphone()
+			: contactphone;
+		contactemail = p.getContactemail() != null && compareTrust(this, e) < 0
+			? p.getContactemail()
+			: contactemail;
+		summary = p.getSummary() != null && compareTrust(this, e) < 0 ? p.getSummary() : summary;
+		currency = p.getCurrency() != null && compareTrust(this, e) < 0 ? p.getCurrency() : currency;
+		totalcost = p.getTotalcost() != null && compareTrust(this, e) < 0 ? p.getTotalcost() : totalcost;
+		fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0
+			? p.getFundedamount()
+			: fundedamount;
 		mergeOAFDataInfo(e);
 	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        Project project = (Project) o;
-        return Objects.equals(websiteurl, project.websiteurl) &&
-                Objects.equals(code, project.code) &&
-                Objects.equals(acronym, project.acronym) &&
-                Objects.equals(title, project.title) &&
-                Objects.equals(startdate, project.startdate) &&
-                Objects.equals(enddate, project.enddate) &&
-                Objects.equals(callidentifier, project.callidentifier) &&
-                Objects.equals(keywords, project.keywords) &&
-                Objects.equals(duration, project.duration) &&
-                Objects.equals(ecsc39, project.ecsc39) &&
-                Objects.equals(oamandatepublications, project.oamandatepublications) &&
-                Objects.equals(ecarticle29_3, project.ecarticle29_3) &&
-                Objects.equals(subjects, project.subjects) &&
-                Objects.equals(fundingtree, project.fundingtree) &&
-                Objects.equals(contracttype, project.contracttype) &&
-                Objects.equals(optional1, project.optional1) &&
-                Objects.equals(optional2, project.optional2) &&
-                Objects.equals(jsonextrainfo, project.jsonextrainfo) &&
-                Objects.equals(contactfullname, project.contactfullname) &&
-                Objects.equals(contactfax, project.contactfax) &&
-                Objects.equals(contactphone, project.contactphone) &&
-                Objects.equals(contactemail, project.contactemail) &&
-                Objects.equals(summary, project.summary) &&
-                Objects.equals(currency, project.currency) &&
-                Objects.equals(totalcost, project.totalcost) &&
-                Objects.equals(fundedamount, project.fundedamount);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), websiteurl, code, acronym, title, startdate, enddate, callidentifier, keywords, duration, ecsc39, oamandatepublications, ecarticle29_3, subjects, fundingtree, contracttype, optional1, optional2, jsonextrainfo, contactfullname, contactfax, contactphone, contactemail, summary, currency, totalcost, fundedamount);
-    }
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java

@@ -1,13 +1,19 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
-import java.util.Objects;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
 
 public class Publication extends Result implements Serializable {
 
 	// publication specific
 	private Journal journal;
 
+	public Publication() {
+		setResulttype(ModelConstants.PUBLICATION_DEFAULT_RESULTTYPE);
+	}
+
 	public Journal getJournal() {
 		return journal;
 	}
@@ -20,28 +26,14 @@ public class Publication extends Result implements Serializable {
 	public void mergeFrom(OafEntity e) {
 		super.mergeFrom(e);
 
-        if (!Publication.class.isAssignableFrom(e.getClass())){
+		if (!Publication.class.isAssignableFrom(e.getClass())) {
 			return;
 		}
 
 		Publication p = (Publication) e;
 
-        if (p.getJournal() != null && compareTrust(this, e)<0)
+		if (p.getJournal() != null && compareTrust(this, e) < 0)
 			journal = p.getJournal();
 		mergeOAFDataInfo(e);
 	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        Publication that = (Publication) o;
-        return Objects.equals(journal, that.journal);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), journal);
-    }
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java

@@ -1,9 +1,11 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
+
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class Qualifier implements Serializable {
 
@@ -45,7 +47,11 @@ public class Qualifier implements Serializable {
 	}
 
 	public String toComparableString() {
-        return isBlank()?"": String.format("%s::%s::%s::%s",
+		return isBlank()
+			? ""
+			: String
+				.format(
+					"%s::%s::%s::%s",
 					classid != null ? classid : "",
 					classname != null ? classname : "",
 					schemeid != null ? schemeid : "",
@@ -54,11 +60,12 @@ public class Qualifier implements Serializable {
 
 	@JsonIgnore
 	public boolean isBlank() {
-        return StringUtils.isBlank(classid) &&
+		return StringUtils.isBlank(classid)
-                StringUtils.isBlank(classname) &&
+			&& StringUtils.isBlank(classname)
-                StringUtils.isBlank(schemeid) &&
+			&& StringUtils.isBlank(schemeid)
-                StringUtils.isBlank(schemename);
+			&& StringUtils.isBlank(schemename);
 	}
+
 	@Override
 	public int hashCode() {
 		return toComparableString().hashCode();
@@ -75,7 +82,6 @@ public class Qualifier implements Serializable {
 
 		Qualifier other = (Qualifier) obj;
 
-        return toComparableString()
+		return toComparableString().equals(other.toComparableString());
-                .equals(other.toComparableString());
 	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java

@@ -1,14 +1,15 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 /**
- * Relation aims to model any edge between two nodes in the OpenAIRE graph. It has a source id and a target id
+ * Relation models any edge between two nodes in the OpenAIRE graph. It has a source id and a target id
- * pointing to graph node identifiers and it is further characterised by the semantic of the link throught the fields
+ * pointing to graph node identifiers and it is further characterised by the semantic of the link through the fields
  * relType, subRelType and relClass. Provenance information is modeled according to the dataInfo element and collectedFrom,
  * while individual relationship types can provide extra information via the properties field.
  */
@@ -39,16 +40,6 @@ public class Relation extends Oaf {
 	 */
 	private String target;
 
-	/**
-	 * The list of datasource id/name pairs providing this relationship.
-	 */
-	private List<KeyValue> collectedFrom = new ArrayList<>();
-
-	/**
-	 * List of relation specific properties. Values include 'similarityLevel', indicating the similarity score between a pair of publications.
-	 */
-	private List<KeyValue> properties = new ArrayList<>();
-
 	public String getRelType() {
 		return relType;
 	}
@@ -89,53 +80,46 @@ public class Relation extends Oaf {
 		this.target = target;
 	}
 
-	public List<KeyValue> getCollectedFrom() {
-		return collectedFrom;
-	}
-
-	public void setCollectedFrom(final List<KeyValue> collectedFrom) {
-		this.collectedFrom = collectedFrom;
-	}
-
-	public List<KeyValue> getProperties() {
-		return properties;
-	}
-
-	public void setProperties(List<KeyValue> properties) {
-		this.properties = properties;
-	}
-
 	public void mergeFrom(final Relation r) {
 
-		checkArgument(Objects.equals(getSource(), r.getSource()),"source ids must be equal");
+		checkArgument(Objects.equals(getSource(), r.getSource()), "source ids must be equal");
-		checkArgument(Objects.equals(getTarget(), r.getTarget()),"target ids must be equal");
+		checkArgument(Objects.equals(getTarget(), r.getTarget()), "target ids must be equal");
-		checkArgument(Objects.equals(getRelType(), r.getRelType()),"relType(s) must be equal");
+		checkArgument(Objects.equals(getRelType(), r.getRelType()), "relType(s) must be equal");
-		checkArgument(Objects.equals(getSubRelType(), r.getSubRelType()),"subRelType(s) must be equal");
+		checkArgument(
-		checkArgument(Objects.equals(getRelClass(), r.getRelClass()),"relClass(es) must be equal");
+			Objects.equals(getSubRelType(), r.getSubRelType()), "subRelType(s) must be equal");
+		checkArgument(Objects.equals(getRelClass(), r.getRelClass()), "relClass(es) must be equal");
 
-		setCollectedFrom(
+		setCollectedfrom(
 			Stream
-						.concat(Optional.ofNullable(getCollectedFrom()).map(Collection::stream).orElse(Stream.empty()),
+				.concat(
-								Optional.ofNullable(r.getCollectedFrom()).map(Collection::stream).orElse(Stream.empty()))
+					Optional
+						.ofNullable(getCollectedfrom())
+						.map(Collection::stream)
+						.orElse(Stream.empty()),
+					Optional
+						.ofNullable(r.getCollectedfrom())
+						.map(Collection::stream)
+						.orElse(Stream.empty()))
 				.distinct() // relies on KeyValue.equals
 				.collect(Collectors.toList()));
 	}
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o)
-		if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		Relation relation = (Relation) o;
-		return relType.equals(relation.relType) &&
+		return relType.equals(relation.relType)
-				subRelType.equals(relation.subRelType) &&
+			&& subRelType.equals(relation.subRelType)
-				relClass.equals(relation.relClass) &&
+			&& relClass.equals(relation.relClass)
-				source.equals(relation.source) &&
+			&& source.equals(relation.source)
-				target.equals(relation.target);
+			&& target.equals(relation.target);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(relType, subRelType, relClass, source, target, collectedFrom);
+		return Objects.hash(relType, subRelType, relClass, source, target, collectedfrom);
 	}
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java

@@ -1,9 +1,9 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 
 public class Result extends OafEntity implements Serializable {
 
@@ -223,7 +223,7 @@ public class Result extends OafEntity implements Serializable {
 	public void mergeFrom(OafEntity e) {
 		super.mergeFrom(e);
 
-        if (!Result.class.isAssignableFrom(e.getClass())){
+		if (!Result.class.isAssignableFrom(e.getClass())) {
 			return;
 		}
 
@@ -231,6 +231,9 @@ public class Result extends OafEntity implements Serializable {
 
 		instance = mergeLists(instance, r.getInstance());
 
+		if (r.getBestaccessright() != null && compareTrust(this, r) < 0)
+			bestaccessright = r.getBestaccessright();
+
 		if (r.getResulttype() != null && compareTrust(this, r) < 0)
 			resulttype = r.getResulttype();
 
@@ -271,49 +274,24 @@ public class Result extends OafEntity implements Serializable {
 		externalReference = mergeLists(externalReference, r.getExternalReference());
 	}
 
-
 	private List<Field<String>> longestLists(List<Field<String>> a, List<Field<String>> b) {
 		if (a == null || b == null)
 			return a == null ? b : a;
 		if (a.size() == b.size()) {
-            int msa = a.stream().filter(i -> i.getValue() != null).map(i -> i.getValue().length()).max(Comparator.naturalOrder()).orElse(0);
+			int msa = a
-            int msb = b.stream().filter(i -> i.getValue() != null).map(i -> i.getValue().length()).max(Comparator.naturalOrder()).orElse(0);
+				.stream()
+				.filter(i -> i.getValue() != null)
+				.map(i -> i.getValue().length())
+				.max(Comparator.naturalOrder())
+				.orElse(0);
+			int msb = b
+				.stream()
+				.filter(i -> i.getValue() != null)
+				.map(i -> i.getValue().length())
+				.max(Comparator.naturalOrder())
+				.orElse(0);
 			return msa > msb ? a : b;
 		}
 		return a.size() > b.size() ? a : b;
 	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        Result result = (Result) o;
-        return Objects.equals(author, result.author) &&
-                Objects.equals(resulttype, result.resulttype) &&
-                Objects.equals(language, result.language) &&
-                Objects.equals(country, result.country) &&
-                Objects.equals(subject, result.subject) &&
-                Objects.equals(title, result.title) &&
-                Objects.equals(relevantdate, result.relevantdate) &&
-                Objects.equals(description, result.description) &&
-                Objects.equals(dateofacceptance, result.dateofacceptance) &&
-                Objects.equals(publisher, result.publisher) &&
-                Objects.equals(embargoenddate, result.embargoenddate) &&
-                Objects.equals(source, result.source) &&
-                Objects.equals(fulltext, result.fulltext) &&
-                Objects.equals(format, result.format) &&
-                Objects.equals(contributor, result.contributor) &&
-                Objects.equals(resourcetype, result.resourcetype) &&
-                Objects.equals(coverage, result.coverage) &&
-                Objects.equals(bestaccessright, result.bestaccessright) &&
-                Objects.equals(context, result.context) &&
-                Objects.equals(externalReference, result.externalReference) &&
-                Objects.equals(instance, result.instance);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), author, resulttype, language, country, subject, title, relevantdate, description, dateofacceptance, publisher, embargoenddate, source, fulltext, format, contributor, resourcetype, coverage, bestaccessright, context, externalReference, instance);
-    }
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java

@@ -1,8 +1,10 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
 
 public class Software extends Result implements Serializable {
 
@@ -14,6 +16,10 @@ public class Software extends Result implements Serializable {
 
 	private Qualifier programmingLanguage;
 
+	public Software() {
+		setResulttype(ModelConstants.SOFTWARE_DEFAULT_RESULTTYPE);
+	}
+
 	public List<Field<String>> getDocumentationUrl() {
 		return documentationUrl;
 	}
@@ -50,7 +56,7 @@ public class Software extends Result implements Serializable {
 	public void mergeFrom(OafEntity e) {
 		super.mergeFrom(e);
 
-        if (!Software.class.isAssignableFrom(e.getClass())){
+		if (!Software.class.isAssignableFrom(e.getClass())) {
 			return;
 		}
 
@@ -59,27 +65,14 @@ public class Software extends Result implements Serializable {
 
 		license = mergeLists(license, s.getLicense());
 
-        codeRepositoryUrl = s.getCodeRepositoryUrl()!= null && compareTrust(this, s)<0?s.getCodeRepositoryUrl():codeRepositoryUrl;
+		codeRepositoryUrl = s.getCodeRepositoryUrl() != null && compareTrust(this, s) < 0
+			? s.getCodeRepositoryUrl()
+			: codeRepositoryUrl;
 
-        programmingLanguage= s.getProgrammingLanguage()!= null && compareTrust(this, s)<0?s.getProgrammingLanguage():programmingLanguage;
+		programmingLanguage = s.getProgrammingLanguage() != null && compareTrust(this, s) < 0
+			? s.getProgrammingLanguage()
+			: programmingLanguage;
 
 		mergeOAFDataInfo(e);
 	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        Software software = (Software) o;
-        return Objects.equals(documentationUrl, software.documentationUrl) &&
-                Objects.equals(license, software.license) &&
-                Objects.equals(codeRepositoryUrl, software.codeRepositoryUrl) &&
-                Objects.equals(programmingLanguage, software.programmingLanguage);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), documentationUrl, license, codeRepositoryUrl, programmingLanguage);
-    }
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
@@ -34,7 +35,7 @@ public class StructuredProperty implements Serializable {
 		this.dataInfo = dataInfo;
 	}
 
-    public String toComparableString(){
+	public String toComparableString() {
 		return value != null ? value.toLowerCase() : "";
 	}
 
@@ -54,7 +55,6 @@ public class StructuredProperty implements Serializable {
 
 		StructuredProperty other = (StructuredProperty) obj;
 
-        return toComparableString()
+		return toComparableString().equals(other.toComparableString());
-                .equals(other.toComparableString());
 	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/scholexplorer/DLIDataset.java

@@ -1,14 +1,16 @@
-package eu.dnetlib.dhp.schema.scholexplorer;
 
-import eu.dnetlib.dhp.schema.oaf.Dataset;
+package eu.dnetlib.dhp.schema.scholexplorer;
-import eu.dnetlib.dhp.schema.oaf.OafEntity;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+
+import eu.dnetlib.dhp.schema.oaf.Dataset;
+import eu.dnetlib.dhp.schema.oaf.OafEntity;
+
 public class DLIDataset extends Dataset {
 
 	private String originalObjIdentifier;
@@ -52,12 +54,16 @@ public class DLIDataset extends Dataset {
 		dlicollectedfrom = mergeProvenance(dlicollectedfrom, p.getDlicollectedfrom());
 	}
 
-    private List<ProvenaceInfo> mergeProvenance(final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
+	private List<ProvenaceInfo> mergeProvenance(
+		final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
 		Map<String, ProvenaceInfo> result = new HashMap<>();
 		if (a != null)
-            a.forEach(p -> {
+			a
+				.forEach(
+					p -> {
 						if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
-                    if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus()) && StringUtils.isNotBlank(p.getCompletionStatus())) {
+							if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
+								&& StringUtils.isNotBlank(p.getCompletionStatus())) {
 								result.put(p.getId(), p);
 							}
 
@@ -65,9 +71,12 @@ public class DLIDataset extends Dataset {
 							result.put(p.getId(), p);
 					});
 		if (b != null)
-            b.forEach(p -> {
+			b
+				.forEach(
+					p -> {
 						if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
-                    if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus()) && StringUtils.isNotBlank(p.getCompletionStatus())) {
+							if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
+								&& StringUtils.isNotBlank(p.getCompletionStatus())) {
 								result.put(p.getId(), p);
 							}
 

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/scholexplorer/DLIPublication.java

@@ -1,10 +1,13 @@
+
 package eu.dnetlib.dhp.schema.scholexplorer;
 
+import java.io.Serializable;
+import java.util.*;
+
+import org.apache.commons.lang3.StringUtils;
+
 import eu.dnetlib.dhp.schema.oaf.OafEntity;
 import eu.dnetlib.dhp.schema.oaf.Publication;
-import org.apache.commons.lang3.StringUtils;
-import java.io.Serializable;
-import java.util.*;
 
 public class DLIPublication extends Publication implements Serializable {
 
@@ -49,12 +52,16 @@ public class DLIPublication extends Publication implements Serializable {
 		dlicollectedfrom = mergeProvenance(dlicollectedfrom, p.getDlicollectedfrom());
 	}
 
-    private List<ProvenaceInfo> mergeProvenance(final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
+	private List<ProvenaceInfo> mergeProvenance(
+		final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
 		Map<String, ProvenaceInfo> result = new HashMap<>();
 		if (a != null)
-            a.forEach(p -> {
+			a
+				.forEach(
+					p -> {
 						if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
-                    if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus()) && StringUtils.isNotBlank(p.getCompletionStatus())) {
+							if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
+								&& StringUtils.isNotBlank(p.getCompletionStatus())) {
 								result.put(p.getId(), p);
 							}
 
@@ -62,9 +69,12 @@ public class DLIPublication extends Publication implements Serializable {
 							result.put(p.getId(), p);
 					});
 		if (b != null)
-            b.forEach(p -> {
+			b
+				.forEach(
+					p -> {
 						if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
-                    if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus()) && StringUtils.isNotBlank(p.getCompletionStatus())) {
+							if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
+								&& StringUtils.isNotBlank(p.getCompletionStatus())) {
 								result.put(p.getId(), p);
 							}
 

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/scholexplorer/DLIRelation.java

@@ -0,0 +1,16 @@
+
+package eu.dnetlib.dhp.schema.scholexplorer;
+
+import eu.dnetlib.dhp.schema.oaf.Relation;
+
+public class DLIRelation extends Relation {
+	private String dateOfCollection;
+
+	public String getDateOfCollection() {
+		return dateOfCollection;
+	}
+
+	public void setDateOfCollection(String dateOfCollection) {
+		this.dateOfCollection = dateOfCollection;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/scholexplorer/DLIUnknown.java

@@ -1,9 +1,5 @@
-package eu.dnetlib.dhp.schema.scholexplorer;
 
-import eu.dnetlib.dhp.schema.oaf.Oaf;
+package eu.dnetlib.dhp.schema.scholexplorer;
-import eu.dnetlib.dhp.schema.oaf.OafEntity;
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -11,6 +7,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+
+import eu.dnetlib.dhp.schema.oaf.Oaf;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+
 public class DLIUnknown extends Oaf implements Serializable {
 
 	private String id;
@@ -49,7 +50,6 @@ public class DLIUnknown extends Oaf implements Serializable {
 		this.id = id;
 	}
 
-
 	public List<StructuredProperty> getPid() {
 		return pid;
 	}
@@ -80,12 +80,16 @@ public class DLIUnknown extends Oaf implements Serializable {
 		dlicollectedfrom = mergeProvenance(dlicollectedfrom, p.getDlicollectedfrom());
 	}
 
-    private List<ProvenaceInfo> mergeProvenance(final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
+	private List<ProvenaceInfo> mergeProvenance(
+		final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
 		Map<String, ProvenaceInfo> result = new HashMap<>();
 		if (a != null)
-            a.forEach(p -> {
+			a
+				.forEach(
+					p -> {
 						if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
-                    if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus()) && StringUtils.isNotBlank(p.getCompletionStatus())) {
+							if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
+								&& StringUtils.isNotBlank(p.getCompletionStatus())) {
 								result.put(p.getId(), p);
 							}
 
@@ -93,9 +97,12 @@ public class DLIUnknown extends Oaf implements Serializable {
 							result.put(p.getId(), p);
 					});
 		if (b != null)
-            b.forEach(p -> {
+			b
+				.forEach(
+					p -> {
 						if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
-                    if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus()) && StringUtils.isNotBlank(p.getCompletionStatus())) {
+							if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
+								&& StringUtils.isNotBlank(p.getCompletionStatus())) {
 								result.put(p.getId(), p);
 							}
 

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/scholexplorer/ProvenaceInfo.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.scholexplorer;
 
 import java.io.Serializable;
@@ -10,7 +11,7 @@ public class ProvenaceInfo implements Serializable {
 
 	private String completionStatus;
 
-    private String collectionMode ="collected";
+	private String collectionMode = "collected";
 
 	public String getId() {
 		return id;

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java

@@ -1,18 +1,18 @@
+
 package eu.dnetlib.dhp.schema.action;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.dnetlib.dhp.schema.oaf.Relation;
-import org.apache.commons.lang3.StringUtils;
-
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-
 import static org.junit.jupiter.api.Assertions.*;
 
-/**
+import java.io.IOException;
- * @author claudio.atzori
+
- */
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.schema.oaf.Relation;
+
+/** @author claudio.atzori */
 public class AtomicActionTest {
 
 	@Test
@@ -36,7 +36,5 @@ public class AtomicActionTest {
 
 		assertEquals(aa1.getClazz(), aa2.getClazz());
 		assertEquals(aa1.getPayload(), aa2.getPayload());
-
 	}
-
 }

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java

@@ -1,13 +1,15 @@
+
 package eu.dnetlib.dhp.schema.common;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
 import eu.dnetlib.dhp.schema.oaf.OafEntity;
 import eu.dnetlib.dhp.schema.oaf.Relation;
 import eu.dnetlib.dhp.schema.oaf.Result;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ModelSupportTest {
 

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java

@@ -0,0 +1,4 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+public class MeasureTest {
+}

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java

@@ -1,12 +1,14 @@
+
 package eu.dnetlib.dhp.schema.oaf;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 public class MergeTest {
 
 	OafEntity oaf;
@@ -19,7 +21,7 @@ public class MergeTest {
 	@Test
 	public void mergeListsTest() {
 
-        //string list merge test
+		// string list merge test
 		List<String> a = Arrays.asList("a", "b", "c", "e");
 		List<String> b = Arrays.asList("a", "b", "c", "d");
 		List<String> c = null;
@@ -44,7 +46,6 @@ public class MergeTest {
 
 		assertNotNull(a.getCollectedfrom());
 		assertEquals(3, a.getCollectedfrom().size());
-
 	}
 
 	@Test
@@ -60,7 +61,6 @@ public class MergeTest {
 
 		assertNotNull(a.getSubject());
 		assertEquals(3, a.getSubject().size());
-
 	}
 
 	private KeyValue setKV(final String key, final String value) {
@@ -73,7 +73,8 @@ public class MergeTest {
 		return k;
 	}
 
-    private StructuredProperty setSP(final String value, final String schema, final String classname) {
+	private StructuredProperty setSP(
+		final String value, final String schema, final String classname) {
 		StructuredProperty s = new StructuredProperty();
 		s.setValue(value);
 		Qualifier q = new Qualifier();

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/scholexplorer/DLItest.java

@@ -1,53 +1,56 @@
-package eu.dnetlib.dhp.schema.scholexplorer;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+package eu.dnetlib.dhp.schema.scholexplorer;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import eu.dnetlib.dhp.schema.oaf.Qualifier;
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
-import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 
-public class DLItest {
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import eu.dnetlib.dhp.schema.oaf.Qualifier;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+
+public class DLItest {
 
 	@Test
 	public void testMergePublication() throws JsonProcessingException {
 		DLIPublication a1 = new DLIPublication();
-        a1.setPid(Arrays.asList( createSP("123456","pdb","dnet:pid_types")));
+		a1.setPid(Arrays.asList(createSP("123456", "pdb", "dnet:pid_types")));
 		a1.setTitle(Collections.singletonList(createSP("Un Titolo", "title", "dnetTitle")));
-        a1.setDlicollectedfrom(Arrays.asList(createCollectedFrom("znd","Zenodo","complete")));
+		a1.setDlicollectedfrom(Arrays.asList(createCollectedFrom("znd", "Zenodo", "complete")));
 		a1.setCompletionStatus("complete");
 
 		DLIPublication a = new DLIPublication();
-        a.setPid(Arrays.asList(createSP("10.11","doi","dnet:pid_types"), createSP("123456","pdb","dnet:pid_types")));
+		a
+			.setPid(
+				Arrays
+					.asList(
+						createSP("10.11", "doi", "dnet:pid_types"),
+						createSP("123456", "pdb", "dnet:pid_types")));
 		a.setTitle(Collections.singletonList(createSP("A Title", "title", "dnetTitle")));
-        a.setDlicollectedfrom(Arrays.asList(createCollectedFrom("dct","datacite","complete"),createCollectedFrom("dct","datacite","incomplete")));
+		a
+			.setDlicollectedfrom(
+				Arrays
+					.asList(
+						createCollectedFrom("dct", "datacite", "complete"),
+						createCollectedFrom("dct", "datacite", "incomplete")));
 		a.setCompletionStatus("incomplete");
 
 		a.mergeFrom(a1);
 
 		ObjectMapper mapper = new ObjectMapper();
 		System.out.println(mapper.writeValueAsString(a));
-
-
-
-
-
-
-
 	}
 
-
-
 	@Test
 	public void testDeserialization() throws IOException {
 
-        final String json ="{\"dataInfo\":{\"invisible\":false,\"inferred\":null,\"deletedbyinference\":false,\"trust\":\"0.9\",\"inferenceprovenance\":null,\"provenanceaction\":null},\"lastupdatetimestamp\":null,\"id\":\"60|bd9352547098929a394655ad1a44a479\",\"originalId\":[\"bd9352547098929a394655ad1a44a479\"],\"collectedfrom\":[{\"key\":\"dli_________::datacite\",\"value\":\"Datasets in Datacite\",\"dataInfo\":null,\"blank\":false}],\"pid\":[{\"value\":\"10.7925/DRS1.DUCHAS_5078760\",\"qualifier\":{\"classid\":\"doi\",\"classname\":\"doi\",\"schemeid\":\"dnet:pid_types\",\"schemename\":\"dnet:pid_types\",\"blank\":false},\"dataInfo\":null}],\"dateofcollection\":\"2020-01-09T08:29:31.885Z\",\"dateoftransformation\":null,\"extraInfo\":null,\"oaiprovenance\":null,\"author\":[{\"fullname\":\"Cathail, S. Ó\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Donnell, Breda Mc\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Ireland. Department of Arts, Culture, and the Gaeltacht\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"University College Dublin\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"National Folklore Foundation\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Cathail, S. Ó\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Donnell, Breda Mc\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null}],\"resulttype\":null,\"language\":null,\"country\":null,\"subject\":[{\"value\":\"Recreation\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null},{\"value\":\"Entertainments and recreational activities\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null},{\"value\":\"Siamsaíocht agus caitheamh aimsire\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null}],\"title\":[{\"value\":\"Games We Play\",\"qualifier\":null,\"dataInfo\":null}],\"relevantdate\":[{\"value\":\"1938-09-28\",\"qualifier\":{\"classid\":\"date\",\"classname\":\"date\",\"schemeid\":\"dnet::date\",\"schemename\":\"dnet::date\",\"blank\":false},\"dataInfo\":null}],\"description\":[{\"value\":\"Story collected by Breda Mc Donnell, a student at Tenure school (Tinure, Co. Louth) (no informant identified).\",\"dataInfo\":null}],\"dateofacceptance\":null,\"publisher\":{\"value\":\"University College Dublin\",\"dataInfo\":null},\"embargoenddate\":null,\"source\":null,\"fulltext\":null,\"format\":null,\"contributor\":null,\"resourcetype\":null,\"coverage\":null,\"refereed\":null,\"context\":null,\"processingchargeamount\":null,\"processingchargecurrency\":null,\"externalReference\":null,\"instance\":[],\"storagedate\":null,\"device\":null,\"size\":null,\"version\":null,\"lastmetadataupdate\":null,\"metadataversionnumber\":null,\"geolocation\":null,\"dlicollectedfrom\":[{\"id\":\"dli_________::datacite\",\"name\":\"Datasets in Datacite\",\"completionStatus\":\"complete\",\"collectionMode\":\"resolved\"}],\"completionStatus\":\"complete\"}";
+		final String json = "{\"dataInfo\":{\"invisible\":false,\"inferred\":null,\"deletedbyinference\":false,\"trust\":\"0.9\",\"inferenceprovenance\":null,\"provenanceaction\":null},\"lastupdatetimestamp\":null,\"id\":\"60|bd9352547098929a394655ad1a44a479\",\"originalId\":[\"bd9352547098929a394655ad1a44a479\"],\"collectedfrom\":[{\"key\":\"dli_________::datacite\",\"value\":\"Datasets in Datacite\",\"dataInfo\":null,\"blank\":false}],\"pid\":[{\"value\":\"10.7925/DRS1.DUCHAS_5078760\",\"qualifier\":{\"classid\":\"doi\",\"classname\":\"doi\",\"schemeid\":\"dnet:pid_types\",\"schemename\":\"dnet:pid_types\",\"blank\":false},\"dataInfo\":null}],\"dateofcollection\":\"2020-01-09T08:29:31.885Z\",\"dateoftransformation\":null,\"extraInfo\":null,\"oaiprovenance\":null,\"author\":[{\"fullname\":\"Cathail, S. Ó\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Donnell, Breda Mc\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Ireland. Department of Arts, Culture, and the Gaeltacht\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"University College Dublin\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"National Folklore Foundation\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Cathail, S. Ó\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Donnell, Breda Mc\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null}],\"resulttype\":null,\"language\":null,\"country\":null,\"subject\":[{\"value\":\"Recreation\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null},{\"value\":\"Entertainments and recreational activities\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null},{\"value\":\"Siamsaíocht agus caitheamh aimsire\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null}],\"title\":[{\"value\":\"Games We Play\",\"qualifier\":null,\"dataInfo\":null}],\"relevantdate\":[{\"value\":\"1938-09-28\",\"qualifier\":{\"classid\":\"date\",\"classname\":\"date\",\"schemeid\":\"dnet::date\",\"schemename\":\"dnet::date\",\"blank\":false},\"dataInfo\":null}],\"description\":[{\"value\":\"Story collected by Breda Mc Donnell, a student at Tenure school (Tinure, Co. Louth) (no informant identified).\",\"dataInfo\":null}],\"dateofacceptance\":null,\"publisher\":{\"value\":\"University College Dublin\",\"dataInfo\":null},\"embargoenddate\":null,\"source\":null,\"fulltext\":null,\"format\":null,\"contributor\":null,\"resourcetype\":null,\"coverage\":null,\"refereed\":null,\"context\":null,\"processingchargeamount\":null,\"processingchargecurrency\":null,\"externalReference\":null,\"instance\":[],\"storagedate\":null,\"device\":null,\"size\":null,\"version\":null,\"lastmetadataupdate\":null,\"metadataversionnumber\":null,\"geolocation\":null,\"dlicollectedfrom\":[{\"id\":\"dli_________::datacite\",\"name\":\"Datasets in Datacite\",\"completionStatus\":\"complete\",\"collectionMode\":\"resolved\"}],\"completionStatus\":\"complete\"}";
 
 		ObjectMapper mapper = new ObjectMapper();
 		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -56,7 +59,8 @@ public class DLItest {
 		System.out.println(mapper.writeValueAsString(dliDataset));
 	}
 
-    private ProvenaceInfo createCollectedFrom(final String id, final String name, final String completionStatus) {
+	private ProvenaceInfo createCollectedFrom(
+		final String id, final String name, final String completionStatus) {
 		ProvenaceInfo p = new ProvenaceInfo();
 		p.setId(id);
 		p.setName(name);
@@ -64,8 +68,8 @@ public class DLItest {
 		return p;
 	}
 
-
+	private StructuredProperty createSP(
-    private StructuredProperty createSP(final String value, final String className, final String schemeName) {
+		final String value, final String className, final String schemeName) {
 		StructuredProperty p = new StructuredProperty();
 		p.setValue(value);
 		Qualifier schema = new Qualifier();
@@ -76,6 +80,4 @@ public class DLItest {
 		p.setQualifier(schema);
 		return p;
 	}
-
-
 }

dhp-workflows/dhp-actionmanager/pom.xml

@@ -47,6 +47,16 @@
             <artifactId>jaxen</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-distcp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>dnet-openaire-data-protos</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>eu.dnetlib.dhp</groupId>
             <artifactId>dhp-schemas</artifactId>
@@ -57,6 +67,44 @@
             <groupId>eu.dnetlib</groupId>
             <artifactId>dnet-actionmanager-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>dnet-actionmanager-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>eu.dnetlib</groupId>
+                    <artifactId>dnet-openaireplus-mapping-utils</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>saxonica</groupId>
+                    <artifactId>saxon</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>saxonica</groupId>
+                    <artifactId>saxon-dom</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jgrapht</groupId>
+                    <artifactId>jgrapht</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-test</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>apache</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
     </dependencies>
 </project>

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/ISClient.java

@@ -1,20 +1,5 @@
-package eu.dnetlib.dhp.actionmanager;
 
-import com.google.common.base.Splitter;
+package eu.dnetlib.dhp.actionmanager;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import eu.dnetlib.actionmanager.rmi.ActionManagerException;
-import eu.dnetlib.actionmanager.set.ActionManagerSet;
-import eu.dnetlib.actionmanager.set.ActionManagerSet.ImpactTypes;
-import eu.dnetlib.dhp.actionmanager.partition.PartitionActionSetsByPayloadTypeJob;
-import eu.dnetlib.dhp.utils.ISLookupClientFactory;
-import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
-import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.io.StringReader;
@@ -23,23 +8,49 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
+import eu.dnetlib.actionmanager.rmi.ActionManagerException;
+import eu.dnetlib.actionmanager.set.ActionManagerSet;
+import eu.dnetlib.actionmanager.set.ActionManagerSet.ImpactTypes;
+import eu.dnetlib.dhp.actionmanager.partition.PartitionActionSetsByPayloadTypeJob;
+import eu.dnetlib.dhp.utils.ISLookupClientFactory;
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
+
 public class ISClient implements Serializable {
 
 	private static final Logger log = LoggerFactory.getLogger(PartitionActionSetsByPayloadTypeJob.class);
 
 	private static final String INPUT_ACTION_SET_ID_SEPARATOR = ",";
 
-	public static List<String> getLatestRawsetPaths(String isLookupUrl, String setIds) {
+	private final ISLookUpService isLookup;
 
-		ISLookUpService isLookup = ISLookupClientFactory.getLookUpService(isLookupUrl);
+	public ISClient(String isLookupUrl) {
-		ISClient isClient = new ISClient();
+		isLookup = ISLookupClientFactory.getLookUpService(isLookupUrl);
-		List<String> ids = Lists.newArrayList(Splitter.on(INPUT_ACTION_SET_ID_SEPARATOR)
+	}
+
+	public List<String> getLatestRawsetPaths(String setIds) {
+
+		List<String> ids = Lists
+			.newArrayList(
+				Splitter
+					.on(INPUT_ACTION_SET_ID_SEPARATOR)
 					.omitEmptyStrings()
 					.trimResults()
 					.split(setIds));
 
-		return ids.stream()
+		return ids
-				.map(id -> isClient.getSet(isLookup, id))
+			.stream()
+			.map(id -> getSet(isLookup, id))
 			.map(as -> as.getPathToLatest())
 			.collect(Collectors.toCollection(ArrayList::new));
 	}
@@ -47,7 +58,9 @@ public class ISClient implements Serializable {
 	private ActionManagerSet getSet(ISLookUpService isLookup, final String setId) {
 
 		final String q = "for $x in collection('/db/DRIVER/ActionManagerSetDSResources/ActionManagerSetDSResourceType') "
-				+ "where $x//SET/@id = '" + setId + "' return $x";
+			+ "where $x//SET/@id = '"
+			+ setId
+			+ "' return $x";
 
 		try {
 			final String basePath = getBasePathHDFS(isLookup);
@@ -58,7 +71,8 @@ public class ISClient implements Serializable {
 		}
 	}
 
-	private ActionManagerSet getActionManagerSet(final String basePath, final String profile) throws ActionManagerException {
+	private ActionManagerSet getActionManagerSet(final String basePath, final String profile)
+		throws ActionManagerException {
 		final SAXReader reader = new SAXReader();
 		final ActionManagerSet set = new ActionManagerSet();
 
@@ -68,13 +82,21 @@ public class ISClient implements Serializable {
 			set.setId(doc.valueOf("//SET/@id").trim());
 			set.setName(doc.valueOf("//SET").trim());
 			set.setImpact(ImpactTypes.valueOf(doc.valueOf("//IMPACT").trim()));
-			set.setLatest(doc.valueOf("//RAW_SETS/LATEST/@id"), doc.valueOf("//RAW_SETS/LATEST/@creationDate"), doc.valueOf("//RAW_SETS/LATEST/@lastUpdate"));
+			set
+				.setLatest(
+					doc.valueOf("//RAW_SETS/LATEST/@id"),
+					doc.valueOf("//RAW_SETS/LATEST/@creationDate"),
+					doc.valueOf("//RAW_SETS/LATEST/@lastUpdate"));
 			set.setDirectory(doc.valueOf("//SET/@directory"));
 			final List expiredNodes = doc.selectNodes("//RAW_SETS/EXPIRED");
 			if (expiredNodes != null) {
 				for (int i = 0; i < expiredNodes.size(); i++) {
 					Element ex = (Element) expiredNodes.get(i);
-					set.addExpired(ex.attributeValue("id"), ex.attributeValue("creationDate"), ex.attributeValue("lastUpdate"));
+					set
+						.addExpired(
+							ex.attributeValue("id"),
+							ex.attributeValue("creationDate"),
+							ex.attributeValue("lastUpdate"));
 				}
 			}
 
@@ -96,9 +118,11 @@ public class ISClient implements Serializable {
 		return queryServiceProperty(isLookup, "basePath");
 	}
 
-	private String queryServiceProperty(ISLookUpService isLookup, final String propertyName) throws ActionManagerException {
+	private String queryServiceProperty(ISLookUpService isLookup, final String propertyName)
+		throws ActionManagerException {
 		final String q = "for $x in /RESOURCE_PROFILE[.//RESOURCE_TYPE/@value='ActionManagerServiceResourceType'] return $x//SERVICE_PROPERTIES/PROPERTY[./@ key='"
-				+ propertyName + "']/@value/string()";
+			+ propertyName
+			+ "']/@value/string()";
 		log.debug("quering for service property: " + q);
 		try {
 			final List<String> value = isLookup.quickSearchProfile(q);
@@ -117,6 +141,4 @@ public class ISClient implements Serializable {
 			throw new ActionManagerException(msg, e);
 		}
 	}
-
-
 }

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/migration/LicenseComparator.java

@@ -0,0 +1,69 @@
+
+package eu.dnetlib.dhp.actionmanager.migration;
+
+import java.util.Comparator;
+
+import eu.dnetlib.data.proto.FieldTypeProtos.Qualifier;
+
+public class LicenseComparator implements Comparator<Qualifier> {
+
+	@Override
+	public int compare(Qualifier left, Qualifier right) {
+
+		if (left == null && right == null)
+			return 0;
+		if (left == null)
+			return 1;
+		if (right == null)
+			return -1;
+
+		String lClass = left.getClassid();
+		String rClass = right.getClassid();
+
+		if (lClass.equals(rClass))
+			return 0;
+
+		if (lClass.equals("OPEN SOURCE"))
+			return -1;
+		if (rClass.equals("OPEN SOURCE"))
+			return 1;
+
+		if (lClass.equals("OPEN"))
+			return -1;
+		if (rClass.equals("OPEN"))
+			return 1;
+
+		if (lClass.equals("6MONTHS"))
+			return -1;
+		if (rClass.equals("6MONTHS"))
+			return 1;
+
+		if (lClass.equals("12MONTHS"))
+			return -1;
+		if (rClass.equals("12MONTHS"))
+			return 1;
+
+		if (lClass.equals("EMBARGO"))
+			return -1;
+		if (rClass.equals("EMBARGO"))
+			return 1;
+
+		if (lClass.equals("RESTRICTED"))
+			return -1;
+		if (rClass.equals("RESTRICTED"))
+			return 1;
+
+		if (lClass.equals("CLOSED"))
+			return -1;
+		if (rClass.equals("CLOSED"))
+			return 1;
+
+		if (lClass.equals("UNKNOWN"))
+			return -1;
+		if (rClass.equals("UNKNOWN"))
+			return 1;
+
+		// Else (but unlikely), lexicographical ordering will do.
+		return lClass.compareTo(rClass);
+	}
+}

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/migration/MigrateActionSet.java

@@ -0,0 +1,194 @@
+
+package eu.dnetlib.dhp.actionmanager.migration;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.tools.DistCp;
+import org.apache.hadoop.tools.DistCpOptions;
+import org.apache.hadoop.util.ToolRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+
+import eu.dnetlib.dhp.application.ArgumentApplicationParser;
+import eu.dnetlib.dhp.utils.ISLookupClientFactory;
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
+
+public class MigrateActionSet {
+
+	private static final Logger log = LoggerFactory.getLogger(MigrateActionSet.class);
+
+	private static final String SEPARATOR = "/";
+	private static final String TARGET_PATHS = "target_paths";
+	private static final String RAWSET_PREFIX = "rawset_";
+
+	public static void main(String[] args) throws Exception {
+		final ArgumentApplicationParser parser = new ArgumentApplicationParser(
+			IOUtils
+				.toString(
+					MigrateActionSet.class
+						.getResourceAsStream(
+							"/eu/dnetlib/dhp/actionmanager/migration/migrate_actionsets_parameters.json")));
+		parser.parseArgument(args);
+
+		new MigrateActionSet().run(parser);
+	}
+
+	private void run(ArgumentApplicationParser parser) throws Exception {
+
+		final String isLookupUrl = parser.get("isLookupUrl");
+		final String sourceNN = parser.get("sourceNameNode");
+		final String targetNN = parser.get("targetNameNode");
+		final String workDir = parser.get("workingDirectory");
+		final Integer distcp_num_maps = Integer.parseInt(parser.get("distcp_num_maps"));
+
+		final String distcp_memory_mb = parser.get("distcp_memory_mb");
+		final String distcp_task_timeout = parser.get("distcp_task_timeout");
+
+		final String transform_only_s = parser.get("transform_only");
+
+		log.info("transform only param: {}", transform_only_s);
+
+		final Boolean transformOnly = Boolean.valueOf(parser.get("transform_only"));
+
+		log.info("transform only: {}", transformOnly);
+
+		ISLookUpService isLookUp = ISLookupClientFactory.getLookUpService(isLookupUrl);
+
+		Configuration conf = getConfiguration(distcp_task_timeout, distcp_memory_mb, distcp_num_maps);
+		FileSystem targetFS = FileSystem.get(conf);
+
+		Configuration sourceConf = getConfiguration(distcp_task_timeout, distcp_memory_mb, distcp_num_maps);
+		sourceConf.set(FileSystem.FS_DEFAULT_NAME_KEY, sourceNN);
+		FileSystem sourceFS = FileSystem.get(sourceConf);
+
+		Properties props = new Properties();
+
+		List<Path> targetPaths = new ArrayList<>();
+
+		final List<Path> sourcePaths = getSourcePaths(sourceNN, isLookUp);
+		log
+			.info(
+				"paths to process:\n{}",
+				sourcePaths.stream().map(p -> p.toString()).collect(Collectors.joining("\n")));
+		for (Path source : sourcePaths) {
+
+			if (!sourceFS.exists(source)) {
+				log.warn("skipping unexisting path: {}", source);
+			} else {
+
+				LinkedList<String> pathQ = Lists.newLinkedList(Splitter.on(SEPARATOR).split(source.toUri().getPath()));
+
+				final String rawSet = pathQ.pollLast();
+				log.info("got RAWSET: {}", rawSet);
+
+				if (StringUtils.isNotBlank(rawSet) && rawSet.startsWith(RAWSET_PREFIX)) {
+
+					final String actionSetDirectory = pathQ.pollLast();
+
+					final Path targetPath = new Path(
+						targetNN + workDir + SEPARATOR + actionSetDirectory + SEPARATOR + rawSet);
+
+					log.info("using TARGET PATH: {}", targetPath);
+
+					if (!transformOnly) {
+						if (targetFS.exists(targetPath)) {
+							targetFS.delete(targetPath, true);
+						}
+						runDistcp(
+							distcp_num_maps, distcp_memory_mb, distcp_task_timeout, conf, source, targetPath);
+					}
+
+					targetPaths.add(targetPath);
+				}
+			}
+		}
+
+		props
+			.setProperty(
+				TARGET_PATHS, targetPaths.stream().map(p -> p.toString()).collect(Collectors.joining(",")));
+		File file = new File(System.getProperty("oozie.action.output.properties"));
+
+		try (OutputStream os = new FileOutputStream(file)) {
+			props.store(os, "");
+		}
+		System.out.println(file.getAbsolutePath());
+	}
+
+	private void runDistcp(
+		Integer distcp_num_maps,
+		String distcp_memory_mb,
+		String distcp_task_timeout,
+		Configuration conf,
+		Path source,
+		Path targetPath)
+		throws Exception {
+
+		final DistCpOptions op = new DistCpOptions(source, targetPath);
+		op.setMaxMaps(distcp_num_maps);
+		op.preserve(DistCpOptions.FileAttribute.BLOCKSIZE);
+		op.preserve(DistCpOptions.FileAttribute.REPLICATION);
+		op.preserve(DistCpOptions.FileAttribute.CHECKSUMTYPE);
+
+		int res = ToolRunner
+			.run(
+				new DistCp(conf, op),
+				new String[] {
+					"-Dmapred.task.timeout=" + distcp_task_timeout,
+					"-Dmapreduce.map.memory.mb=" + distcp_memory_mb,
+					"-pb",
+					"-m " + distcp_num_maps,
+					source.toString(),
+					targetPath.toString()
+				});
+
+		if (res != 0) {
+			throw new RuntimeException(String.format("distcp exited with code %s", res));
+		}
+	}
+
+	private Configuration getConfiguration(
+		String distcp_task_timeout, String distcp_memory_mb, Integer distcp_num_maps) {
+		final Configuration conf = new Configuration();
+		conf.set("dfs.webhdfs.socket.connect-timeout", distcp_task_timeout);
+		conf.set("dfs.webhdfs.socket.read-timeout", distcp_task_timeout);
+		conf.set("dfs.http.client.retry.policy.enabled", "true");
+		conf.set("mapred.task.timeout", distcp_task_timeout);
+		conf.set("mapreduce.map.memory.mb", distcp_memory_mb);
+		conf.set("mapred.map.tasks", String.valueOf(distcp_num_maps));
+		return conf;
+	}
+
+	private List<Path> getSourcePaths(String sourceNN, ISLookUpService isLookUp)
+		throws ISLookUpException {
+		String XQUERY = "distinct-values(\n"
+			+ "let $basePath := collection('/db/DRIVER/ServiceResources/ActionManagerServiceResourceType')//SERVICE_PROPERTIES/PROPERTY[@key = 'basePath']/@value/string()\n"
+			+ "for $x in collection('/db/DRIVER/ActionManagerSetDSResources/ActionManagerSetDSResourceType') \n"
+			+ "let $setDir := $x//SET/@directory/string()\n"
+			+ "let $rawSet := $x//RAW_SETS/LATEST/@id/string()\n"
+			+ "return concat($basePath, '/', $setDir, '/', $rawSet))";
+
+		log.info(String.format("running xquery:\n%s", XQUERY));
+		return isLookUp
+			.quickSearchProfile(XQUERY)
+			.stream()
+			.map(p -> sourceNN + p)
+			.map(Path::new)
+			.collect(Collectors.toList());
+	}
+}

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/migration/ProtoConverter.java

@@ -0,0 +1,664 @@
+
+package eu.dnetlib.dhp.actionmanager.migration;
+
+import static eu.dnetlib.data.proto.KindProtos.Kind.entity;
+import static eu.dnetlib.data.proto.KindProtos.Kind.relation;
+import static eu.dnetlib.data.proto.TypeProtos.*;
+import static eu.dnetlib.data.proto.TypeProtos.Type.*;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.collect.Lists;
+import com.googlecode.protobuf.format.JsonFormat;
+
+import eu.dnetlib.data.proto.*;
+import eu.dnetlib.dhp.schema.oaf.*;
+
+public class ProtoConverter implements Serializable {
+
+	public static final String UNKNOWN = "UNKNOWN";
+	public static final String NOT_AVAILABLE = "not available";
+	public static final String DNET_ACCESS_MODES = "dnet:access_modes";
+
+	public static Oaf convert(OafProtos.Oaf oaf) {
+		try {
+			switch (oaf.getKind()) {
+				case entity:
+					return convertEntity(oaf);
+				case relation:
+					return convertRelation(oaf);
+				default:
+					throw new IllegalArgumentException("invalid kind " + oaf.getKind());
+			}
+		} catch (Throwable e) {
+			throw new RuntimeException("error on getting " + JsonFormat.printToString(oaf), e);
+		}
+	}
+
+	private static Relation convertRelation(OafProtos.Oaf oaf) {
+		final OafProtos.OafRel r = oaf.getRel();
+		final Relation rel = new Relation();
+		rel.setDataInfo(mapDataInfo(oaf.getDataInfo()));
+		rel.setLastupdatetimestamp(oaf.getLastupdatetimestamp());
+		rel.setSource(r.getSource());
+		rel.setTarget(r.getTarget());
+		rel.setRelType(r.getRelType().toString());
+		rel.setSubRelType(r.getSubRelType().toString());
+		rel.setRelClass(r.getRelClass());
+		rel
+			.setCollectedfrom(
+				r.getCollectedfromCount() > 0
+					? r.getCollectedfromList().stream().map(kv -> mapKV(kv)).collect(Collectors.toList())
+					: null);
+		return rel;
+	}
+
+	private static OafEntity convertEntity(OafProtos.Oaf oaf) {
+
+		switch (oaf.getEntity().getType()) {
+			case result:
+				final Result r = convertResult(oaf);
+				r.setInstance(convertInstances(oaf));
+				return r;
+			case project:
+				return convertProject(oaf);
+			case datasource:
+				return convertDataSource(oaf);
+			case organization:
+				return convertOrganization(oaf);
+			default:
+				throw new RuntimeException("received unknown type");
+		}
+	}
+
+	private static List<Instance> convertInstances(OafProtos.Oaf oaf) {
+
+		final ResultProtos.Result r = oaf.getEntity().getResult();
+		if (r.getInstanceCount() > 0) {
+			return r.getInstanceList().stream().map(i -> convertInstance(i)).collect(Collectors.toList());
+		}
+		return Lists.newArrayList();
+	}
+
+	private static Instance convertInstance(ResultProtos.Result.Instance ri) {
+		final Instance i = new Instance();
+		i.setAccessright(mapQualifier(ri.getAccessright()));
+		i.setCollectedfrom(mapKV(ri.getCollectedfrom()));
+		i.setDateofacceptance(mapStringField(ri.getDateofacceptance()));
+		i.setDistributionlocation(ri.getDistributionlocation());
+		i.setHostedby(mapKV(ri.getHostedby()));
+		i.setInstancetype(mapQualifier(ri.getInstancetype()));
+		i.setLicense(mapStringField(ri.getLicense()));
+		i.setUrl(ri.getUrlList());
+		i.setRefereed(mapStringField(ri.getRefereed()));
+		i.setProcessingchargeamount(mapStringField(ri.getProcessingchargeamount()));
+		i.setProcessingchargecurrency(mapStringField(ri.getProcessingchargecurrency()));
+		return i;
+	}
+
+	private static Organization convertOrganization(OafProtos.Oaf oaf) {
+		final OrganizationProtos.Organization.Metadata m = oaf.getEntity().getOrganization().getMetadata();
+		final Organization org = setOaf(new Organization(), oaf);
+		setEntity(org, oaf);
+		org.setLegalshortname(mapStringField(m.getLegalshortname()));
+		org.setLegalname(mapStringField(m.getLegalname()));
+		org
+			.setAlternativeNames(
+				m
+					.getAlternativeNamesList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		org.setWebsiteurl(mapStringField(m.getWebsiteurl()));
+		org.setLogourl(mapStringField(m.getLogourl()));
+		org.setEclegalbody(mapStringField(m.getEclegalbody()));
+		org.setEclegalperson(mapStringField(m.getEclegalperson()));
+		org.setEcnonprofit(mapStringField(m.getEcnonprofit()));
+		org.setEcresearchorganization(mapStringField(m.getEcresearchorganization()));
+		org.setEchighereducation(mapStringField(m.getEchighereducation()));
+		org
+			.setEcinternationalorganizationeurinterests(
+				mapStringField(m.getEcinternationalorganizationeurinterests()));
+		org.setEcinternationalorganization(mapStringField(m.getEcinternationalorganization()));
+		org.setEcenterprise(mapStringField(m.getEcenterprise()));
+		org.setEcsmevalidated(mapStringField(m.getEcsmevalidated()));
+		org.setEcnutscode(mapStringField(m.getEcnutscode()));
+		org.setCountry(mapQualifier(m.getCountry()));
+
+		return org;
+	}
+
+	private static Datasource convertDataSource(OafProtos.Oaf oaf) {
+		final DatasourceProtos.Datasource.Metadata m = oaf.getEntity().getDatasource().getMetadata();
+		final Datasource datasource = setOaf(new Datasource(), oaf);
+		setEntity(datasource, oaf);
+		datasource
+			.setAccessinfopackage(
+				m
+					.getAccessinfopackageList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		datasource.setCertificates(mapStringField(m.getCertificates()));
+		datasource.setCitationguidelineurl(mapStringField(m.getCitationguidelineurl()));
+		datasource.setContactemail(mapStringField(m.getContactemail()));
+		datasource.setDatabaseaccessrestriction(mapStringField(m.getDatabaseaccessrestriction()));
+		datasource.setDatabaseaccesstype(mapStringField(m.getDatabaseaccesstype()));
+		datasource.setDataprovider(mapBoolField(m.getDataprovider()));
+		datasource.setDatasourcetype(mapQualifier(m.getDatasourcetype()));
+		datasource.setDatauploadrestriction(mapStringField(m.getDatauploadrestriction()));
+		datasource.setCitationguidelineurl(mapStringField(m.getCitationguidelineurl()));
+		datasource.setDatauploadtype(mapStringField(m.getDatauploadtype()));
+		datasource.setDateofvalidation(mapStringField(m.getDateofvalidation()));
+		datasource.setDescription(mapStringField(m.getDescription()));
+		datasource.setEnglishname(mapStringField(m.getEnglishname()));
+		datasource.setLatitude(mapStringField(m.getLatitude()));
+		datasource.setLongitude(mapStringField(m.getLongitude()));
+		datasource.setLogourl(mapStringField(m.getLogourl()));
+		datasource.setMissionstatementurl(mapStringField(m.getMissionstatementurl()));
+		datasource.setNamespaceprefix(mapStringField(m.getNamespaceprefix()));
+		datasource
+			.setOdcontenttypes(
+				m
+					.getOdcontenttypesList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		datasource
+			.setOdlanguages(
+				m
+					.getOdlanguagesList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		datasource.setOdnumberofitems(mapStringField(m.getOdnumberofitems()));
+		datasource.setOdnumberofitemsdate(mapStringField(m.getOdnumberofitemsdate()));
+		datasource.setOdpolicies(mapStringField(m.getOdpolicies()));
+		datasource.setOfficialname(mapStringField(m.getOfficialname()));
+		datasource.setOpenairecompatibility(mapQualifier(m.getOpenairecompatibility()));
+		datasource.setPidsystems(mapStringField(m.getPidsystems()));
+		datasource
+			.setPolicies(
+				m.getPoliciesList().stream().map(ProtoConverter::mapKV).collect(Collectors.toList()));
+		datasource.setQualitymanagementkind(mapStringField(m.getQualitymanagementkind()));
+		datasource.setReleaseenddate(mapStringField(m.getReleaseenddate()));
+		datasource.setServiceprovider(mapBoolField(m.getServiceprovider()));
+		datasource.setReleasestartdate(mapStringField(m.getReleasestartdate()));
+		datasource
+			.setSubjects(
+				m
+					.getSubjectsList()
+					.stream()
+					.map(ProtoConverter::mapStructuredProperty)
+					.collect(Collectors.toList()));
+		datasource.setVersioning(mapBoolField(m.getVersioning()));
+		datasource.setWebsiteurl(mapStringField(m.getWebsiteurl()));
+		datasource.setJournal(mapJournal(m.getJournal()));
+
+		return datasource;
+	}
+
+	private static Project convertProject(OafProtos.Oaf oaf) {
+		final ProjectProtos.Project.Metadata m = oaf.getEntity().getProject().getMetadata();
+		final Project project = setOaf(new Project(), oaf);
+		setEntity(project, oaf);
+		project.setAcronym(mapStringField(m.getAcronym()));
+		project.setCallidentifier(mapStringField(m.getCallidentifier()));
+		project.setCode(mapStringField(m.getCode()));
+		project.setContactemail(mapStringField(m.getContactemail()));
+		project.setContactfax(mapStringField(m.getContactfax()));
+		project.setContactfullname(mapStringField(m.getContactfullname()));
+		project.setContactphone(mapStringField(m.getContactphone()));
+		project.setContracttype(mapQualifier(m.getContracttype()));
+		project.setCurrency(mapStringField(m.getCurrency()));
+		project.setDuration(mapStringField(m.getDuration()));
+		project.setEcarticle29_3(mapStringField(m.getEcarticle293()));
+		project.setEcsc39(mapStringField(m.getEcsc39()));
+		project.setOamandatepublications(mapStringField(m.getOamandatepublications()));
+		project.setStartdate(mapStringField(m.getStartdate()));
+		project.setEnddate(mapStringField(m.getEnddate()));
+		project.setFundedamount(m.getFundedamount());
+		project.setTotalcost(m.getTotalcost());
+		project.setKeywords(mapStringField(m.getKeywords()));
+		project
+			.setSubjects(
+				m
+					.getSubjectsList()
+					.stream()
+					.map(sp -> mapStructuredProperty(sp))
+					.collect(Collectors.toList()));
+		project.setTitle(mapStringField(m.getTitle()));
+		project.setWebsiteurl(mapStringField(m.getWebsiteurl()));
+		project
+			.setFundingtree(
+				m.getFundingtreeList().stream().map(f -> mapStringField(f)).collect(Collectors.toList()));
+		project.setJsonextrainfo(mapStringField(m.getJsonextrainfo()));
+		project.setSummary(mapStringField(m.getSummary()));
+		project.setOptional1(mapStringField(m.getOptional1()));
+		project.setOptional2(mapStringField(m.getOptional2()));
+		return project;
+	}
+
+	private static Result convertResult(OafProtos.Oaf oaf) {
+		switch (oaf.getEntity().getResult().getMetadata().getResulttype().getClassid()) {
+			case "dataset":
+				return createDataset(oaf);
+			case "publication":
+				return createPublication(oaf);
+			case "software":
+				return createSoftware(oaf);
+			case "other":
+				return createORP(oaf);
+			default:
+				Result result = setOaf(new Result(), oaf);
+				setEntity(result, oaf);
+				return setResult(result, oaf);
+		}
+	}
+
+	private static Software createSoftware(OafProtos.Oaf oaf) {
+		ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata();
+		Software software = setOaf(new Software(), oaf);
+		setEntity(software, oaf);
+		setResult(software, oaf);
+
+		software
+			.setDocumentationUrl(
+				m
+					.getDocumentationUrlList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		software
+			.setLicense(
+				m
+					.getLicenseList()
+					.stream()
+					.map(ProtoConverter::mapStructuredProperty)
+					.collect(Collectors.toList()));
+		software.setCodeRepositoryUrl(mapStringField(m.getCodeRepositoryUrl()));
+		software.setProgrammingLanguage(mapQualifier(m.getProgrammingLanguage()));
+		return software;
+	}
+
+	private static OtherResearchProduct createORP(OafProtos.Oaf oaf) {
+		ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata();
+		OtherResearchProduct otherResearchProducts = setOaf(new OtherResearchProduct(), oaf);
+		setEntity(otherResearchProducts, oaf);
+		setResult(otherResearchProducts, oaf);
+		otherResearchProducts
+			.setContactperson(
+				m
+					.getContactpersonList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		otherResearchProducts
+			.setContactgroup(
+				m
+					.getContactgroupList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		otherResearchProducts
+			.setTool(
+				m.getToolList().stream().map(ProtoConverter::mapStringField).collect(Collectors.toList()));
+
+		return otherResearchProducts;
+	}
+
+	private static Publication createPublication(OafProtos.Oaf oaf) {
+
+		ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata();
+		Publication publication = setOaf(new Publication(), oaf);
+		setEntity(publication, oaf);
+		setResult(publication, oaf);
+		publication.setJournal(mapJournal(m.getJournal()));
+		return publication;
+	}
+
+	private static Dataset createDataset(OafProtos.Oaf oaf) {
+
+		ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata();
+		Dataset dataset = setOaf(new Dataset(), oaf);
+		setEntity(dataset, oaf);
+		setResult(dataset, oaf);
+		dataset.setStoragedate(mapStringField(m.getStoragedate()));
+		dataset.setDevice(mapStringField(m.getDevice()));
+		dataset.setSize(mapStringField(m.getSize()));
+		dataset.setVersion(mapStringField(m.getVersion()));
+		dataset.setLastmetadataupdate(mapStringField(m.getLastmetadataupdate()));
+		dataset.setMetadataversionnumber(mapStringField(m.getMetadataversionnumber()));
+		dataset
+			.setGeolocation(
+				m
+					.getGeolocationList()
+					.stream()
+					.map(ProtoConverter::mapGeolocation)
+					.collect(Collectors.toList()));
+		return dataset;
+	}
+
+	public static <T extends Oaf> T setOaf(T oaf, OafProtos.Oaf o) {
+		oaf.setDataInfo(mapDataInfo(o.getDataInfo()));
+		oaf.setLastupdatetimestamp(o.getLastupdatetimestamp());
+		return oaf;
+	}
+
+	public static <T extends OafEntity> T setEntity(T entity, OafProtos.Oaf oaf) {
+		// setting Entity fields
+		final OafProtos.OafEntity e = oaf.getEntity();
+		entity.setId(e.getId());
+		entity.setOriginalId(e.getOriginalIdList());
+		entity
+			.setCollectedfrom(
+				e.getCollectedfromList().stream().map(ProtoConverter::mapKV).collect(Collectors.toList()));
+		entity
+			.setPid(
+				e
+					.getPidList()
+					.stream()
+					.map(ProtoConverter::mapStructuredProperty)
+					.collect(Collectors.toList()));
+		entity.setDateofcollection(e.getDateofcollection());
+		entity.setDateoftransformation(e.getDateoftransformation());
+		entity
+			.setExtraInfo(
+				e
+					.getExtraInfoList()
+					.stream()
+					.map(ProtoConverter::mapExtraInfo)
+					.collect(Collectors.toList()));
+		return entity;
+	}
+
+	public static <T extends Result> T setResult(T entity, OafProtos.Oaf oaf) {
+		// setting Entity fields
+		final ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata();
+		entity
+			.setAuthor(
+				m.getAuthorList().stream().map(ProtoConverter::mapAuthor).collect(Collectors.toList()));
+		entity.setResulttype(mapQualifier(m.getResulttype()));
+		entity.setLanguage(mapQualifier(m.getLanguage()));
+		entity
+			.setCountry(
+				m
+					.getCountryList()
+					.stream()
+					.map(ProtoConverter::mapQualifierAsCountry)
+					.collect(Collectors.toList()));
+		entity
+			.setSubject(
+				m
+					.getSubjectList()
+					.stream()
+					.map(ProtoConverter::mapStructuredProperty)
+					.collect(Collectors.toList()));
+		entity
+			.setTitle(
+				m
+					.getTitleList()
+					.stream()
+					.map(ProtoConverter::mapStructuredProperty)
+					.collect(Collectors.toList()));
+		entity
+			.setRelevantdate(
+				m
+					.getRelevantdateList()
+					.stream()
+					.map(ProtoConverter::mapStructuredProperty)
+					.collect(Collectors.toList()));
+		entity
+			.setDescription(
+				m
+					.getDescriptionList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		entity.setDateofacceptance(mapStringField(m.getDateofacceptance()));
+		entity.setPublisher(mapStringField(m.getPublisher()));
+		entity.setEmbargoenddate(mapStringField(m.getEmbargoenddate()));
+		entity
+			.setSource(
+				m
+					.getSourceList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		entity
+			.setFulltext(
+				m
+					.getFulltextList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		entity
+			.setFormat(
+				m
+					.getFormatList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		entity
+			.setContributor(
+				m
+					.getContributorList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		entity.setResourcetype(mapQualifier(m.getResourcetype()));
+		entity
+			.setCoverage(
+				m
+					.getCoverageList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		entity
+			.setContext(
+				m.getContextList().stream().map(ProtoConverter::mapContext).collect(Collectors.toList()));
+
+		entity.setBestaccessright(getBestAccessRights(oaf.getEntity().getResult().getInstanceList()));
+
+		return entity;
+	}
+
+	private static Qualifier getBestAccessRights(List<ResultProtos.Result.Instance> instanceList) {
+		if (instanceList != null) {
+			final Optional<FieldTypeProtos.Qualifier> min = instanceList
+				.stream()
+				.map(i -> i.getAccessright())
+				.min(new LicenseComparator());
+
+			final Qualifier rights = min.isPresent() ? mapQualifier(min.get()) : new Qualifier();
+
+			if (StringUtils.isBlank(rights.getClassid())) {
+				rights.setClassid(UNKNOWN);
+			}
+			if (StringUtils.isBlank(rights.getClassname())
+				|| UNKNOWN.equalsIgnoreCase(rights.getClassname())) {
+				rights.setClassname(NOT_AVAILABLE);
+			}
+			if (StringUtils.isBlank(rights.getSchemeid())) {
+				rights.setSchemeid(DNET_ACCESS_MODES);
+			}
+			if (StringUtils.isBlank(rights.getSchemename())) {
+				rights.setSchemename(DNET_ACCESS_MODES);
+			}
+
+			return rights;
+		}
+		return null;
+	}
+
+	private static Context mapContext(ResultProtos.Result.Context context) {
+
+		final Context entity = new Context();
+		entity.setId(context.getId());
+		entity
+			.setDataInfo(
+				context
+					.getDataInfoList()
+					.stream()
+					.map(ProtoConverter::mapDataInfo)
+					.collect(Collectors.toList()));
+		return entity;
+	}
+
+	public static KeyValue mapKV(FieldTypeProtos.KeyValue kv) {
+		final KeyValue keyValue = new KeyValue();
+		keyValue.setKey(kv.getKey());
+		keyValue.setValue(kv.getValue());
+		keyValue.setDataInfo(mapDataInfo(kv.getDataInfo()));
+		return keyValue;
+	}
+
+	public static DataInfo mapDataInfo(FieldTypeProtos.DataInfo d) {
+		final DataInfo dataInfo = new DataInfo();
+		dataInfo.setDeletedbyinference(d.getDeletedbyinference());
+		dataInfo.setInferenceprovenance(d.getInferenceprovenance());
+		dataInfo.setInferred(d.getInferred());
+		dataInfo.setInvisible(d.getInvisible());
+		dataInfo.setProvenanceaction(mapQualifier(d.getProvenanceaction()));
+		dataInfo.setTrust(d.getTrust());
+		return dataInfo;
+	}
+
+	public static Qualifier mapQualifier(FieldTypeProtos.Qualifier q) {
+		final Qualifier qualifier = new Qualifier();
+		qualifier.setClassid(q.getClassid());
+		qualifier.setClassname(q.getClassname());
+		qualifier.setSchemeid(q.getSchemeid());
+		qualifier.setSchemename(q.getSchemename());
+		return qualifier;
+	}
+
+	public static Country mapQualifierAsCountry(FieldTypeProtos.Qualifier q) {
+		final Country c = new Country();
+		c.setClassid(q.getClassid());
+		c.setClassname(q.getClassname());
+		c.setSchemeid(q.getSchemeid());
+		c.setSchemename(q.getSchemename());
+		c.setDataInfo(mapDataInfo(q.getDataInfo()));
+		return c;
+	}
+
+	public static StructuredProperty mapStructuredProperty(FieldTypeProtos.StructuredProperty sp) {
+		final StructuredProperty structuredProperty = new StructuredProperty();
+		structuredProperty.setValue(sp.getValue());
+		structuredProperty.setQualifier(mapQualifier(sp.getQualifier()));
+		structuredProperty.setDataInfo(mapDataInfo(sp.getDataInfo()));
+		return structuredProperty;
+	}
+
+	public static ExtraInfo mapExtraInfo(FieldTypeProtos.ExtraInfo extraInfo) {
+		final ExtraInfo entity = new ExtraInfo();
+		entity.setName(extraInfo.getName());
+		entity.setTypology(extraInfo.getTypology());
+		entity.setProvenance(extraInfo.getProvenance());
+		entity.setTrust(extraInfo.getTrust());
+		entity.setValue(extraInfo.getValue());
+		return entity;
+	}
+
+	public static OAIProvenance mapOAIProvenance(FieldTypeProtos.OAIProvenance oaiProvenance) {
+		final OAIProvenance entity = new OAIProvenance();
+		entity.setOriginDescription(mapOriginalDescription(oaiProvenance.getOriginDescription()));
+		return entity;
+	}
+
+	public static OriginDescription mapOriginalDescription(
+		FieldTypeProtos.OAIProvenance.OriginDescription originDescription) {
+		final OriginDescription originDescriptionResult = new OriginDescription();
+		originDescriptionResult.setHarvestDate(originDescription.getHarvestDate());
+		originDescriptionResult.setAltered(originDescription.getAltered());
+		originDescriptionResult.setBaseURL(originDescription.getBaseURL());
+		originDescriptionResult.setIdentifier(originDescription.getIdentifier());
+		originDescriptionResult.setDatestamp(originDescription.getDatestamp());
+		originDescriptionResult.setMetadataNamespace(originDescription.getMetadataNamespace());
+		return originDescriptionResult;
+	}
+
+	public static Field<String> mapStringField(FieldTypeProtos.StringField s) {
+		final Field<String> stringField = new Field<>();
+		stringField.setValue(s.getValue());
+		stringField.setDataInfo(mapDataInfo(s.getDataInfo()));
+		return stringField;
+	}
+
+	public static Field<Boolean> mapBoolField(FieldTypeProtos.BoolField b) {
+		final Field<Boolean> booleanField = new Field<>();
+		booleanField.setValue(b.getValue());
+		booleanField.setDataInfo(mapDataInfo(b.getDataInfo()));
+		return booleanField;
+	}
+
+	public static Field<Integer> mapIntField(FieldTypeProtos.IntField b) {
+		final Field<Integer> entity = new Field<>();
+		entity.setValue(b.getValue());
+		entity.setDataInfo(mapDataInfo(b.getDataInfo()));
+		return entity;
+	}
+
+	public static Journal mapJournal(FieldTypeProtos.Journal j) {
+		final Journal journal = new Journal();
+		journal.setConferencedate(j.getConferencedate());
+		journal.setConferenceplace(j.getConferenceplace());
+		journal.setEdition(j.getEdition());
+		journal.setEp(j.getEp());
+		journal.setIss(j.getIss());
+		journal.setIssnLinking(j.getIssnLinking());
+		journal.setIssnOnline(j.getIssnOnline());
+		journal.setIssnPrinted(j.getIssnPrinted());
+		journal.setName(j.getName());
+		journal.setSp(j.getSp());
+		journal.setVol(j.getVol());
+		journal.setDataInfo(mapDataInfo(j.getDataInfo()));
+		return journal;
+	}
+
+	public static Author mapAuthor(FieldTypeProtos.Author author) {
+		final Author entity = new Author();
+		entity.setFullname(author.getFullname());
+		entity.setName(author.getName());
+		entity.setSurname(author.getSurname());
+		entity.setRank(author.getRank());
+		entity
+			.setPid(
+				author
+					.getPidList()
+					.stream()
+					.map(
+						kv -> {
+							final StructuredProperty sp = new StructuredProperty();
+							sp.setValue(kv.getValue());
+							final Qualifier q = new Qualifier();
+							q.setClassid(kv.getKey());
+							q.setClassname(kv.getKey());
+							sp.setQualifier(q);
+							return sp;
+						})
+					.collect(Collectors.toList()));
+		entity
+			.setAffiliation(
+				author
+					.getAffiliationList()
+					.stream()
+					.map(ProtoConverter::mapStringField)
+					.collect(Collectors.toList()));
+		return entity;
+	}
+
+	public static GeoLocation mapGeolocation(ResultProtos.Result.GeoLocation geoLocation) {
+		final GeoLocation entity = new GeoLocation();
+		entity.setPoint(geoLocation.getPoint());
+		entity.setBox(geoLocation.getBox());
+		entity.setPlace(geoLocation.getPlace());
+		return entity;
+	}
+}

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/migration/TransformActions.java

@@ -0,0 +1,172 @@
+
+package eu.dnetlib.dhp.actionmanager.migration;
+
+import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
+import org.apache.spark.SparkConf;
+import org.apache.spark.api.java.JavaSparkContext;
+import org.apache.spark.sql.SparkSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import com.google.protobuf.InvalidProtocolBufferException;
+
+import eu.dnetlib.data.proto.OafProtos;
+import eu.dnetlib.dhp.application.ArgumentApplicationParser;
+import eu.dnetlib.dhp.schema.action.AtomicAction;
+import eu.dnetlib.dhp.schema.oaf.*;
+import eu.dnetlib.dhp.utils.ISLookupClientFactory;
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
+import scala.Tuple2;
+
+public class TransformActions implements Serializable {
+
+	private static final Logger log = LoggerFactory.getLogger(TransformActions.class);
+
+	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+	private static final String SEPARATOR = "/";
+
+	public static void main(String[] args) throws Exception {
+		final ArgumentApplicationParser parser = new ArgumentApplicationParser(
+			IOUtils
+				.toString(
+					MigrateActionSet.class
+						.getResourceAsStream(
+							"/eu/dnetlib/dhp/actionmanager/migration/transform_actionsets_parameters.json")));
+		parser.parseArgument(args);
+
+		Boolean isSparkSessionManaged = Optional
+			.ofNullable(parser.get("isSparkSessionManaged"))
+			.map(Boolean::valueOf)
+			.orElse(Boolean.TRUE);
+		log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
+
+		final String isLookupUrl = parser.get("isLookupUrl");
+		log.info("isLookupUrl: {}", isLookupUrl);
+
+		final String inputPaths = parser.get("inputPaths");
+
+		if (StringUtils.isBlank(inputPaths)) {
+			throw new RuntimeException("empty inputPaths");
+		}
+		log.info("inputPaths: {}", inputPaths);
+
+		final String targetBaseDir = getTargetBaseDir(isLookupUrl);
+
+		SparkConf conf = new SparkConf();
+
+		runWithSparkSession(
+			conf, isSparkSessionManaged, spark -> transformActions(inputPaths, targetBaseDir, spark));
+	}
+
+	private static void transformActions(String inputPaths, String targetBaseDir, SparkSession spark)
+		throws IOException {
+		final JavaSparkContext sc = JavaSparkContext.fromSparkContext(spark.sparkContext());
+		final FileSystem fs = FileSystem.get(spark.sparkContext().hadoopConfiguration());
+
+		for (String sourcePath : Lists.newArrayList(Splitter.on(",").split(inputPaths))) {
+
+			LinkedList<String> pathQ = Lists.newLinkedList(Splitter.on(SEPARATOR).split(sourcePath));
+
+			final String rawset = pathQ.pollLast();
+			final String actionSetDirectory = pathQ.pollLast();
+
+			final Path targetDirectory = new Path(targetBaseDir + SEPARATOR + actionSetDirectory + SEPARATOR + rawset);
+
+			if (fs.exists(targetDirectory)) {
+				log.info("found target directory '{}", targetDirectory);
+				fs.delete(targetDirectory, true);
+				log.info("deleted target directory '{}", targetDirectory);
+			}
+
+			log.info("transforming actions from '{}' to '{}'", sourcePath, targetDirectory);
+
+			sc
+				.sequenceFile(sourcePath, Text.class, Text.class)
+				.map(a -> eu.dnetlib.actionmanager.actions.AtomicAction.fromJSON(a._2().toString()))
+				.map(TransformActions::doTransform)
+				.filter(Objects::nonNull)
+				.mapToPair(
+					a -> new Tuple2<>(a.getClazz().toString(), OBJECT_MAPPER.writeValueAsString(a)))
+				.mapToPair(t -> new Tuple2(new Text(t._1()), new Text(t._2())))
+				.saveAsNewAPIHadoopFile(
+					targetDirectory.toString(),
+					Text.class,
+					Text.class,
+					SequenceFileOutputFormat.class,
+					sc.hadoopConfiguration());
+		}
+	}
+
+	private static AtomicAction doTransform(eu.dnetlib.actionmanager.actions.AtomicAction aa)
+		throws InvalidProtocolBufferException {
+
+		// dedup similarity relations had empty target value, don't migrate them
+		if (aa.getTargetValue().length == 0) {
+			return null;
+		}
+		final OafProtos.Oaf proto_oaf = OafProtos.Oaf.parseFrom(aa.getTargetValue());
+		final Oaf oaf = ProtoConverter.convert(proto_oaf);
+		switch (proto_oaf.getKind()) {
+			case entity:
+				switch (proto_oaf.getEntity().getType()) {
+					case datasource:
+						return new AtomicAction<>(Datasource.class, (Datasource) oaf);
+					case organization:
+						return new AtomicAction<>(Organization.class, (Organization) oaf);
+					case project:
+						return new AtomicAction<>(Project.class, (Project) oaf);
+					case result:
+						final String resulttypeid = proto_oaf
+							.getEntity()
+							.getResult()
+							.getMetadata()
+							.getResulttype()
+							.getClassid();
+						switch (resulttypeid) {
+							case "publication":
+								return new AtomicAction<>(Publication.class, (Publication) oaf);
+							case "software":
+								return new AtomicAction<>(Software.class, (Software) oaf);
+							case "other":
+								return new AtomicAction<>(OtherResearchProduct.class, (OtherResearchProduct) oaf);
+							case "dataset":
+								return new AtomicAction<>(Dataset.class, (Dataset) oaf);
+							default:
+								// can be an update, where the resulttype is not specified
+								return new AtomicAction<>(Result.class, (Result) oaf);
+						}
+					default:
+						throw new IllegalArgumentException(
+							"invalid entity type: " + proto_oaf.getEntity().getType());
+				}
+			case relation:
+				return new AtomicAction<>(Relation.class, (Relation) oaf);
+			default:
+				throw new IllegalArgumentException("invalid kind: " + proto_oaf.getKind());
+		}
+	}
+
+	private static String getTargetBaseDir(String isLookupUrl) throws ISLookUpException {
+		ISLookUpService isLookUp = ISLookupClientFactory.getLookUpService(isLookupUrl);
+		String XQUERY = "collection('/db/DRIVER/ServiceResources/ActionManagerServiceResourceType')//SERVICE_PROPERTIES/PROPERTY[@key = 'basePath']/@value/string()";
+		return isLookUp.getResourceProfileByQuery(XQUERY);
+	}
+}

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/partition/PartitionActionSetsByPayloadTypeJob.java

@@ -1,9 +1,13 @@
+
 package eu.dnetlib.dhp.actionmanager.partition;
 
-import eu.dnetlib.dhp.actionmanager.ISClient;
+import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
-import eu.dnetlib.dhp.common.HdfsSupport;
+import static org.apache.spark.sql.functions.*;
-import eu.dnetlib.dhp.actionmanager.promote.PromoteActionPayloadForGraphTableJob;
+
-import eu.dnetlib.dhp.application.ArgumentApplicationParser;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.io.Text;
 import org.apache.spark.SparkConf;
@@ -14,37 +18,47 @@ import org.apache.spark.sql.types.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
+import eu.dnetlib.dhp.actionmanager.ISClient;
-import java.util.Collections;
+import eu.dnetlib.dhp.actionmanager.promote.PromoteActionPayloadForGraphTableJob;
-import java.util.List;
+import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import java.util.Optional;
+import eu.dnetlib.dhp.common.HdfsSupport;
 
-import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
+/** Partitions given set of action sets by payload type. */
-import static org.apache.spark.sql.functions.*;
-
-/**
- * Partitions given set of action sets by payload type.
- */
 public class PartitionActionSetsByPayloadTypeJob {
 
 	private static final Logger logger = LoggerFactory.getLogger(PartitionActionSetsByPayloadTypeJob.class);
 
-    private static final StructType KV_SCHEMA = StructType$.MODULE$.apply(
+	private static final StructType KV_SCHEMA = StructType$.MODULE$
-            Arrays.asList(
+		.apply(
+			Arrays
+				.asList(
 					StructField$.MODULE$.apply("key", DataTypes.StringType, false, Metadata.empty()),
-                    StructField$.MODULE$.apply("value", DataTypes.StringType, false, Metadata.empty())
+					StructField$.MODULE$.apply("value", DataTypes.StringType, false, Metadata.empty())));
-            ));
 
-    private static final StructType ATOMIC_ACTION_SCHEMA = StructType$.MODULE$.apply(
+	private static final StructType ATOMIC_ACTION_SCHEMA = StructType$.MODULE$
-            Arrays.asList(
+		.apply(
+			Arrays
+				.asList(
 					StructField$.MODULE$.apply("clazz", DataTypes.StringType, false, Metadata.empty()),
-                    StructField$.MODULE$.apply("payload", DataTypes.StringType, false, Metadata.empty())
+					StructField$.MODULE$
-            ));
+						.apply(
+							"payload", DataTypes.StringType, false, Metadata.empty())));
+
+	private ISClient isClient;
+
+	public PartitionActionSetsByPayloadTypeJob(String isLookupUrl) {
+		this.isClient = new ISClient(isLookupUrl);
+	}
+
+	public PartitionActionSetsByPayloadTypeJob() {
+	}
 
 	public static void main(String[] args) throws Exception {
-        String jsonConfiguration = IOUtils.toString(
+		String jsonConfiguration = IOUtils
+			.toString(
 				PromoteActionPayloadForGraphTableJob.class
-                        .getResourceAsStream("/eu/dnetlib/dhp/actionmanager/partition/partition_action_sets_by_payload_type_input_parameters.json"));
+					.getResourceAsStream(
+						"/eu/dnetlib/dhp/actionmanager/partition/partition_action_sets_by_payload_type_input_parameters.json"));
 		final ArgumentApplicationParser parser = new ArgumentApplicationParser(jsonConfiguration);
 		parser.parseArgument(args);
 
@@ -63,62 +77,68 @@ public class PartitionActionSetsByPayloadTypeJob {
 		String isLookupUrl = parser.get("isLookupUrl");
 		logger.info("isLookupUrl: {}", isLookupUrl);
 
-        List<String> inputActionSetPaths = ISClient.getLatestRawsetPaths(isLookupUrl, inputActionSetIds);
+		new PartitionActionSetsByPayloadTypeJob(isLookupUrl)
+			.run(isSparkSessionManaged, inputActionSetIds, outputPath);
+	}
+
+	protected void run(Boolean isSparkSessionManaged, String inputActionSetIds, String outputPath) {
+
+		List<String> inputActionSetPaths = getIsClient().getLatestRawsetPaths(inputActionSetIds);
 		logger.info("inputActionSetPaths: {}", String.join(",", inputActionSetPaths));
 
 		SparkConf conf = new SparkConf();
 		conf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer");
 
-        runWithSparkSession(conf, isSparkSessionManaged,
+		runWithSparkSession(
+			conf,
+			isSparkSessionManaged,
 			spark -> {
 				removeOutputDir(spark, outputPath);
 				readAndWriteActionSetsFromPaths(spark, inputActionSetPaths, outputPath);
 			});
 	}
 
-    private static void removeOutputDir(SparkSession spark,
+	private static void removeOutputDir(SparkSession spark, String path) {
-                                        String path) {
 		HdfsSupport.remove(path, spark.sparkContext().hadoopConfiguration());
 	}
 
-    private static void readAndWriteActionSetsFromPaths(SparkSession spark,
+	private static void readAndWriteActionSetsFromPaths(
-                                                        List<String> inputActionSetPaths,
+		SparkSession spark, List<String> inputActionSetPaths, String outputPath) {
-                                                        String outputPath) {
 		inputActionSetPaths
-                .forEach(inputActionSetPath -> {
+			.stream()
+			.filter(path -> HdfsSupport.exists(path, spark.sparkContext().hadoopConfiguration()))
+			.forEach(
+				inputActionSetPath -> {
 					Dataset<Row> actionDS = readActionSetFromPath(spark, inputActionSetPath);
 					saveActions(actionDS, outputPath);
 				});
 	}
 
-    private static Dataset<Row> readActionSetFromPath(SparkSession spark,
+	private static Dataset<Row> readActionSetFromPath(SparkSession spark, String path) {
-                                                      String path) {
 		logger.info("Reading actions from path: {}", path);
 
-        List<String> files = HdfsSupport.listFiles(path, spark.sparkContext().hadoopConfiguration());
-        logger.info("Found files: {}", String.join(",", files));
-
 		JavaSparkContext sc = JavaSparkContext.fromSparkContext(spark.sparkContext());
-        return files
+
-                .stream()
-                .map(file -> {
 		JavaRDD<Row> rdd = sc
-                            .sequenceFile(file, Text.class, Text.class)
+			.sequenceFile(path, Text.class, Text.class)
 			.map(x -> RowFactory.create(x._1().toString(), x._2().toString()));
-                    return spark.createDataFrame(rdd, KV_SCHEMA)
+
+		return spark
+			.createDataFrame(rdd, KV_SCHEMA)
 			.withColumn("atomic_action", from_json(col("value"), ATOMIC_ACTION_SCHEMA))
 			.select(expr("atomic_action.*"));
-                })
-                .reduce(spark.createDataFrame(Collections.emptyList(), ATOMIC_ACTION_SCHEMA), Dataset::union);
 	}
 
-    private static void saveActions(Dataset<Row> actionDS,
+	private static void saveActions(Dataset<Row> actionDS, String path) {
-                                    String path) {
 		logger.info("Saving actions to path: {}", path);
-        actionDS
+		actionDS.write().partitionBy("clazz").mode(SaveMode.Append).parquet(path);
-                .write()
+	}
-                .partitionBy("clazz")
+
-                .mode(SaveMode.Append)
+	public ISClient getIsClient() {
-                .parquet(path);
+		return isClient;
+	}
+
+	public void setIsClient(ISClient isClient) {
+		this.isClient = isClient;
 	}
 }

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/MergeAndGet.java

@@ -1,17 +1,16 @@
+
 package eu.dnetlib.dhp.actionmanager.promote;
 
+import static eu.dnetlib.dhp.schema.common.ModelSupport.isSubClass;
+
+import java.util.function.BiFunction;
+
 import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.SerializableSupplier;
 import eu.dnetlib.dhp.schema.oaf.Oaf;
 import eu.dnetlib.dhp.schema.oaf.OafEntity;
 import eu.dnetlib.dhp.schema.oaf.Relation;
 
-import java.util.function.BiFunction;
+/** OAF model merging support. */
-
-import static eu.dnetlib.dhp.schema.common.ModelSupport.isSubClass;
-
-/**
- * OAF model merging support.
- */
 public class MergeAndGet {
 
 	private MergeAndGet() {
@@ -20,8 +19,8 @@ public class MergeAndGet {
 	/**
 	 * Strategy for merging OAF model objects.
 	 * <p>
-     * MERGE_FROM_AND_GET: use OAF 'mergeFrom' method
+	 * MERGE_FROM_AND_GET: use OAF 'mergeFrom' method SELECT_NEWER_AND_GET: use last update timestamp to return newer
-     * SELECT_NEWER_AND_GET: use last update timestamp to return newer instance
+	 * instance
 	 */
 	public enum Strategy {
 		MERGE_FROM_AND_GET, SELECT_NEWER_AND_GET
@@ -35,7 +34,8 @@ public class MergeAndGet {
 	 * @param <A> Action payload type
 	 * @return BiFunction to be used to merge OAF objects
 	 */
-    public static <G extends Oaf, A extends Oaf> SerializableSupplier<BiFunction<G, A, G>> functionFor(Strategy strategy) {
+	public static <G extends Oaf, A extends Oaf> SerializableSupplier<BiFunction<G, A, G>> functionFor(
+		Strategy strategy) {
 		switch (strategy) {
 			case MERGE_FROM_AND_GET:
 				return () -> MergeAndGet::mergeFromAndGet;
@@ -49,26 +49,39 @@ public class MergeAndGet {
 		if (isSubClass(x, Relation.class) && isSubClass(y, Relation.class)) {
 			((Relation) x).mergeFrom((Relation) y);
 			return x;
-        } else if (isSubClass(x, OafEntity.class) && isSubClass(y, OafEntity.class) && isSubClass(x, y)) {
+		} else if (isSubClass(x, OafEntity.class)
+			&& isSubClass(y, OafEntity.class)
+			&& isSubClass(x, y)) {
 			((OafEntity) x).mergeFrom((OafEntity) y);
 			return x;
 		}
-        throw new RuntimeException(String.format("MERGE_FROM_AND_GET incompatible types: %s, %s",
+		throw new RuntimeException(
+			String
+				.format(
+					"MERGE_FROM_AND_GET incompatible types: %s, %s",
 					x.getClass().getCanonicalName(), y.getClass().getCanonicalName()));
 	}
 
 	private static <G extends Oaf, A extends Oaf> G selectNewerAndGet(G x, A y) {
-        if (x.getClass().equals(y.getClass()) && x.getLastupdatetimestamp() > y.getLastupdatetimestamp()) {
+		if (x.getClass().equals(y.getClass())
+			&& x.getLastupdatetimestamp() > y.getLastupdatetimestamp()) {
 			return x;
-        } else if (x.getClass().equals(y.getClass()) && x.getLastupdatetimestamp() < y.getLastupdatetimestamp()) {
+		} else if (x.getClass().equals(y.getClass())
+			&& x.getLastupdatetimestamp() < y.getLastupdatetimestamp()) {
 			return (G) y;
 		} else if (isSubClass(x, y) && x.getLastupdatetimestamp() > y.getLastupdatetimestamp()) {
 			return x;
 		} else if (isSubClass(x, y) && x.getLastupdatetimestamp() < y.getLastupdatetimestamp()) {
-            throw new RuntimeException(String.format("SELECT_NEWER_AND_GET cannot return right type when it is not the same as left type: %s, %s",
+			throw new RuntimeException(
+				String
+					.format(
+						"SELECT_NEWER_AND_GET cannot return right type when it is not the same as left type: %s, %s",
 						x.getClass().getCanonicalName(), y.getClass().getCanonicalName()));
 		}
-        throw new RuntimeException(String.format("SELECT_NEWER_AND_GET cannot be used when left is not subtype of right: %s, %s",
+		throw new RuntimeException(
+			String
+				.format(
+					"SELECT_NEWER_AND_GET cannot be used when left is not subtype of right: %s, %s",
 					x.getClass().getCanonicalName(), y.getClass().getCanonicalName()));
 	}
 }

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadForGraphTableJob.java

@@ -1,11 +1,14 @@
+
 package eu.dnetlib.dhp.actionmanager.promote;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
-import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.SerializableSupplier;
+import static eu.dnetlib.dhp.schema.common.ModelSupport.isSubClass;
-import eu.dnetlib.dhp.common.HdfsSupport;
+
-import eu.dnetlib.dhp.application.ArgumentApplicationParser;
+import java.util.Objects;
-import eu.dnetlib.dhp.schema.common.ModelSupport;
+import java.util.Optional;
-import eu.dnetlib.dhp.schema.oaf.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.function.MapFunction;
@@ -16,26 +19,26 @@ import org.apache.spark.sql.SparkSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Objects;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 
-import static eu.dnetlib.dhp.schema.common.ModelSupport.isSubClass;
+import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
+import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.SerializableSupplier;
+import eu.dnetlib.dhp.common.HdfsSupport;
+import eu.dnetlib.dhp.schema.common.ModelSupport;
+import eu.dnetlib.dhp.schema.oaf.*;
 
-/**
+/** Applies a given action payload file to graph table of compatible type. */
- * Applies a given action payload file to graph table of compatible type.
- */
 public class PromoteActionPayloadForGraphTableJob {
 	private static final Logger logger = LoggerFactory.getLogger(PromoteActionPayloadForGraphTableJob.class);
 
 	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
 	public static void main(String[] args) throws Exception {
-        String jsonConfiguration = IOUtils.toString(
+		String jsonConfiguration = IOUtils
+			.toString(
 				PromoteActionPayloadForGraphTableJob.class
-                        .getResourceAsStream("/eu/dnetlib/dhp/actionmanager/promote/promote_action_payload_for_graph_table_input_parameters.json"));
+					.getResourceAsStream(
+						"/eu/dnetlib/dhp/actionmanager/promote/promote_action_payload_for_graph_table_input_parameters.json"));
 		final ArgumentApplicationParser parser = new ArgumentApplicationParser(jsonConfiguration);
 		parser.parseArgument(args);
 
@@ -72,10 +75,13 @@ public class PromoteActionPayloadForGraphTableJob {
 		conf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer");
 		conf.registerKryoClasses(ModelSupport.getOafModelClasses());
 
-        runWithSparkSession(conf, isSparkSessionManaged,
+		runWithSparkSession(
+			conf,
+			isSparkSessionManaged,
 			spark -> {
 				removeOutputDir(spark, outputGraphTablePath);
-                    promoteActionPayloadForGraphTable(spark,
+				promoteActionPayloadForGraphTable(
+					spark,
 					inputGraphTablePath,
 					inputActionPayloadPath,
 					outputGraphTablePath,
@@ -85,21 +91,23 @@ public class PromoteActionPayloadForGraphTableJob {
 			});
 	}
 
-    private static void throwIfGraphTableClassIsNotSubClassOfActionPayloadClass(Class<? extends Oaf> rowClazz,
+	private static void throwIfGraphTableClassIsNotSubClassOfActionPayloadClass(
-                                                                                Class<? extends Oaf> actionPayloadClazz) {
+		Class<? extends Oaf> rowClazz, Class<? extends Oaf> actionPayloadClazz) {
 		if (!isSubClass(rowClazz, actionPayloadClazz)) {
-            String msg = String.format("graph table class is not a subclass of action payload class: graph=%s, action=%s",
+			String msg = String
+				.format(
+					"graph table class is not a subclass of action payload class: graph=%s, action=%s",
 					rowClazz.getCanonicalName(), actionPayloadClazz.getCanonicalName());
 			throw new RuntimeException(msg);
 		}
 	}
 
-    private static void removeOutputDir(SparkSession spark,
+	private static void removeOutputDir(SparkSession spark, String path) {
-                                        String path) {
 		HdfsSupport.remove(path, spark.sparkContext().hadoopConfiguration());
 	}
 
-    private static <G extends Oaf, A extends Oaf> void promoteActionPayloadForGraphTable(SparkSession spark,
+	private static <G extends Oaf, A extends Oaf> void promoteActionPayloadForGraphTable(
+		SparkSession spark,
 		String inputGraphTablePath,
 		String inputActionPayloadPath,
 		String outputGraphTablePath,
@@ -109,42 +117,55 @@ public class PromoteActionPayloadForGraphTableJob {
 		Dataset<G> rowDS = readGraphTable(spark, inputGraphTablePath, rowClazz);
 		Dataset<A> actionPayloadDS = readActionPayload(spark, inputActionPayloadPath, actionPayloadClazz);
 
-        Dataset<G> result = promoteActionPayloadForGraphTable(rowDS, actionPayloadDS, strategy, rowClazz, actionPayloadClazz)
+		Dataset<G> result = promoteActionPayloadForGraphTable(
+			rowDS, actionPayloadDS, strategy, rowClazz, actionPayloadClazz)
 				.map((MapFunction<G, G>) value -> value, Encoders.bean(rowClazz));
 
 		saveGraphTable(result, outputGraphTablePath);
 	}
 
-    private static <G extends Oaf> Dataset<G> readGraphTable(SparkSession spark,
+	private static <G extends Oaf> Dataset<G> readGraphTable(
-                                                             String path,
+		SparkSession spark, String path, Class<G> rowClazz) {
-                                                             Class<G> rowClazz) {
 		logger.info("Reading graph table from path: {}", path);
+
 		return spark
 			.read()
-                .parquet(path)
+			.textFile(path)
-                .as(Encoders.bean(rowClazz));
+			.map(
+				(MapFunction<String, G>) value -> OBJECT_MAPPER.readValue(value, rowClazz),
+				Encoders.bean(rowClazz));
+
+		/*
+		 * return spark .read() .parquet(path) .as(Encoders.bean(rowClazz));
+		 */
 	}
 
-    private static <A extends Oaf> Dataset<A> readActionPayload(SparkSession spark,
+	private static <A extends Oaf> Dataset<A> readActionPayload(
-                                                                String path,
+		SparkSession spark, String path, Class<A> actionPayloadClazz) {
-                                                                Class<A> actionPayloadClazz) {
 		logger.info("Reading action payload from path: {}", path);
 		return spark
 			.read()
 			.parquet(path)
-                .map((MapFunction<Row, A>) value -> OBJECT_MAPPER.readValue(value.<String>getAs("payload"),
+			.map(
-                        actionPayloadClazz), Encoders.bean(actionPayloadClazz));
+				(MapFunction<Row, A>) value -> OBJECT_MAPPER
+					.readValue(value.<String> getAs("payload"), actionPayloadClazz),
+				Encoders.bean(actionPayloadClazz));
 	}
 
-    private static <G extends Oaf, A extends Oaf> Dataset<G> promoteActionPayloadForGraphTable(Dataset<G> rowDS,
+	private static <G extends Oaf, A extends Oaf> Dataset<G> promoteActionPayloadForGraphTable(
+		Dataset<G> rowDS,
 		Dataset<A> actionPayloadDS,
 		MergeAndGet.Strategy strategy,
 		Class<G> rowClazz,
 		Class<A> actionPayloadClazz) {
-        logger.info("Promoting action payload for graph table: payload={}, table={}", actionPayloadClazz.getSimpleName(), rowClazz.getSimpleName());
+		logger
+			.info(
+				"Promoting action payload for graph table: payload={}, table={}",
+				actionPayloadClazz.getSimpleName(),
+				rowClazz.getSimpleName());
 
-        SerializableSupplier<Function<G, String>> rowIdFn = PromoteActionPayloadForGraphTableJob::idFn;
+		SerializableSupplier<Function<G, String>> rowIdFn = ModelSupport::idFn;
-        SerializableSupplier<Function<A, String>> actionPayloadIdFn = PromoteActionPayloadForGraphTableJob::idFn;
+		SerializableSupplier<Function<A, String>> actionPayloadIdFn = ModelSupport::idFn;
 		SerializableSupplier<BiFunction<G, A, G>> mergeRowWithActionPayloadAndGetFn = MergeAndGet.functionFor(strategy);
 		SerializableSupplier<BiFunction<G, G, G>> mergeRowsAndGetFn = MergeAndGet.functionFor(strategy);
 		SerializableSupplier<G> zeroFn = zeroFn(rowClazz);
@@ -162,44 +183,7 @@ public class PromoteActionPayloadForGraphTableJob {
 
 		return PromoteActionPayloadFunctions
 			.groupGraphTableByIdAndMerge(
-                        joinedAndMerged,
+				joinedAndMerged, rowIdFn, mergeRowsAndGetFn, zeroFn, isNotZeroFn, rowClazz);
-                        rowIdFn,
-                        mergeRowsAndGetFn,
-                        zeroFn,
-                        isNotZeroFn,
-                        rowClazz);
-    }
-
-    private static <T extends Oaf> Function<T, String> idFn() {
-        return x -> {
-            if (isSubClass(x, Relation.class)) {
-                return idFnForRelation(x);
-            }
-            return idFnForOafEntity(x);
-        };
-    }
-
-    private static <T extends Oaf> String idFnForRelation(T t) {
-        Relation r = (Relation) t;
-        return Optional.ofNullable(r.getSource())
-                .map(source -> Optional.ofNullable(r.getTarget())
-                        .map(target -> Optional.ofNullable(r.getRelType())
-                                .map(relType -> Optional.ofNullable(r.getSubRelType())
-                                        .map(subRelType -> Optional.ofNullable(r.getRelClass())
-                                                .map(relClass -> String.join(source, target, relType, subRelType, relClass))
-                                                .orElse(String.join(source, target, relType, subRelType))
-                                        )
-                                        .orElse(String.join(source, target, relType))
-                                )
-                                .orElse(String.join(source, target))
-                        )
-                        .orElse(source)
-                )
-                .orElse(null);
-    }
-
-    private static <T extends Oaf> String idFnForOafEntity(T t) {
-        return ((OafEntity) t).getId();
 	}
 
 	private static <T extends Oaf> SerializableSupplier<T> zeroFn(Class<T> clazz) {
@@ -234,13 +218,8 @@ public class PromoteActionPayloadForGraphTableJob {
 		};
 	}
 
-    private static <G extends Oaf> void saveGraphTable(Dataset<G> result,
+	private static <G extends Oaf> void saveGraphTable(Dataset<G> result, String path) {
-                                                       String path) {
 		logger.info("Saving graph table to path: {}", path);
-        result
+		result.toJSON().write().option("compression", "gzip").text(path);
-                .toJSON()
-                .write()
-                .option("compression", "gzip")
-                .text(path);
 	}
 }