Skip to content

Commit

Permalink
refactor: apply formatting rules
Browse files Browse the repository at this point in the history 
ING-4375
  • Loading branch information
@stempler
stempler committed Aug 16, 2024
1 parent f231b2d commit 6844c1a
Show file tree
Hide file tree
Showing 1,478 changed files with 9,369 additions and 11,667 deletions.
3 changes: 1 addition & 2 deletions ...plugins/eu.esdihumboldt.hale.app.cli/src/eu/esdihumboldt/hale/app/cli/CLIApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@

package eu.esdihumboldt.hale.app.cli;

import eu.esdihumboldt.util.cli.Runner;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;

import eu.esdihumboldt.util.cli.Runner;

/**
* CLI application.
*
Expand Down
3 changes: 1 addition & 2 deletions ...plugins/eu.esdihumboldt.hale.app.cli/src/eu/esdihumboldt/hale/app/cli/VersionCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@

package eu.esdihumboldt.hale.app.cli;

import java.util.List;

import eu.esdihumboldt.hale.common.core.HalePlatform;
import eu.esdihumboldt.util.cli.Command;
import eu.esdihumboldt.util.cli.CommandContext;
import java.util.List;

/**
* Command that prints the hale version.
Expand Down
6 changes: 3 additions & 3 deletions ...ihumboldt.hale.app.transform/src/eu/esdihumboldt/hale/app/transform/ConsoleConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ public interface ConsoleConstants {
* Prefix for messages on System out.
*/
public static final String MSG_PREFIX = "(I) ";

/**
* Prefix for status messages on System out.
*/
public static final String STATUS_PREFIX = "(S) ";

/**
* Prefix for warning messages on System out.
*/
public static final String WARN_PREFIX = "(W) ";

/**
* Prefix for error messages on System out.
*/
Expand Down
33 changes: 16 additions & 17 deletions ...ldt.hale.app.transform/src/eu/esdihumboldt/hale/app/transform/ConsoleProgressMonitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,52 +15,51 @@

package eu.esdihumboldt.hale.app.transform;

import com.google.common.base.Objects;
import java.text.MessageFormat;
import java.util.Date;

import org.eclipse.core.runtime.IProgressMonitor;

import com.google.common.base.Objects;

/**
* Progress monitor that gives status updates on the console.
*
* @author Simon Templer
*/
public class ConsoleProgressMonitor implements IProgressMonitor, ConsoleConstants {

private static final String PROG_PREFIX = MSG_PREFIX + "-- ";

private static final long TRIGGER_CLOCK_MS = 500;

private String mainTaskName;

private String currentTask;

private int totalWork;

private int worked = 0;

private boolean canceled = false;

private long lastTrigger = -1;

@Override
public void beginTask(String name, int totalWork) {
this.mainTaskName = name;
this.totalWork = totalWork;

// System.out.println(PROG_PREFIX + "Starting task: " + mainTaskName);
}

private void trigger(boolean force) {
long now = new Date().getTime();

if (force || lastTrigger < 0 || now - lastTrigger > TRIGGER_CLOCK_MS) {
if (totalWork > 0 && totalWork != UNKNOWN) {
System.out.println(PROG_PREFIX + MessageFormat.format((currentTask == null) ? ("{0} - {1,number,percent}")
: ("{0} - {1,number,percent} - {2}"), mainTaskName, (float) worked
/ (float) totalWork, currentTask));
System.out.println(PROG_PREFIX + MessageFormat.format(
(currentTask == null) ? ("{0} - {1,number,percent}")
: ("{0} - {1,number,percent} - {2}"),
mainTaskName, (float) worked / (float) totalWork, currentTask));
}
else {
if (currentTask != null) {
Expand All @@ -71,7 +70,7 @@ private void trigger(boolean force) {
System.out.println(PROG_PREFIX + mainTaskName);
}
}

lastTrigger = now;
}
}
Expand Down
13 changes: 5 additions & 8 deletions ...humboldt.hale.app.transform/src/eu/esdihumboldt/hale/app/transform/ExecApplication.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,17 @@ package eu.esdihumboldt.hale.app.transform;

import static eu.esdihumboldt.hale.app.transform.ExecUtil.*

import javax.xml.parsers.DocumentBuilderFactory

import org.eclipse.equinox.app.IApplicationContext
import org.w3c.dom.Document
import org.w3c.dom.Element
import org.xml.sax.SAXException

import eu.esdihumboldt.hale.common.app.AbstractApplication
import eu.esdihumboldt.hale.common.core.io.Value
import eu.esdihumboldt.hale.common.core.io.impl.ElementValue
import eu.esdihumboldt.hale.common.core.io.supplier.DefaultInputSupplier
import groovy.transform.CompileStatic
import groovy.transform.TypeCheckingMode
import javax.xml.parsers.DocumentBuilderFactory
import org.eclipse.equinox.app.IApplicationContext
import org.w3c.dom.Document
import org.w3c.dom.Element
import org.xml.sax.SAXException


/**
Expand Down Expand Up @@ -264,7 +262,6 @@ $baseCommand
file.eachLine { line -> args << line }
//recall processCommandLineArguments function with args file parameter.
processCommandLineArguments(args as String[] ,executionContext )

}


Expand Down
53 changes: 25 additions & 28 deletions ...umboldt.hale.app.transform/src/eu/esdihumboldt/hale/app/transform/ExecTransformation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,29 @@
import static eu.esdihumboldt.hale.app.transform.ExecUtil.status;
import static eu.esdihumboldt.hale.app.transform.ExecUtil.warn;

import com.google.common.util.concurrent.ListenableFuture;
import eu.esdihumboldt.hale.common.core.io.HaleIO;
import eu.esdihumboldt.hale.common.core.io.extension.IOProviderDescriptor;
import eu.esdihumboldt.hale.common.core.io.project.model.IOConfiguration;
import eu.esdihumboldt.hale.common.core.io.supplier.DefaultInputSupplier;
import eu.esdihumboldt.hale.common.core.io.supplier.FileIOSupplier;
import eu.esdihumboldt.hale.common.core.io.supplier.Locatable;
import eu.esdihumboldt.hale.common.core.io.supplier.LocatableInputSupplier;
import eu.esdihumboldt.hale.common.core.io.supplier.LocatableOutputSupplier;
import eu.esdihumboldt.hale.common.headless.impl.ProjectTransformationEnvironment;
import eu.esdihumboldt.hale.common.headless.transform.DefaultTransformationSettings;
import eu.esdihumboldt.hale.common.headless.transform.Transformation;
import eu.esdihumboldt.hale.common.headless.transform.TransformationSettings;
import eu.esdihumboldt.hale.common.instance.io.InstanceReader;
import eu.esdihumboldt.hale.common.instance.io.InstanceValidator;
import eu.esdihumboldt.hale.common.instance.io.InstanceWriter;
import eu.esdihumboldt.util.groovy.collector.StatsCollector;
import eu.esdihumboldt.util.groovy.sandbox.DefaultGroovyService;
import eu.esdihumboldt.util.groovy.sandbox.GroovyService;
import groovy.json.JsonOutput;
import groovy.lang.Binding;
import groovy.lang.GroovyShell;
import groovy.util.DelegatingScript;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
Expand All @@ -46,35 +69,9 @@
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ExecutionException;

import org.codehaus.groovy.control.CompilerConfiguration;
import org.eclipse.core.runtime.content.IContentType;

import com.google.common.util.concurrent.ListenableFuture;

import eu.esdihumboldt.hale.common.core.io.HaleIO;
import eu.esdihumboldt.hale.common.core.io.extension.IOProviderDescriptor;
import eu.esdihumboldt.hale.common.core.io.project.model.IOConfiguration;
import eu.esdihumboldt.hale.common.core.io.supplier.DefaultInputSupplier;
import eu.esdihumboldt.hale.common.core.io.supplier.FileIOSupplier;
import eu.esdihumboldt.hale.common.core.io.supplier.Locatable;
import eu.esdihumboldt.hale.common.core.io.supplier.LocatableInputSupplier;
import eu.esdihumboldt.hale.common.core.io.supplier.LocatableOutputSupplier;
import eu.esdihumboldt.hale.common.headless.impl.ProjectTransformationEnvironment;
import eu.esdihumboldt.hale.common.headless.transform.DefaultTransformationSettings;
import eu.esdihumboldt.hale.common.headless.transform.Transformation;
import eu.esdihumboldt.hale.common.headless.transform.TransformationSettings;
import eu.esdihumboldt.hale.common.instance.io.InstanceReader;
import eu.esdihumboldt.hale.common.instance.io.InstanceValidator;
import eu.esdihumboldt.hale.common.instance.io.InstanceWriter;
import eu.esdihumboldt.util.groovy.collector.StatsCollector;
import eu.esdihumboldt.util.groovy.sandbox.DefaultGroovyService;
import eu.esdihumboldt.util.groovy.sandbox.GroovyService;
import groovy.json.JsonOutput;
import groovy.lang.Binding;
import groovy.lang.GroovyShell;
import groovy.util.DelegatingScript;

/**
* Executes a transformation.
*
Expand Down Expand Up @@ -117,8 +114,8 @@ public DirVisitor(Path parentDir, List<String> includes, List<String> excludes)
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
throws IOException {
/*
* XXX currently cannot determine from the patterns if a directory
* should be inspected or not
* XXX currently cannot determine from the patterns if a directory should be
* inspected or not
*/
return FileVisitResult.CONTINUE;
}
Expand Down
34 changes: 16 additions & 18 deletions ...eu.esdihumboldt.hale.app.transform/src/eu/esdihumboldt/hale/app/transform/ExecUtil.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,21 @@

package eu.esdihumboldt.hale.app.transform

import eu.esdihumboldt.hale.common.core.report.Report
import groovy.transform.CompileStatic
import groovy.transform.TypeChecked
import groovy.transform.TypeCheckingMode
import org.joda.time.Period
import org.joda.time.format.PeriodFormat

import eu.esdihumboldt.hale.common.core.report.Report
import groovy.transform.CompileStatic;
import groovy.transform.TypeChecked;
import groovy.transform.TypeCheckingMode;

/**
* Utilities for console output.
*
* @author Simon Templer
*/
@TypeChecked
class ExecUtil implements ConsoleConstants {

static void printSummary(Report report) {
// print report summary
println "${MSG_PREFIX}Action summary: ${report.taskName}"
Expand All @@ -39,40 +38,39 @@ class ExecUtil implements ConsoleConstants {

// state success
print(report.isSuccess() ?
"${MSG_PREFIX} Completed" :
"${ERROR_PREFIX} Failed")
"${MSG_PREFIX} Completed" :
"${ERROR_PREFIX} Failed")

// add duration if applicable
if (report.startTime) {
def duration = PeriodFormat.wordBased().print(
new Period(report.startTime.time, report.timestamp.time))
print(report.isSuccess() ? ' in ' : ' after ')
new Period(report.startTime.time, report.timestamp.time))

print(report.isSuccess() ? ' in ' : ' after ')
print duration
}
// complete success line
println ''
}

static void info(String msg) {
println "${MSG_PREFIX}$msg"
}

static void warn(String msg) {
println "${WARN_PREFIX}$msg"
}

static void error(String msg) {
println "${ERROR_PREFIX}$msg"
}

static void status(String msg) {
println "${STATUS_PREFIX}$msg"
}

static IllegalStateException fail(String msg) {
error(msg)
throw new IllegalStateException(msg)
}

}
1 change: 0 additions & 1 deletion ...umboldt.hale.app.transform/src/eu/esdihumboldt/hale/app/transform/TransformCommand.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,4 @@ class TransformCommand implements Command {
}

final String shortDescription = 'Run a transformation based on a hale project'

}
16 changes: 7 additions & 9 deletions ...oldt.hale.app.transform/src/eu/esdihumboldt/hale/app/transform/TransformationReports.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@

package eu.esdihumboldt.hale.app.transform;

import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import javax.annotation.Nullable;

import eu.esdihumboldt.hale.common.core.report.Report;
import eu.esdihumboldt.hale.common.core.report.ReportHandler;
import eu.esdihumboldt.hale.common.core.report.util.StatisticsHelper;
import eu.esdihumboldt.hale.common.headless.report.ReportFile;
import eu.esdihumboldt.util.groovy.collector.StatsCollector;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nullable;

/**
* Transformation report handler.
Expand Down Expand Up @@ -57,8 +55,8 @@ public TransformationReports(@Nullable File reportFile) {
}

/**
* Create a report handler that collects the reports and in addition
* delegates to another report handler.
* Create a report handler that collects the reports and in addition delegates
* to another report handler.
*
* @param delegate the delegate report handler
*/
Expand Down
6 changes: 2 additions & 4 deletions ....align.groovy/src/eu/esdihumboldt/hale/common/align/groovy/accessor/EntityAccessor.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@

package eu.esdihumboldt.hale.common.align.groovy.accessor

import eu.esdihumboldt.hale.common.align.groovy.accessor.path.PathElement

import javax.xml.namespace.QName

import eu.esdihumboldt.hale.common.align.groovy.accessor.internal.EntityAccessorUtil
import eu.esdihumboldt.hale.common.align.groovy.accessor.path.PathElement
import eu.esdihumboldt.hale.common.align.io.impl.internal.generated.ChildContextType
import eu.esdihumboldt.hale.common.align.model.ChildContext
import eu.esdihumboldt.hale.common.align.model.Condition
Expand All @@ -40,6 +37,7 @@ import eu.esdihumboldt.util.groovy.paths.AbstractAccessor
import eu.esdihumboldt.util.groovy.paths.Path
import eu.esdihumboldt.util.groovy.paths.PathImpl
import groovy.transform.CompileStatic
import javax.xml.namespace.QName

/**
* Entity definition accessor.
Expand Down
Loading

0 comments on commit 6844c1a

Please sign in to comment.