Merge pull request #48 from plantbreeding/develop

Release 0.52

Author: guydavenport

java/cli/src/main/java/org/brapi/schematools/cli/AbstractSubCommand.java

@@ -1,12 +1,14 @@
 package org.brapi.schematools.cli;
 
+import lombok.Getter;
 import org.brapi.schematools.core.response.Response;
 import picocli.CommandLine;
 
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Collection;
 
+@Getter
 public abstract class AbstractSubCommand implements Runnable {
 
     private PrintWriter err ;

java/cli/src/main/java/org/brapi/schematools/cli/ValidateSubCommand.java

@@ -48,23 +48,8 @@ private void printErrors(Response<List<BrAPIClass>> response) {
 
         response.getAllErrors().forEach(this::printError);
 
-        if (throwExceptionOnFail) {
+        if (isThrowExceptionOnFail()) {
             throw new BrAPICommandException(message, response.getAllErrors()) ;
         }
     }
-
-    private void printError(Response.Error error) {
-        switch (error.getType()) {
-
-            case VALIDATION -> {
-                System.err.print("Validation Error :");
-            }
-            case PERMISSION, OTHER -> {
-                System.err.print("Error :");
-            }
-        }
-        System.err.print('\t');
-
-        System.err.println(error.getMessage());
-    }
 }

java/core/src/main/java/org/brapi/schematools/core/ontmodel/options/OntModelGeneratorOptions.java

@@ -7,6 +7,7 @@
 import lombok.experimental.Accessors;
 import org.brapi.schematools.core.options.AbstractMainGeneratorOptions;
 import org.brapi.schematools.core.utils.ConfigurationUtils;
+import org.brapi.schematools.core.ontmodel.OntModelGenerator;
 
 import java.io.IOException;
 import java.io.InputStream;

java/core/src/main/java/org/brapi/schematools/core/options/PropertyOptions.java

@@ -70,7 +70,7 @@ public final boolean isLink() {
 
     /**
      * Gets if this property is used as a foreign key link between entities for a specific primary model. For example the id property (or field)
-     * name of Study, would be 'studyDbId' by default. Use {@link #setLinkFor(String, String)}
+     * name of Study, would be 'studyDbId' by default. Use {@link #setLinkFor(String, Boolean)}
      * to override this value.
      * @param name the name of the primary model
      * @return {@code true} if this property is used as a foreign key link between entities
@@ -83,7 +83,7 @@ public final boolean isLinkFor(String name) {
 
     /**
      * Gets if this property is used specific primary model. For example the id property (or field)
-     * name of Study, would be 'studyDbId' by default. Use {@link #setLinkFor(BrAPIType, String)}
+     * name of Study, would be 'studyDbId' by default. Use {@link #setLinkFor(BrAPIType, Boolean)}
      * to override this value.
      * @param type the primary model
      * @return {@code true} if this property is used as a foreign key link between entities

java/core/src/main/java/org/brapi/schematools/core/r/options/RGeneratorOptions.java

@@ -12,6 +12,7 @@
 import org.brapi.schematools.core.options.PropertiesOptions;
 import org.brapi.schematools.core.utils.ConfigurationUtils;
 import org.brapi.schematools.core.validiation.Validation;
+import org.brapi.schematools.core.r.RGenerator;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,7 +25,7 @@
 import static org.brapi.schematools.core.utils.StringUtils.toSingular;
 
 /**
- * Options for the {@link SQLGenerator}.
+ * Options for the {@link RGenerator}.
  */
 @Getter
 @Setter