Merge pull request #4 from codecentric/codecentric-refactoring

refactored all packages and set to new version 1.1.0

.github/workflows/maven.yml

@@ -0,0 +1,18 @@
+name: Maven Build
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+
+ - uses: actions/checkout@v2
+
+ - name: Set up JDK 11
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+
+ - name: Build with Maven
+ run: mvn -B install --no-transfer-progress --file pom.xml

.github/workflows/release-to-maven-central.yml

@@ -0,0 +1,56 @@
+name: release-to-maven-central
+on:
+ workflow_dispatch:
+ inputs:
+ releaseversion:
+ description: 'Release version'
+ required: true
+ default: '1.1.0'
+jobs:
+ publish:
+ runs-on: ubuntu-latest
+ steps:
+ - run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"
+
+ - uses: actions/checkout@v2
+
+ - name: Set up settings.xml for Maven Central Repository
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ server-id: oss.sonatype.org
+ server-username: MAVEN_USERNAME
+ server-password: MAVEN_PASSWORD
+ gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+ gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+ - name: Set projects Maven version to GitHub Action GUI set version
+ run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress
+
+ - name: Publish package
+ run: mvn --batch-mode clean deploy --no-transfer-progress -P central-deploy -DskipTests=true
+ env:
+ MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+ MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+
+ - name: Generate changelog
+ id: changelog
+ uses: metcalfc/[email protected]
+ with:
+ myToken: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Create GitHub Release
+ id: create_release
+ uses: actions/create-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ tag_name: ${{ github.event.inputs.releaseversion }}
+ release_name: ${{ github.event.inputs.releaseversion }}
+ body: |
+ Grab the new version from Maven central https://repo1.maven.org/maven2/de/codecentric/reedelk/reedelk-runtime/${{ github.event.inputs.releaseversion }}/
+ ### Things that changed in this release
+ ${{ steps.changelog.outputs.changelog }}
+ draft: false
+ prerelease: false

pom.xml

@@ -5,13 +5,13 @@
  <modelVersion>4.0.0</modelVersion>
 
  <parent>
- <groupId>com.reedelk</groupId>
+ <groupId>de.codecentric.reedelk</groupId>
  <artifactId>module-parent</artifactId>
- <version>1.0.6</version>
+ <version>1.1.0</version>
  </parent>
 
  <packaging>bundle</packaging>
- <version>1.0.6</version>
+ <version>1.1.0</version>
  <artifactId>module-database</artifactId>
 
  <properties>

src/main/java/de/codecentric/reedelk/database/ModuleDefinition.java

@@ -0,0 +1,8 @@
+package de.codecentric.reedelk.database;
+
+import de.codecentric.reedelk.runtime.api.annotation.Module;
+
+@Module("Database Module")
+public class ModuleDefinition {
+}
+

src/main/java/com/reedelk/database/component/ConnectionConfiguration.java → src/main/java/de/codecentric/reedelk/database/component/ConnectionConfiguration.java

@@ -1,8 +1,8 @@
-package com.reedelk.database.component;
+package de.codecentric.reedelk.database.component;
 
-import com.reedelk.database.internal.commons.DatabaseDriver;
-import com.reedelk.runtime.api.annotation.*;
-import com.reedelk.runtime.api.component.Implementor;
+import de.codecentric.reedelk.database.internal.commons.DatabaseDriver;
+import de.codecentric.reedelk.runtime.api.annotation.*;
+import de.codecentric.reedelk.runtime.api.component.Implementor;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ServiceScope;
 

src/main/java/com/reedelk/database/component/DDLExecute.java → src/main/java/de/codecentric/reedelk/database/component/DDLExecute.java

@@ -1,24 +1,24 @@
-package com.reedelk.database.component;
-
-import com.reedelk.database.internal.attribute.DDLExecuteAttributes;
-import com.reedelk.database.internal.commons.DataSourceService;
-import com.reedelk.database.internal.ddlexecute.DDLDefinitionStrategy;
-import com.reedelk.database.internal.ddlexecute.ExecutionStrategy;
-import com.reedelk.database.internal.ddlexecute.ExecutionStrategyBuilder;
-import com.reedelk.runtime.api.annotation.*;
-import com.reedelk.runtime.api.component.ProcessorSync;
-import com.reedelk.runtime.api.flow.FlowContext;
-import com.reedelk.runtime.api.message.Message;
-import com.reedelk.runtime.api.resource.ResourceText;
-import com.reedelk.runtime.api.script.ScriptEngineService;
-import com.reedelk.runtime.api.script.dynamicvalue.DynamicString;
+package de.codecentric.reedelk.database.component;
+
+import de.codecentric.reedelk.database.internal.attribute.DDLExecuteAttributes;
+import de.codecentric.reedelk.database.internal.commons.DataSourceService;
+import de.codecentric.reedelk.database.internal.ddlexecute.DDLDefinitionStrategy;
+import de.codecentric.reedelk.database.internal.ddlexecute.ExecutionStrategy;
+import de.codecentric.reedelk.database.internal.ddlexecute.ExecutionStrategyBuilder;
+import de.codecentric.reedelk.runtime.api.annotation.*;
+import de.codecentric.reedelk.runtime.api.component.ProcessorSync;
+import de.codecentric.reedelk.runtime.api.flow.FlowContext;
+import de.codecentric.reedelk.runtime.api.message.Message;
+import de.codecentric.reedelk.runtime.api.resource.ResourceText;
+import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
+import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicString;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ServiceScope;
 
 import javax.sql.DataSource;
 
-import static com.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotNull;
+import static de.codecentric.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotNull;
 
 @ModuleComponent("DDL Execute")
 @ComponentOutput(

src/main/java/com/reedelk/database/component/Delete.java → src/main/java/de/codecentric/reedelk/database/component/Delete.java

@@ -1,19 +1,19 @@
-package com.reedelk.database.component;
+package de.codecentric.reedelk.database.component;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
-import com.reedelk.database.internal.attribute.DatabaseAttributes;
-import com.reedelk.database.internal.commons.DataSourceService;
-import com.reedelk.database.internal.commons.DatabaseUtils;
-import com.reedelk.database.internal.commons.QueryStatementTemplate;
-import com.reedelk.database.internal.exception.DeleteException;
-import com.reedelk.runtime.api.annotation.*;
-import com.reedelk.runtime.api.component.ProcessorSync;
-import com.reedelk.runtime.api.flow.FlowContext;
-import com.reedelk.runtime.api.message.Message;
-import com.reedelk.runtime.api.message.MessageAttributes;
-import com.reedelk.runtime.api.message.MessageBuilder;
-import com.reedelk.runtime.api.script.ScriptEngineService;
-import com.reedelk.runtime.api.script.dynamicmap.DynamicObjectMap;
+import de.codecentric.reedelk.database.internal.attribute.DatabaseAttributes;
+import de.codecentric.reedelk.database.internal.commons.DataSourceService;
+import de.codecentric.reedelk.database.internal.commons.DatabaseUtils;
+import de.codecentric.reedelk.database.internal.commons.QueryStatementTemplate;
+import de.codecentric.reedelk.database.internal.exception.DeleteException;
+import de.codecentric.reedelk.runtime.api.annotation.*;
+import de.codecentric.reedelk.runtime.api.component.ProcessorSync;
+import de.codecentric.reedelk.runtime.api.flow.FlowContext;
+import de.codecentric.reedelk.runtime.api.message.Message;
+import de.codecentric.reedelk.runtime.api.message.MessageAttributes;
+import de.codecentric.reedelk.runtime.api.message.MessageBuilder;
+import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
+import de.codecentric.reedelk.runtime.api.script.dynamicmap.DynamicObjectMap;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ServiceScope;
@@ -24,10 +24,10 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static com.reedelk.database.internal.commons.Messages.Delete.QUERY_EXECUTE_ERROR;
-import static com.reedelk.database.internal.commons.Messages.Delete.QUERY_EXECUTE_ERROR_WITH_QUERY;
-import static com.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotBlank;
-import static com.reedelk.runtime.api.commons.StackTraceUtils.rootCauseMessageOf;
+import static de.codecentric.reedelk.database.internal.commons.Messages.Delete.QUERY_EXECUTE_ERROR;
+import static de.codecentric.reedelk.database.internal.commons.Messages.Delete.QUERY_EXECUTE_ERROR_WITH_QUERY;
+import static de.codecentric.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotBlank;
+import static de.codecentric.reedelk.runtime.api.commons.StackTraceUtils.rootCauseMessageOf;
 
 @ModuleComponent("SQL Delete")
 @ComponentOutput(

src/main/java/com/reedelk/database/component/Insert.java → src/main/java/de/codecentric/reedelk/database/component/Insert.java

@@ -1,19 +1,19 @@
-package com.reedelk.database.component;
+package de.codecentric.reedelk.database.component;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
-import com.reedelk.database.internal.attribute.DatabaseAttributes;
-import com.reedelk.database.internal.commons.DataSourceService;
-import com.reedelk.database.internal.commons.DatabaseUtils;
-import com.reedelk.database.internal.commons.QueryStatementTemplate;
-import com.reedelk.database.internal.exception.InsertException;
-import com.reedelk.runtime.api.annotation.*;
-import com.reedelk.runtime.api.component.ProcessorSync;
-import com.reedelk.runtime.api.flow.FlowContext;
-import com.reedelk.runtime.api.message.Message;
-import com.reedelk.runtime.api.message.MessageAttributes;
-import com.reedelk.runtime.api.message.MessageBuilder;
-import com.reedelk.runtime.api.script.ScriptEngineService;
-import com.reedelk.runtime.api.script.dynamicmap.DynamicObjectMap;
+import de.codecentric.reedelk.database.internal.attribute.DatabaseAttributes;
+import de.codecentric.reedelk.database.internal.commons.DataSourceService;
+import de.codecentric.reedelk.database.internal.commons.DatabaseUtils;
+import de.codecentric.reedelk.database.internal.commons.QueryStatementTemplate;
+import de.codecentric.reedelk.database.internal.exception.InsertException;
+import de.codecentric.reedelk.runtime.api.annotation.*;
+import de.codecentric.reedelk.runtime.api.component.ProcessorSync;
+import de.codecentric.reedelk.runtime.api.flow.FlowContext;
+import de.codecentric.reedelk.runtime.api.message.Message;
+import de.codecentric.reedelk.runtime.api.message.MessageAttributes;
+import de.codecentric.reedelk.runtime.api.message.MessageBuilder;
+import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
+import de.codecentric.reedelk.runtime.api.script.dynamicmap.DynamicObjectMap;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ServiceScope;
@@ -24,10 +24,10 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static com.reedelk.database.internal.commons.Messages.Insert.QUERY_EXECUTE_ERROR;
-import static com.reedelk.database.internal.commons.Messages.Insert.QUERY_EXECUTE_ERROR_WITH_QUERY;
-import static com.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotBlank;
-import static com.reedelk.runtime.api.commons.StackTraceUtils.rootCauseMessageOf;
+import static de.codecentric.reedelk.database.internal.commons.Messages.Insert.QUERY_EXECUTE_ERROR;
+import static de.codecentric.reedelk.database.internal.commons.Messages.Insert.QUERY_EXECUTE_ERROR_WITH_QUERY;
+import static de.codecentric.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotBlank;
+import static de.codecentric.reedelk.runtime.api.commons.StackTraceUtils.rootCauseMessageOf;
 
 @ModuleComponent("SQL Insert")
 @ComponentOutput(