From 9ae8d70bf404e74f3d988ff6f3c28fdc18485fa3 Mon Sep 17 00:00:00 2001 From: Michael Witting Date: Sat, 30 Apr 2022 15:11:37 +0200 Subject: [PATCH 01/14] Update MassBankRecordFormat.md --- Documentation/MassBankRecordFormat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/MassBankRecordFormat.md b/Documentation/MassBankRecordFormat.md index 678e9c51..e56ab2c6 100644 --- a/Documentation/MassBankRecordFormat.md +++ b/Documentation/MassBankRecordFormat.md @@ -2,6 +2,7 @@ MassBank Consortium (September 22, 2021) #### Updated +- **April 2022**: Added EAD (Electron Activated Dissocation) as allowed fragmentation mode. - **July 2021**: Move to a semantic versioning scheme X.Y.Z with Z increases for changes in the description or fixing of typos, Y increases for changes that also change the Validator software and X increases with changes that break compatibility with older versions of the software. - **March 2020**: Add new tag for the inlet type. - **October 2019**: Add UVPD dissociation method and some undocumented or new tags. @@ -843,6 +844,7 @@ MPD NETD SID UVPD +EAD ``` Cross-reference to HUPO-PSI: dissociation method [MS:1000044] From 4008ea01237dcb6be78edcbe2d76e70b3095646f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Fri, 17 Nov 2023 12:22:07 +0100 Subject: [PATCH 02/14] Bumped version number to 2.2.6-SNAPSHOT --- MassBank-Project/MassBank-OpenAPI/pom.xml | 2 +- MassBank-Project/MassBank-lib/pom.xml | 2 +- MassBank-Project/MassBank-web/pom.xml | 2 +- MassBank-Project/pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MassBank-Project/MassBank-OpenAPI/pom.xml b/MassBank-Project/MassBank-OpenAPI/pom.xml index 7576cd4e..87fc1a52 100644 --- a/MassBank-Project/MassBank-OpenAPI/pom.xml +++ b/MassBank-Project/MassBank-OpenAPI/pom.xml @@ -3,7 +3,7 @@ de.ipb-halle.msbi MassBank-Project - 2.2.5 + 2.2.6-SNAPSHOT MassBank-OpenAPI diff --git a/MassBank-Project/MassBank-lib/pom.xml b/MassBank-Project/MassBank-lib/pom.xml index d0887358..b9009251 100644 --- a/MassBank-Project/MassBank-lib/pom.xml +++ b/MassBank-Project/MassBank-lib/pom.xml @@ -5,7 +5,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.5 + 2.2.6-SNAPSHOT MassBank-lib diff --git a/MassBank-Project/MassBank-web/pom.xml b/MassBank-Project/MassBank-web/pom.xml index 8b8d8fe3..9caf7eec 100644 --- a/MassBank-Project/MassBank-web/pom.xml +++ b/MassBank-Project/MassBank-web/pom.xml @@ -3,7 +3,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.5 + 2.2.6-SNAPSHOT MassBank-web diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 008e4ee6..6ac69745 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.ipb-halle.msbi MassBank-Project - 2.2.5 + 2.2.6-SNAPSHOT MassBank-Project https://github.com/MassBank/MassBank-web pom @@ -41,7 +41,7 @@ 5.10.0 3.1.3 6.1.0 - 2023-11-17T12:13:33+01:00 + 2023-11-17T12:21:38+01:00 From 952cd7992f42713dce3cf7081684a28c95082953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Thu, 30 Nov 2023 09:07:06 +0100 Subject: [PATCH 03/14] Add a solution for https://github.com/MassBank/MassBank-data/issues/157. --- .../java/massbank/export/RecordToNIST_MSP.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/MassBank-Project/MassBank-lib/src/main/java/massbank/export/RecordToNIST_MSP.java b/MassBank-Project/MassBank-lib/src/main/java/massbank/export/RecordToNIST_MSP.java index 5a6f6028..07ccf4f0 100644 --- a/MassBank-Project/MassBank-lib/src/main/java/massbank/export/RecordToNIST_MSP.java +++ b/MassBank-Project/MassBank-lib/src/main/java/massbank/export/RecordToNIST_MSP.java @@ -127,12 +127,19 @@ public static String convert(Record record) { //Comments: "accession=ET010001" "author=R. Gulde, E. Schymanski, K. Fenner, Department of Environmental Chemistry, Eawag" "license=CC BY" "copyright=Copyright (C) 2016 Eawag, Duebendorf, Switzerland" "publication=Gulde, Meier, Schymanski, Kohler, Helbling, Derrer, Rentsch & Fenner; ES&T 2016 50(6):2908-2920. DOI: 10.1021/acs.est.5b05186. Systematic Exploration of Biotransformation Reactions of Amine-containing Micropollutants in Activated Sludge" "comment=CONFIDENCE Parent Substance with Reference Standard (Level 1)" "comment=INTERNAL_ID 100" "exact mass=300.1393" "instrument=Q Exactive Orbitrap Thermo Scientific" "instrument type=LC-ESI-QFT" "ms level=MS2" "ionization=ESI" "fragmentation mode=HCD" "collision energy=15, 30, 45, 60, 70 or 90 (nominal)" "resolution=17500" "column=Atlantis T3 3um, 3x150mm, Waters with guard column" "flow gradient=95/5 at 0 min, 5/95 at 15 min, 5/95 at 20 min, 95/5 at 20.1 min, 95/5 at 25 min" "flow rate=300 uL/min" "retention time=14.6 min" "solvent a=water with 0.1% formic acid" "solvent b=methanol with 0.1% formic acid" "precursor m/z=301.1466" "precursor type=[M+H]+" "ionization mode=positive" "mass accuracy=0.007810149499385606" "mass error=-2.351999967231677E-6" "SMILES=CN1CCN(CC1)C(C1=CC=CC=C1)C1=CC=C(Cl)C=C1" "cas=82-93-9" "pubchem cid=2710" "chemspider=2609" "InChI=InChI=1S/C18H21ClN2/c1-20-11-13-21(14-12-20)18(15-5-3-2-4-6-15)16-7-9-17(19)10-8-16/h2-10,18H,11-14H2,1H3" "InChIKey=WFNAKBGANONZEQ-UHFFFAOYSA-N" "molecular formula=C18H21ClN2" "total exact mass=300.13932635199996" "SMILES=CN1CCN(CC1)C(C2=CC=CC=C2)C3=CC=C(C=C3)Cl" sb.append("Splash: ").append(record.PK_SPLASH()).append(System.getProperty("line.separator")); - sb.append("Num Peaks: ").append(record.PK_NUM_PEAK()).append(System.getProperty("line.separator")); - for(Triple peak : record.PK_PEAK()){ - sb.append(peak.getLeft() + " " + peak.getRight()).append(System.getProperty("line.separator")); + // mz<1 needs to be prevented, check #157 + StringBuilder peaklist = new StringBuilder(); + int numPeaks = 0; + for(Triple peak : record.PK_PEAK()) { + if (peak.getLeft().compareTo(new BigDecimal(1)) >= 0) { + numPeaks++; + peaklist.append(peak.getLeft() + " " + peak.getRight()).append(System.getProperty("line.separator")); + } } - + sb.append("Num Peaks: ").append(numPeaks).append(System.getProperty("line.separator")); + sb.append(peaklist); + sb.append(System.getProperty("line.separator")); return sb.toString(); } From 583533081f6361700fc3d0984a4d8dab727e50df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Thu, 11 Apr 2024 09:51:55 +0200 Subject: [PATCH 04/14] Add MS5 and MSn as terms. --- .../src/main/java/massbank/RecordParserDefinition.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MassBank-Project/MassBank-lib/src/main/java/massbank/RecordParserDefinition.java b/MassBank-Project/MassBank-lib/src/main/java/massbank/RecordParserDefinition.java index f6ec1c87..bd08acb5 100644 --- a/MassBank-Project/MassBank-lib/src/main/java/massbank/RecordParserDefinition.java +++ b/MassBank-Project/MassBank-lib/src/main/java/massbank/RecordParserDefinition.java @@ -1187,7 +1187,9 @@ else if (ret == InchiStatus.ERROR) { // MS2 is the precursor ion spectrum of MS3 // IUPAC Recommendations 2006 (http://old.iupac.org/reports/provisional/abstract06/murray_prs.pdf) def("ac_mass_spectrometry_ms_type_value", - StringParser.of("MS4") + StringParser.of("MSn") + .or(StringParser.of("MS5")) + .or(StringParser.of("MS4")) .or(StringParser.of("MS3")) .or(StringParser.of("MS2")) .or(StringParser.of("MS")) From 57383622f09f1176e034a82040c00b1b6149686f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Thu, 11 Apr 2024 10:16:48 +0200 Subject: [PATCH 05/14] Update Apache Commons Configuration to fix some vulnerabilities. --- MassBank-Project/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 6ac69745..1afa74fd 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -80,7 +80,7 @@ org.apache.commons commons-configuration2 - 2.9.0 + 2.10.1 commons-cli From ef01f8e2ee8c70c32a8b13ac5677d1e6b448fa0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Thu, 11 Apr 2024 13:44:18 +0200 Subject: [PATCH 06/14] Update documentation of AC$MASS_SPECTROMETRY: MS_TYPE and finish #403 --- Documentation/MassBankRecordFormat.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/MassBankRecordFormat.md b/Documentation/MassBankRecordFormat.md index 21e8255e..6f80edfa 100644 --- a/Documentation/MassBankRecordFormat.md +++ b/Documentation/MassBankRecordFormat.md @@ -748,14 +748,15 @@ MS MS2 MS3 MS4 +MS5 +MSn ``` Brief definition of terms used in `MS_TYPE`: -* `MS2` is 1st generation product ion spectrum(of `MS`) -* `MS3` is 2nd generation product ion spectrum(of `MS`) -* `MS2` is the precursor ion spectrum of `MS3`* - -Reference: [IUPAC Recommendations 2006](http://old.iupac.org/reports/provisional/abstract06/murray_prs.pdf) +* `MS` - [MS1 spectrum(MS:1000579)](https://terminology.tib.eu/ts/ontologies/ms/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FMS_1000579) +* `MS2` - [MSn spectrum(MS:1000580)](https://terminology.tib.eu/ts/ontologies/ms/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FMS_1000580) +* `MS3` - [MSn spectrum(MS:1000580)](https://terminology.tib.eu/ts/ontologies/ms/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FMS_1000580) with [ms level(MS:1000511)](https://terminology.tib.eu/ts/ontologies/ms/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FMS_1000580) = 3 +* `MSn` - use for any other multi stage acquisition method, which does not fit in the above scheme, like merged MS spectra from different stages #### 2.4.4 AC$MASS\_SPECTROMETRY: ION\_MODE Polarity of Ion Detection. Mandatory From e337430bc4b9b62dc9428b34470d0c2fc8afcdea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Mon, 15 Apr 2024 09:38:54 +0200 Subject: [PATCH 07/14] Bumped version number to 2.2.6 --- MassBank-Project/MassBank-OpenAPI/pom.xml | 2 +- MassBank-Project/MassBank-lib/pom.xml | 2 +- MassBank-Project/MassBank-web/pom.xml | 2 +- MassBank-Project/pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MassBank-Project/MassBank-OpenAPI/pom.xml b/MassBank-Project/MassBank-OpenAPI/pom.xml index 87fc1a52..8382b8b7 100644 --- a/MassBank-Project/MassBank-OpenAPI/pom.xml +++ b/MassBank-Project/MassBank-OpenAPI/pom.xml @@ -3,7 +3,7 @@ de.ipb-halle.msbi MassBank-Project - 2.2.6-SNAPSHOT + 2.2.6 MassBank-OpenAPI diff --git a/MassBank-Project/MassBank-lib/pom.xml b/MassBank-Project/MassBank-lib/pom.xml index b9009251..54922272 100644 --- a/MassBank-Project/MassBank-lib/pom.xml +++ b/MassBank-Project/MassBank-lib/pom.xml @@ -5,7 +5,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.6-SNAPSHOT + 2.2.6 MassBank-lib diff --git a/MassBank-Project/MassBank-web/pom.xml b/MassBank-Project/MassBank-web/pom.xml index 9caf7eec..a28fe498 100644 --- a/MassBank-Project/MassBank-web/pom.xml +++ b/MassBank-Project/MassBank-web/pom.xml @@ -3,7 +3,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.6-SNAPSHOT + 2.2.6 MassBank-web diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 1afa74fd..278ea313 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.ipb-halle.msbi MassBank-Project - 2.2.6-SNAPSHOT + 2.2.6 MassBank-Project https://github.com/MassBank/MassBank-web pom @@ -41,7 +41,7 @@ 5.10.0 3.1.3 6.1.0 - 2023-11-17T12:21:38+01:00 + 2024-04-15T09:38:07+02:00 From 26096f005213d1b1b2785f1cd0eff17ee21ba2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Mon, 15 Apr 2024 10:16:07 +0200 Subject: [PATCH 08/14] Bumped version number to 2.2.6-SNAPSHOT --- MassBank-Project/MassBank-OpenAPI/pom.xml | 2 +- MassBank-Project/MassBank-lib/pom.xml | 2 +- MassBank-Project/MassBank-web/pom.xml | 2 +- MassBank-Project/pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MassBank-Project/MassBank-OpenAPI/pom.xml b/MassBank-Project/MassBank-OpenAPI/pom.xml index 8382b8b7..87fc1a52 100644 --- a/MassBank-Project/MassBank-OpenAPI/pom.xml +++ b/MassBank-Project/MassBank-OpenAPI/pom.xml @@ -3,7 +3,7 @@ de.ipb-halle.msbi MassBank-Project - 2.2.6 + 2.2.6-SNAPSHOT MassBank-OpenAPI diff --git a/MassBank-Project/MassBank-lib/pom.xml b/MassBank-Project/MassBank-lib/pom.xml index 54922272..b9009251 100644 --- a/MassBank-Project/MassBank-lib/pom.xml +++ b/MassBank-Project/MassBank-lib/pom.xml @@ -5,7 +5,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.6 + 2.2.6-SNAPSHOT MassBank-lib diff --git a/MassBank-Project/MassBank-web/pom.xml b/MassBank-Project/MassBank-web/pom.xml index a28fe498..9caf7eec 100644 --- a/MassBank-Project/MassBank-web/pom.xml +++ b/MassBank-Project/MassBank-web/pom.xml @@ -3,7 +3,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.6 + 2.2.6-SNAPSHOT MassBank-web diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 278ea313..1103e5a1 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.ipb-halle.msbi MassBank-Project - 2.2.6 + 2.2.6-SNAPSHOT MassBank-Project https://github.com/MassBank/MassBank-web pom @@ -41,7 +41,7 @@ 5.10.0 3.1.3 6.1.0 - 2024-04-15T09:38:07+02:00 + 2024-04-15T10:15:34+02:00 From c7f3bde66998af65b5244d7e3e5e078fbb3737b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Mon, 15 Apr 2024 13:31:09 +0200 Subject: [PATCH 09/14] Switch to public maven repo from uni jena --- MassBank-Project/.mvn/local-settings.xml | 13 ------------- MassBank-Project/.mvn/maven.config | 1 - MassBank-Project/pom.xml | 5 +++-- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 MassBank-Project/.mvn/local-settings.xml delete mode 100644 MassBank-Project/.mvn/maven.config diff --git a/MassBank-Project/.mvn/local-settings.xml b/MassBank-Project/.mvn/local-settings.xml deleted file mode 100644 index 87ca09b8..00000000 --- a/MassBank-Project/.mvn/local-settings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - releases-http-unblocker - Fiehnlab Public Maven Repository - releases - http://gose.fiehnlab.ucdavis.edu:55000/content/groups/public - false - - - \ No newline at end of file diff --git a/MassBank-Project/.mvn/maven.config b/MassBank-Project/.mvn/maven.config deleted file mode 100644 index 27145948..00000000 --- a/MassBank-Project/.mvn/maven.config +++ /dev/null @@ -1 +0,0 @@ ---settings .mvn/local-settings.xml diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 1103e5a1..985f9e68 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -318,8 +318,9 @@ releases - Fiehnlab Public Maven Repository - http://gose.fiehnlab.ucdavis.edu:55000/content/groups/public + Jena Bio Repository libs-release-oss + https://bio.informatik.uni-jena.de/repository/libs-release-oss + From dfd0181774ce9d491256fb41c49d464b2dc8f6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Thu, 18 Apr 2024 14:59:02 +0200 Subject: [PATCH 10/14] Remove API stub. MassBank3 API is more advanced --- MassBank-Project/MassBank-OpenAPI/LICENSE.txt | 339 ------------------ MassBank-Project/MassBank-OpenAPI/generate.sh | 3 - .../openapi-generator-config.json | 15 - MassBank-Project/MassBank-OpenAPI/pom.xml | 123 ------- .../java/massbank/RecordSearchParser.java | 9 - .../RecordSearchParserDefinition.java | 125 ------- .../openapi/api/RecordApiDelegateImpl.java | 49 --- .../src/main/resources/application.properties | 1 - .../src/main/resources/openapi.yaml | 273 -------------- 9 files changed, 937 deletions(-) delete mode 100644 MassBank-Project/MassBank-OpenAPI/LICENSE.txt delete mode 100644 MassBank-Project/MassBank-OpenAPI/generate.sh delete mode 100644 MassBank-Project/MassBank-OpenAPI/openapi-generator-config.json delete mode 100644 MassBank-Project/MassBank-OpenAPI/pom.xml delete mode 100644 MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/RecordSearchParser.java delete mode 100644 MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/RecordSearchParserDefinition.java delete mode 100644 MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/openapi/api/RecordApiDelegateImpl.java delete mode 100644 MassBank-Project/MassBank-OpenAPI/src/main/resources/application.properties delete mode 100644 MassBank-Project/MassBank-OpenAPI/src/main/resources/openapi.yaml diff --git a/MassBank-Project/MassBank-OpenAPI/LICENSE.txt b/MassBank-Project/MassBank-OpenAPI/LICENSE.txt deleted file mode 100644 index d511905c..00000000 --- a/MassBank-Project/MassBank-OpenAPI/LICENSE.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - 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 -this service 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. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE 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. - - 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 -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 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 General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/MassBank-Project/MassBank-OpenAPI/generate.sh b/MassBank-Project/MassBank-OpenAPI/generate.sh deleted file mode 100644 index 761d1987..00000000 --- a/MassBank-Project/MassBank-OpenAPI/generate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -#wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.4.0/openapi-generator-cli-5.4.0.jar -O openapi-generator-cli.jar -java -jar openapi-generator-cli.jar generate -g spring -i src/main/resources/openapi.yaml -c openapi-generator-config.json -o ../spring-boot-codegenerator diff --git a/MassBank-Project/MassBank-OpenAPI/openapi-generator-config.json b/MassBank-Project/MassBank-OpenAPI/openapi-generator-config.json deleted file mode 100644 index e3268e11..00000000 --- a/MassBank-Project/MassBank-OpenAPI/openapi-generator-config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "basePackage": "massbank.openapi", - "configPackage": "massbank.openapi.config", - "apiPackage": "massbank.openapi.api", - "modelPackage": "massbank.openapi.model", - "parentArtifactId": "MassBank-Project", - "parentGroupId": "de.ipb-halle.msbi", - "parentVersion": "2.1.11-SNAPSHOT", - "artifactId": "MassBank-OpenAPI", - "groupId": "de.ipb-halle.msbi", - "artifactVersion": "2.1.11-SNAPSHOT", - "delegatePattern": true - -} - diff --git a/MassBank-Project/MassBank-OpenAPI/pom.xml b/MassBank-Project/MassBank-OpenAPI/pom.xml deleted file mode 100644 index 87fc1a52..00000000 --- a/MassBank-Project/MassBank-OpenAPI/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - 4.0.0 - - de.ipb-halle.msbi - MassBank-Project - 2.2.6-SNAPSHOT - - - MassBank-OpenAPI - jar - - MassBank OpenAPI REST interface - - - ${project.basedir}/src/main/resources/openapi.yaml - 1.7.0 - - - - - - org.openapitools - openapi-generator-maven-plugin - - - - generate - - - ${yaml.file} - spring - - massbank.openapi - massbank.openapi.config - massbank.openapi.api - massbank.openapi.model - true - true - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - - - - de.ipb-halle.msbi - MassBank-lib - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.data - spring-data-commons - - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - - org.springframework.boot - spring-boot-starter-validation - - - com.fasterxml.jackson.core - jackson-databind - - - org.springframework.boot - spring-boot-devtools - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - diff --git a/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/RecordSearchParser.java b/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/RecordSearchParser.java deleted file mode 100644 index 5fbdf7f4..00000000 --- a/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/RecordSearchParser.java +++ /dev/null @@ -1,9 +0,0 @@ -package massbank; - -import org.petitparser.tools.GrammarParser; - -public class RecordSearchParser extends GrammarParser { - public RecordSearchParser() { - super(new RecordSearchParserDefinition()); - } -} \ No newline at end of file diff --git a/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/RecordSearchParserDefinition.java b/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/RecordSearchParserDefinition.java deleted file mode 100644 index b8eba1e3..00000000 --- a/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/RecordSearchParserDefinition.java +++ /dev/null @@ -1,125 +0,0 @@ -package massbank; - -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.petitparser.parser.primitive.CharacterParser; -import org.petitparser.parser.primitive.StringParser; -import org.petitparser.tools.GrammarDefinition; - -public class RecordSearchParserDefinition extends GrammarDefinition { - private static final Logger logger = LogManager.getLogger(RecordSearchParserDefinition.class); - - public RecordSearchParserDefinition() { - def("start", - ref("name") - .map((List value) -> { - System.out.println(value); - return value; - }) - .end() - ); - - //Comparison operators in FIQL notation or alternative notation: - //Equal to : == - def("eq", StringParser.of("==")); - //Not equal to : != - def("ne", StringParser.of("!=")); - //Less than : =lt= - def("lt", StringParser.of("=lt=").or(StringParser.of("<"))); - //Less than or equal to : =le= - def("le", StringParser.of("=le=").or(StringParser.of("<="))); - //Greater than operator : =gt= - def("gt", StringParser.of("=gt=").or(StringParser.of(">"))); - //Greater than or equal to : =ge= - def("ge", StringParser.of("=ge=").or(StringParser.of(">="))); - //In : =in= - def("in", StringParser.of("=in=")); - //Not in : =out= - def("out", StringParser.of("=out=")); - - - def("input", - StringParser.of("ACCESSION") - ); - - def("constraint", - - StringParser.of("ACCESSION") - ); - - - def("comparison", - ref("selector") - .seq(ref("comparison-op")) - .seq(ref("arguments")) - ); - - def("selector", - ref("unreserved-str") - ); - - def("comparison-op", - ref("comp-fiql") - .or(ref("comp-alt")) - ); - - def("name", - StringParser.of("name") - .seq(ref("eq")) - .seq(ref("value")) - ); - - def("value", - ref("unreserved-str") - .or(ref("double-quoted")) - //.or(ref("single-quoted")) - - ); - def("unreserved-str", - CharacterParser.noneOf("\"\'();, ").plus().flatten() - .map((List value) -> { - System.out.println("unreserved-str"); - System.out.println(value); - return value; - }) - ); - def("double-quoted", - CharacterParser.of('"') - .seq( - CharacterParser.noneOf("\\\"") - .or(StringParser.of("\\\"")) - .or(StringParser.of("\\\\")) - .star().flatten() - ) - .seq(CharacterParser.of('"')) - .map((List value) -> { - System.out.println("double-quoted"); - System.out.println(value); - return value; - }) - ); - - } -} - - -//input = or, EOF; -//or = and, { "," , and }; -//and = constraint, { ";" , constraint }; -//constraint = ( group | comparison ); -//group = "(", or, ")"; - - -//arguments = ( "(", value, { "," , value }, ")" ) | value; -//unreserved-str = unreserved, { unreserved } -//single-quoted = "'", { ( escaped | all-chars - ( "'" | "\" ) ) }, "'"; -//double-quoted = '"', { ( escaped | all-chars - ( '"' | "\" ) ) }, '"'; -// -//reserved = '"' | "'" | "(" | ")" | ";" | "," | "=" | "!" | "~" | "<" | ">"; -//unreserved = all-chars - reserved - " "; -//escaped = "\", all-chars; -//all-chars = ? all unicode characters ?; - - diff --git a/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/openapi/api/RecordApiDelegateImpl.java b/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/openapi/api/RecordApiDelegateImpl.java deleted file mode 100644 index fa0c682f..00000000 --- a/MassBank-Project/MassBank-OpenAPI/src/main/java/massbank/openapi/api/RecordApiDelegateImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package massbank.openapi.api; - -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - -import massbank.Record; -import massbank.db.DatabaseManager; - -/** - * A delegate to be called by the {@link RecordApiController}}. - * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. - */ -@Service -public class RecordApiDelegateImpl implements RecordApiDelegate { - /** - * GET /record/{recordId} : Returns the content of one record - * Returns the content of the record in MassBank format - * - * @param recordId The record id (required) - * @return successful operation (status code 200) - * or The record with the recordId was not found (status code 404) - * or There was in internal error during database access (status code 500) - * @see RecordApi#getRecord - */ - public ResponseEntity getRecord(String recordId) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf(""))) { - String exampleString = ""; - ApiUtil.setExampleResponse(request, "", exampleString); - break; - } - } - }); - Record record = null; - // load record from database - record = DatabaseManager.getAccessionData(recordId); - if (record == null) { - return new ResponseEntity<>("Record \"" + recordId + "\" not found", HttpStatus.NOT_FOUND); - } - String recordstring = record.toString(); - return new ResponseEntity<>(recordstring, HttpStatus.OK); - } - -} - - diff --git a/MassBank-Project/MassBank-OpenAPI/src/main/resources/application.properties b/MassBank-Project/MassBank-OpenAPI/src/main/resources/application.properties deleted file mode 100644 index 4ef5c891..00000000 --- a/MassBank-Project/MassBank-OpenAPI/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -server.port = 8081 diff --git a/MassBank-Project/MassBank-OpenAPI/src/main/resources/openapi.yaml b/MassBank-Project/MassBank-OpenAPI/src/main/resources/openapi.yaml deleted file mode 100644 index 3101771c..00000000 --- a/MassBank-Project/MassBank-OpenAPI/src/main/resources/openapi.yaml +++ /dev/null @@ -1,273 +0,0 @@ -openapi: 3.0.3 -info: - title: MassBank-OpenAPI - description: This is the MassBank REST API - version: "0.0.1" - termsOfService: 'https://massbank.eu' - contact: - email: denbi-mash@ipb-halle.de - license: - name: GPL - url: http://www.gnu.org/licenses/gpl-3.0 - -servers: - - url: https://msbi.ipb-halle.de/MassBank-OpenAPI/ - description: dev server - - url: http://localhost:8080/MassBank-OpenAPI - description: local dev server - -tags: - - name: record - description: Add and Search records - -components: - securitySchemes: - changeBearerAuth: - type: http - scheme: bearer - bearerFormat: JWT #JSON Web Token - responses: - UnauthorizedError: - description: Access token is missing or invalid - ForbiddenError: - description: Access token does not allow the operation - NotFoundError: - description: The record with the recordId was not found - DatabaseError: - description: There was in internal error during database access - SyntaxError: - description: The record or query was invalid - content: - application/json: - schema: - type: string - description: error message - example: "The value for ACCESSION is not valid." - schemas: - record: - type: string - description: a full massBank record file as a string - example: | - ACCESSION: UPA00001 - RECORD_TITLE: FLAVOXATE; ESI-QTOF; MS2; CE 23 eV; [M+H]+ - DATE: 2016.01.19 (Created 2015.06.23) - AUTHORS: K. Wilkinson, S. Miranda - LICENSE: CC BY - COPYRIGHT: UPAO - COMMENT: This spectrum was obtained at The Multidisciplinary Research Laboratory at Antenor Orrego Private University, Trujillo, La Libertad, Peru.The sample was obtained from a pharmacy. The sample was dissolved in 1:1 acetonitrile:water and infused at a rate of 10 uL/min. - COMMENT: Contact us: http://www.upao.edu.pe/labinm/ - CH$NAME: FLAVOXATE - CH$COMPOUND_CLASS: Non-Natural Product - CH$FORMULA: C24H25NO4 - CH$EXACT_MASS: 391.17836 - CH$SMILES: C(C4)CCN(C4)CCOC(=O)c(c3)c(O1)c(cc3)C(=O)C(C)=C(c(c2)cccc2)1 - CH$IUPAC: InChI=1S/C24H25NO4/c1-17-21(26)19-11-8-12-20(23(19)29-22(17)18-9-4-2-5-10-18)24(27)28-16-15-25-13-6-3-7-14-25/h2,4-5,8-12H,3,6-7,13-16H2,1H3 - CH$LINK: CAS 15301-69-6 - CH$LINK: CHEBI 5088 - CH$LINK: CHEMSPIDER 3237 - CH$LINK: INCHIKEY SPIUTQOUKAMGCX-UHFFFAOYSA-N - CH$LINK: COMPTOX DTXSID3023053 - CH$LINK: PUBCHEM CID:3354 - AC$INSTRUMENT: Xevo G2 XS QTOF waters - AC$INSTRUMENT_TYPE: ESI-QTOF - AC$MASS_SPECTROMETRY: MS_TYPE MS2 - AC$MASS_SPECTROMETRY: ION_MODE POSITIVE - AC$MASS_SPECTROMETRY: COLLISION_ENERGY 23 eV - AC$MASS_SPECTROMETRY: DESOLVATION_GAS_FLOW 600 L/h - AC$MASS_SPECTROMETRY: DESOLVATION_TEMPERATURE 300 C - AC$MASS_SPECTROMETRY: IONIZATION ESI - MS$FOCUSED_ION: PRECURSOR_M/Z 392.18563 - MS$FOCUSED_ION: PRECURSOR_TYPE [M+H]+ - MS$DATA_PROCESSING: FIND_PEAK centroid - MS$DATA_PROCESSING: WHOLE Mass++ 2.7.5 - PK$SPLASH: splash10-03di-0958000000-36f8ecae0c5b45da3a93 - PK$ANNOTATION: m/z tentative_formula formula_count mass error(ppm) - 105.0704 C8H9+ 1 105.0704 0.24 - 112.1128 C7H14N+ 1 112.1126 -1.57 - 119.0860 C9H11+ 1 119.0861 0.63 - 147.0082 C8H3O3+ 1 147.0082 0.13 - 199.1345 C11H19O3+ 1 199.1334 -5.43 - 263.0709 C17H11O3+ 1 263.0708 -0.31 - 272.1635 C17H22NO2+ 1 272.1651 5.71 - 295.1947 C20H25NO+ 1 295.1936 -3.68 - 307.0971 C19H15O4+ 1 307.0970 -0.22 - 310.1708 C24H22+ 1 310.1722 4.35 - 392.1862 C24H26NO4+ 1 392.1862 -0.04 - PK$NUM_PEAK: 26 - PK$PEAK: m/z int. rel.int. - 105.0704 338200 14 - 112.1128 23870000 999 - 119.0860 118500 5 - 131.0021 378500 16 - 139.0336 258400 11 - 147.0082 1529000 64 - 191.0311 107900 5 - 198.1268 120200 5 - 199.1345 265600 11 - 203.0231 139600 6 - 236.1349 133000 6 - 250.1505 376400 16 - 258.1478 278600 12 - 263.0709 14100000 590 - 272.1635 643600 27 - 272.6651 112700 5 - 295.1947 281100 12 - 307.0971 14130000 591 - 310.1708 139300 6 - 323.2260 1326000 55 - 324.2293 135500 6 - 341.2370 153000 6 - 341.3050 274800 12 - 392.1862 9717000 407 - 392.2480 125800 5 - 392.2755 107100 4 - // - recordId: - type: string - description: a massBank id - example: "PR030008" - -paths: - /record: - post: - summary: Uploads a record to the database - description: Uploads a new record to the massBank database if the ACCESSION in the record is unique - operationId: postRecord - tags: - - record - security: - - changeBearerAuth: [] - responses: - 201: - description: Created a new record - headers: - Location: - schema: - type: string - format: url - example: 'https://msbi.ipb-halle.de/MassBank-OpenAPI/record/PR030008' - 401: - $ref: '#/components/responses/UnauthorizedError' - 403: - $ref: '#/components/responses/ForbiddenError' - 409: - description: Could not insert dataset, because it already exists - 400: - $ref: '#/components/responses/SyntaxError' - 500: - $ref: '#/components/responses/DatabaseError' - requestBody: - required: true - content: - text/plain: - schema: - '$ref': '#/components/schemas/record' - - get: - summary: Returns all records matching the search - description: This resource reports all record ids which fulfill the criteria in the search parameters, - or all records if the query parameters are missing or empty - operationId: getRecordsIds - tags: - - record - parameters: - - in: query - name: name - schema: - type: string - example: '*nicotine*' - description: Search records with the specified string in RECORD_TITLE or CH$NAME. - - in: query - name: formula - schema: - type: string - example: 'C9H15NO3S' - description: Search records with the specified formula CH$FORMULA. - responses: - '200': - description: successful operation - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/recordId' - 400: - $ref: '#/components/responses/SyntaxError' - 500: - $ref: '#/components/responses/DatabaseError' - - /record/{recordId}: - parameters: - - in: path - name: recordId - required: true - schema: - $ref: '#/components/schemas/recordId' - description: The record id - get: - summary: Returns the content of one record - description: Returns the content of the record in MassBank format - operationId: getRecord - tags: - - record - responses: - 200: - description: successful operation - content: - text/plain; charset=utf-8: - schema: - '$ref': '#/components/schemas/record' - 404: - $ref: '#/components/responses/NotFoundError' - 500: - $ref: '#/components/responses/DatabaseError' - put: - summary: replace a record - description: replaces the record in with the specified id by a new record, which must have the same ACCESSION - operationId: replaceRecord - security: - - changeBearerAuth: [] - tags: - - record - requestBody: - content: - text/plain: - schema: - $ref: '#/components/schemas/record' - responses: - 204: - description: the record was successfully replaced - 400: - $ref: '#/components/responses/SyntaxError' - 401: - $ref: '#/components/responses/UnauthorizedError' - 403: - $ref: '#/components/responses/ForbiddenError' - 404: - $ref: '#/components/responses/NotFoundError' - 500: - $ref: '#/components/responses/DatabaseError' - delete: - summary: delete a record - description: deletes the record with the specified id from the massBank database - operationId: deleteRecord - security: - - changeBearerAuth: [] - tags: - - record - responses: - 204: - description: the record was successfully deleted - 401: - $ref: '#/components/responses/UnauthorizedError' - 403: - $ref: '#/components/responses/ForbiddenError' - 404: - $ref: '#/components/responses/NotFoundError' - 500: - $ref: '#/components/responses/DatabaseError' - - - - From f82993bc973df8fb6dc33ec15f22f6844b538956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meier?= Date: Thu, 18 Apr 2024 14:59:28 +0200 Subject: [PATCH 11/14] Update deps --- MassBank-Project/pom.xml | 42 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 985f9e68..e89801db 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -11,7 +11,6 @@ MassBank-lib MassBank-web - MassBank-OpenAPI @@ -30,17 +29,6 @@ UTF-8 ${project.version} - 2.9 - 3.2.0 - 2.3.1 - 2.35 - 2.13.2 - 9.4.24.v20191120 - 1.2.8 - 1.7.36 - 5.10.0 - 3.1.3 - 6.1.0 2024-04-15T10:15:34+02:00 @@ -65,7 +53,7 @@ commons-io commons-io - 2.13.0 + 2.16.1 commons-fileupload @@ -75,7 +63,7 @@ org.apache.commons commons-lang3 - 3.13.0 + 3.14.0 org.apache.commons @@ -85,7 +73,7 @@ commons-cli commons-cli - 1.5.0 + 1.7.0 commons-beanutils @@ -95,7 +83,7 @@ org.openscience.cdk cdk-bundle - ${cdk.version} + 2.9 xml-apis @@ -106,12 +94,12 @@ org.mariadb.jdbc mariadb-java-client - ${jdbc.version} + 3.2.0 com.github.petitparser petitparser-core - ${petitparser-version} + 2.4.0 edu.ucdavis.fiehnlab.splash @@ -136,17 +124,17 @@ io.github.dan2097 jna-inchi-all - 1.2 + 1.2.1 org.junit.jupiter junit-jupiter-engine - ${junit-version} + 5.10.2 com.zaxxer HikariCP - 5.0.1 + 5.1.0 @@ -300,16 +288,6 @@ spdx-maven-plugin 0.6.5 - - org.openapitools - openapi-generator-maven-plugin - 6.6.0 - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - @@ -317,7 +295,7 @@ - releases + Jena-Bio Jena Bio Repository libs-release-oss https://bio.informatik.uni-jena.de/repository/libs-release-oss From 9163a7ff33d3cfa2a6c4febf097db7ddd8820bb5 Mon Sep 17 00:00:00 2001 From: Rene Meier Date: Mon, 6 May 2024 10:57:10 +0200 Subject: [PATCH 12/14] Add EAD to AC$MASS_SPECTROMETRY: FRAGMENTATION_MODE --- .../src/main/java/massbank/RecordParserDefinition.java | 1 + 1 file changed, 1 insertion(+) diff --git a/MassBank-Project/MassBank-lib/src/main/java/massbank/RecordParserDefinition.java b/MassBank-Project/MassBank-lib/src/main/java/massbank/RecordParserDefinition.java index bd08acb5..cb371c13 100644 --- a/MassBank-Project/MassBank-lib/src/main/java/massbank/RecordParserDefinition.java +++ b/MassBank-Project/MassBank-lib/src/main/java/massbank/RecordParserDefinition.java @@ -1364,6 +1364,7 @@ else if (ret == InchiStatus.ERROR) { .or(StringParser.of("HCD")) .or(StringParser.of("LOW-ENERGY CID")) .or(StringParser.of("RID")) + .or(StringParser.of("EAD")) ) ) ) From 788660c0b1b76d66fef530313a83a9dd9da13f11 Mon Sep 17 00:00:00 2001 From: Rene Meier Date: Tue, 4 Jun 2024 14:01:55 +0200 Subject: [PATCH 13/14] Bumped version number to 2.2.7-SNAPSHOT --- MassBank-Project/MassBank-lib/pom.xml | 2 +- MassBank-Project/MassBank-web/pom.xml | 2 +- MassBank-Project/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MassBank-Project/MassBank-lib/pom.xml b/MassBank-Project/MassBank-lib/pom.xml index b9009251..2427b7e1 100644 --- a/MassBank-Project/MassBank-lib/pom.xml +++ b/MassBank-Project/MassBank-lib/pom.xml @@ -5,7 +5,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.6-SNAPSHOT + 2.2.7-SNAPSHOT MassBank-lib diff --git a/MassBank-Project/MassBank-web/pom.xml b/MassBank-Project/MassBank-web/pom.xml index 9caf7eec..750499f7 100644 --- a/MassBank-Project/MassBank-web/pom.xml +++ b/MassBank-Project/MassBank-web/pom.xml @@ -3,7 +3,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.6-SNAPSHOT + 2.2.7-SNAPSHOT MassBank-web diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index e89801db..9a756e73 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.ipb-halle.msbi MassBank-Project - 2.2.6-SNAPSHOT + 2.2.7-SNAPSHOT MassBank-Project https://github.com/MassBank/MassBank-web pom @@ -29,7 +29,7 @@ UTF-8 ${project.version} - 2024-04-15T10:15:34+02:00 + 2024-06-04T11:27:37+02:00 From 2c604f62316b5190d8e22c02fc336b04149b21f5 Mon Sep 17 00:00:00 2001 From: Rene Meier Date: Tue, 4 Jun 2024 14:10:28 +0200 Subject: [PATCH 14/14] Bumped version number to 2.2.7 --- MassBank-Project/MassBank-lib/pom.xml | 2 +- MassBank-Project/MassBank-web/pom.xml | 2 +- MassBank-Project/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MassBank-Project/MassBank-lib/pom.xml b/MassBank-Project/MassBank-lib/pom.xml index 2427b7e1..a06914f3 100644 --- a/MassBank-Project/MassBank-lib/pom.xml +++ b/MassBank-Project/MassBank-lib/pom.xml @@ -5,7 +5,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.7-SNAPSHOT + 2.2.7 MassBank-lib diff --git a/MassBank-Project/MassBank-web/pom.xml b/MassBank-Project/MassBank-web/pom.xml index 750499f7..7d8750d1 100644 --- a/MassBank-Project/MassBank-web/pom.xml +++ b/MassBank-Project/MassBank-web/pom.xml @@ -3,7 +3,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.7-SNAPSHOT + 2.2.7 MassBank-web diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 9a756e73..5a8c529d 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.ipb-halle.msbi MassBank-Project - 2.2.7-SNAPSHOT + 2.2.7 MassBank-Project https://github.com/MassBank/MassBank-web pom @@ -29,7 +29,7 @@ UTF-8 ${project.version} - 2024-06-04T11:27:37+02:00 + 2024-06-04T14:10:11+02:00