etf-validator/governance#70

jonherrmann · May 24, 2022 · e6ad8d7 · e6ad8d7
1 parent 72051a0
commit e6ad8d7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -16,4 +16,4 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Execute Gradle build
-        run: ./gradlew build
+        run: ./gradlew war
diff --git a/etf-bsxds/src/main/java/de/interactive_instruments/etf/dal/dao/basex/BsxDataStorage.java b/etf-bsxds/src/main/java/de/interactive_instruments/etf/dal/dao/basex/BsxDataStorage.java
@@ -34,7 +34,6 @@
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 
-import de.interactive_instruments.exceptions.config.InvalidPropertyException;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.description.modifier.Visibility;
 import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
@@ -82,6 +81,7 @@
 import de.interactive_instruments.etf.model.EidSet;
 import de.interactive_instruments.exceptions.*;
 import de.interactive_instruments.exceptions.config.ConfigurationException;
+import de.interactive_instruments.exceptions.config.InvalidPropertyException;
 import de.interactive_instruments.exceptions.config.MissingPropertyException;
 import de.interactive_instruments.io.MultiFileFilter;
 import de.interactive_instruments.properties.ConfigProperties;
@@ -484,7 +484,7 @@ private void resetTestRunDatabases() {
         int maxSize;
         try {
             maxSize = this.configProperties.getPropertyOrDefaultAsInt(
-                ETF_PK_PREFIX+"internal.database.recovery.max", 20);
+                    ETF_PK_PREFIX + "internal.database.recovery.max", 20);
         } catch (InvalidPropertyException e) {
             maxSize = 20;
         }

diff --git a/...rc/main/java/de/interactive_instruments/etf/component/loaders/AbstractItemFileLoader.java b/...rc/main/java/de/interactive_instruments/etf/component/loaders/AbstractItemFileLoader.java
@@ -79,7 +79,7 @@ private void changeUnresolvedToResolved(final Dto item) {
         this.resolvedDependencies.add(item);
         // re-lookup required
         final EidHolderMap<? extends Dto> resolvedDeps = this.registry.lookupDependency(
-            this.resolvedDependencies.keySet(), this);
+                this.resolvedDependencies.keySet(), this);
         this.unresolvedDependencies.removeAll(resolvedDeps.keySet());
         this.resolvedDependencies.putAll(resolvedDeps);
     }
@@ -292,18 +292,18 @@ public void release() {
     public int compareTo(final ItemFileLoaderFactory.FileChangeListener o) {
         final AbstractItemFileLoader<?> otherFileLoader = (AbstractItemFileLoader<?>) o;
         // 0 if objects are identical
-        if(this==o) {
+        if (this == o) {
             return 0;
         }
         // Compare priorities
         final int prioCmp = Integer.compare(this.priority, otherFileLoader.priority);
         if (prioCmp == 0) {
             final int depsCmp = Integer.compare(
-                unresolvedDependencies.size(),
-                otherFileLoader.unresolvedDependencies.size());
-            if(depsCmp!=0) {
+                    unresolvedDependencies.size(),
+                    otherFileLoader.unresolvedDependencies.size());
+            if (depsCmp != 0) {
                 return depsCmp;
-            }else{
+            } else {
                 // Compare target files
                 final int f = this.file.compareTo(otherFileLoader.file);
                 return Integer.compare(f, 0);

diff --git a/...i/src/main/java/de/interactive_instruments/etf/component/loaders/DefaultItemRegistry.java b/...i/src/main/java/de/interactive_instruments/etf/component/loaders/DefaultItemRegistry.java
@@ -337,8 +337,8 @@ public EidHolderMap<? extends Dto> lookup(final Collection<EID> ids) throws Obje
 
     SortedSet<EID> unresolvedIds() {
         final SortedSet<EID> unresolvedIds = new TreeSet<>();
-        for(final Map.Entry<EID, DependencyEntry> dep : entries.entrySet()) {
-            if(!dep.getValue().isResolved()) {
+        for (final Map.Entry<EID, DependencyEntry> dep : entries.entrySet()) {
+            if (!dep.getValue().isResolved()) {
                 unresolvedIds.add(dep.getKey());
             }
         }

diff --git a/etf-stdtot/src/main/java/de/interactive_instruments/etf/StdTestObjectTypes.java b/etf-stdtot/src/main/java/de/interactive_instruments/etf/StdTestObjectTypes.java
@@ -216,7 +216,8 @@ public class StdTestObjectTypes {
                     OGC_API_FEATURES_1_TOT.setDetectionExpression(
                             "$.conformsTo[?(@ =~ /http://www.opengis.net/spec/ogcapi---features-1/1.0.*/i )]",
                             ExpressionType.JSONPATH);
-                    // OGC_API_FEATURES_1_TOT.setDetectionExpression("$.conformsTo[?(@ =~ /http://www.opengis.net/spec/ogcapi-features-1/1.0.*/i )]", ExpressionType.JSONPATH);
+                    // OGC_API_FEATURES_1_TOT.setDetectionExpression("$.conformsTo[?(@ =~
+                    // /http://www.opengis.net/spec/ogcapi-features-1/1.0.*/i )]", ExpressionType.JSONPATH);
                     OGC_API_FEATURES_1_TOT.setLabelExpression("$.info.title", ExpressionType.JSONPATH);
                     OGC_API_FEATURES_1_TOT.setDescriptionExpression("$.info.description", ExpressionType.JSONPATH);
                     OGC_API_FEATURES_1_TOT.setUriDetectionExpression("\\/api");