Skip to content

Commit

Permalink
Reformat using editorconfig-maven-plugin (#1997)
Browse files Browse the repository at this point in the history
Execute "mvn editorconfig:format".
  • Loading branch information
dr0i committed May 23, 2024
1 parent 71e7c63 commit 07a7382
Show file tree
Hide file tree
Showing 63 changed files with 792 additions and 792 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ No third-party beneficiary rights are created under this Agreement.

Exhibit A - Form of Secondary Licenses Notice

"This Source Code may also be made available under the following
Secondary Licenses when the conditions for such availability set forth
"This Source Code may also be made available under the following
Secondary Licenses when the conditions for such availability set forth
in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
version(s), and exceptions or additional permissions here}."

Expand Down
2 changes: 1 addition & 1 deletion scripts/getAllData.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ while [ $HITS != 0 ] ; do
curl --globoff --header "Accept-Encoding: gzip" "http://lobid.org/resources/search?q=describedBy.dateCreated:[$FROM%20TO%20$TO]&format=bulk" > $FROM-$TO.jsonl.gz
GOT_HITS=$(zcat $FROM-$TO.jsonl.gz |wc -l)
echo "Got hits ($GOT_HITS), expected ($HITS)"
if [ $HITS != $GOT_HITS ]; then
if [ $HITS != $GOT_HITS ]; then
echo "Got lesser hits than expected - cancelling !"
echo "Wait a bit and set FROM manually to retry beginning with '$FROM'."
exit
Expand Down
14 changes: 7 additions & 7 deletions settings.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<settings>
<mirrors>
<mirrors>
<!-- This is a workaround for non-existing repos that are pulled in by
some transitive dependencies. This causes long delays when trying to connect to the
repos. To fix that, we define trvis-ci-central as a mirror of the missing repos.
We also define travis-ci-central as a mirror of central to speed up Travis builds.
This file has to be in $M2_HOME/conf/settings.xml or ${user.home}/.m2/settings.xml -->
<mirror>
<id>central</id>
<url>http://repo1.maven.org</url>
<mirrorOf>jena-repo,fascinator-releases</mirrorOf>
</mirror>
</mirrors>
<mirror>
<id>central</id>
<url>http://repo1.maven.org</url>
<mirrorOf>jena-repo,fascinator-releases</mirrorOf>
</mirror>
</mirrors>
</settings>

4 changes: 2 additions & 2 deletions src/main/java/de/hbz/lobid/helper/CompareJsonMaps.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* values must be in the given order, so this tests also ordered lists.
* Successfully compared elements will be removed from the actual map, thus a
* successful comparison leads to an empty 'actual' map (see last line).
*
*
* @author Pascal Christoph (dr0i)
* @author Jan Schnasse
*
Expand Down Expand Up @@ -139,7 +139,7 @@ private static void handleOrderedValues(
/**
* Construct a map with json paths as keys with aggregated values form json
* nodes.
*
*
* @param jnode the JsonNode which should be transformed into a map
* @param map the map constructed out of the JsonNode
*/
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/de/hbz/lobid/helper/Email.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
/**
* Sends an email via localhost smtp. Make sure the server is configured
* properly.
*
*
* @author Pascal Christoph (dr0i)
*
*/
public class Email {

/**
* Sends an email.
*
*
* @author Pascal Christoph (dr0i)
*
*
* @param fromName the name before the "@" of an email
* @param toEmail the complete email address of the receiver
* @param subject the subject of the mail
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/de/hbz/lobid/helper/Etikett.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

/**
* This class is used in ApplicationProfile
*
*
* @author Jan Schnasse
*
*/
Expand All @@ -38,7 +38,7 @@ public Etikett(String subj) {
}

/**
*
*
*/
private static final long serialVersionUID = 6716611400533458082L;

Expand Down
18 changes: 9 additions & 9 deletions src/main/java/org/lobid/resources/EtikettJson.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* Enriches a JSON document using Etikett. Thus every's object "id" will have a
* "label". Optionally creates a JSON-LD context from the labels.
*
*
* @author Pascal Christoph (dr0i)
*/
@In(String.class)
Expand Down Expand Up @@ -111,39 +111,39 @@ else if (jsonMap.get(key) instanceof LinkedHashMap)
/**
* Sets the name of the directory of the label(s). Will be used to create
* jsonld-context.
*
*
* @param DIR_TO_LABELS the directory ehre the labels reside
*
*
*/
public void setLabelsDirectoryName(final String DIR_TO_LABELS) {
this.labelsDirectoryName = DIR_TO_LABELS;
}

/**
* Sets the name of the file of the context that is generated from the labels.
*
*
* @param FILENAME_OF_CONTEXT the directory wehre the labels reside
*
*
*/
public void setFilenameOfContext(final String FILENAME_OF_CONTEXT) {
contextFilenameLocation = FILENAME_OF_CONTEXT;
}

/**
* Generate the context from labels and store it.
*
*
* @param GENERATE_CONTEXT if true generate the context. Defaults to false.
*
*
*/
public void setGenerateContext(final boolean GENERATE_CONTEXT) {
generateContext = GENERATE_CONTEXT;
}

/**
* Result pretty json or jsonl (json in one line). Defaults to jsonl.
*
*
* @param PRETTY if true pretty json is generated
*
*
*/
public void setPretty(final boolean PRETTY) {
pretty = PRETTY;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/lobid/resources/JsonLdEtikett.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

/**
* Enrich a JSON-LD map document with etikett.
*
*
* @author Pascal Christoph (dr0i)
*/
@In(Map.class)
Expand All @@ -46,7 +46,7 @@ public JsonLdEtikett() {
/**
* Takes a filename which could be a directory to create the context jsonld
* out of labels.
*
*
* @param LABELS_DIRECTORY_FILENAME the name of the labels firectory or file
* @param CONTEXT_LOCATION_FILENAME the filename of the to be produced and to
* be stored context
Expand Down Expand Up @@ -104,7 +104,7 @@ else if (jsonMap.get(key) instanceof LinkedHashMap)
/**
* Gets the name of the directory of the label(s). Will be used to create
* jsonld-context.
*
*
* @return the directory name to the label(s)
*/
public static String getLabelsDirectoryName() {
Expand All @@ -113,7 +113,7 @@ public static String getLabelsDirectoryName() {

/**
* Gets the filename of the context.
*
*
* @return the filename to the context
*/
public String getContextName() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

/**
* Splits a lobid resource into items and make them consumable by elasticsearch.
*
*
* @author Pascal Christoph (dr0i)
*/
@In(HashMap.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void run() {
fixVariables.put("dnbSachgruppen", "./maps/dnbSachgruppen.tsv");
fixVariables.put("maps-institutions.tsv", "./maps/institutions.tsv");
fixVariables.put("sublibraryIsil", "../../../../../../lookup-tables/data/almaSublibraryCode2Isil/generated/generatedAlmaSublibraryCode2Isil.tsv");
fixVariables.put("suppressedLocations", "../../../../../../lookup-tables/data/almaSuppressedLocations/generated/generatedAlmaSuppressedLocations.tsv");
fixVariables.put("suppressedLocations", "../../../../../../lookup-tables/data/almaSuppressedLocations/generated/generatedAlmaSuppressedLocations.tsv");
fixVariables.put("picaCreatorId2Isil.tsv", "./maps/picaCreatorId2Isil.tsv");
fixVariables.put("nwbibWikidataLabelTypeCoords.tsv", "./maps/nwbibWikidataLabelTypeCoords.tsv");
fixVariables.put("classification.tsv", "./maps/classification.tsv");
Expand All @@ -133,11 +133,11 @@ public void run() {
fixVariables.put("nwbib.ttl", "../../../../../../vocabs/nwbib/nwbib.ttl");
fixVariables.put("nwbib-spatial.ttl", "../../../../../../vocabs/nwbib/nwbib-spatial.ttl");
fixVariables.put("hbzId2zdbId.tsv", "./maps/hbzId2zdbId.tsv.gz");
fixVariables.put("isil2opac_hbzId.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_hbzId.tsv");
fixVariables.put("isil2opac_isbn.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_isbn.tsv");
fixVariables.put("isil2opac_issn.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_issn.tsv");
fixVariables.put("isil2opac_hbzId.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_hbzId.tsv");
fixVariables.put("isil2opac_isbn.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_isbn.tsv");
fixVariables.put("isil2opac_issn.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_issn.tsv");
fixVariables.put("isil2opac_zdbId.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_zdbId.tsv");
fixVariables.put("isil2opac_almaMmsId.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_almaMmsId.tsv");
fixVariables.put("isil2opac_almaMmsId.tsv", "../../../../../../lookup-tables/data/opacLinks/isil2opac_almaMmsId.tsv");


XmlElementSplitter xmlElementSplitter = new XmlElementSplitter();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* the productive index aliased to 'staging'. If a sanity check is successful
* the index alias "almaresources-staging" is switched to the alias name
* "almaresources" and vice versa.
*
*
* @author Pascal Christoph (dr0i)
*
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/lobid/resources/run/UpdateAliases.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* "[resources|geo_nwbib]" and vice versa. Also writes an email using
* {@link de.hbz.lobid.helper.Email} to write an email to the address given by
* the java system property 'emailTo'.
*
*
* @author Pascal Christoph (dr0i)
*
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/alma/fix/contribution.fix
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ do list(path:"700[01] ", "var":"$i")
# dateOfBirthAndDeath #will be split on a later stage
unless exists("$i.d.1")
copy_field("$i.d","contribution[].$last.agent.dateOfBirthAndDeath")
end
end
call_macro("alternateGraphicRepresationArrayOfObjects",targetArray:"contribution[]",targetField:".agent",variable:"$i")
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/alma/fix/mediumAndType.fix
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ elsif any_match("@leaderTyp+008", "(Map|Visual materials)(.{29})[dr].*") # Pos2
elsif any_match("@leaderTyp+008", "Map.*")
unless any_match("337.b","c") # add medium "print" if map is non-electronic (337b code b computermedia)
add_field("medium[].$append.label","Print")
end
end
# elsif any_match("@leaderTyp+008", "(Visual materials)(.{33})b.*") # Pos33 I excluded Kit
# add_field("medium[].$append.label","Print")
elsif any_match("006", "[acdpst]](.{5})[dr].*") # Pos00+06 Added Print for pos 006.
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/alma/maps/dnbSachgruppen.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,4 @@ S Schulbücher
788.96 Kornett
788.97 Flügelhorn
788.98 Tuba
788.99 andere Blechblasinstrumente
788.99 andere Blechblasinstrumente
2 changes: 1 addition & 1 deletion src/main/resources/alma/maps/hbzowner2sigel.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -926,4 +926,4 @@ A2301 HBZ60 82/791 AC: LDZ Labordiagnostisches Zentrum, Bibliothek NULL 4371
K1192 HBZ60 38/440 K: ZADIK Zentralarchiv für Deutsche und Internationale Kunstmarktforschung ZADIK NULL 4372
M1226 HBZ60 6/339 MS: Bibl. CRS und ZIT Gemeinsame Bibliothek des Centrums für Religionsbezogene Studien (CRS) und des Zentrums für Islamische Theologie (ZIT) 2 NULL 4374
BDA01 EDK50 2187 AC: Diözesanarchiv Bischöfliches Diözesanarchiv Aachen NULL 4375
A2302 HBZ60 82/792 AC: UB Exmed. Institut für Experimentelle Innere Medizin und Systembiologie, Bibliothek NULL 4376
A2302 HBZ60 82/792 AC: UB Exmed. Institut für Experimentelle Innere Medizin und Systembiologie, Bibliothek NULL 4376
Loading

0 comments on commit 07a7382

Please sign in to comment.